易发布 赛事模板复制

pom.xml

@@ -33,7 +33,7 @@
         <ehcache.version>2.6.11</ehcache.version>
         <ehcache-web.version>2.0.4</ehcache-web.version>
         <commons-lang3.version>3.0</commons-lang3.version>
-        <mybatis-spring-boot.version>1.3.2</mybatis-spring-boot.version>
+        <mybatis-spring-boot.version>2.0.0</mybatis-spring-boot.version>
 
     </properties>
 

src/main/java/com/dlbridge/jadp/plugins/cmpt/TemplateController.java

+package com.dlbridge.jadp.plugins.cmpt;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate;
+import com.dlbridge.jadp.plugins.cmpt.service.TemplateService;
+import com.neusoft.www.utils.web.Result;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import reactor.core.publisher.Mono;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Optional;
+
+@Controller
+@RequestMapping("/template")
+public class TemplateController {
+
+    @Resource
+    TemplateService templateService;
+
+    @RequestMapping("cmpt")
+    @ResponseBody
+    public Mono<Result> cmpt(){
+        List<CmptTemplate> cmptTemplates = templateService.queryAllTemplate();
+        Result result = Result.fail();
+        Optional.of(cmptTemplates).ifPresent(r -> {
+           if(r.size()>0){
+               result.setCode(200).setContent(cmptTemplates);
+           }
+        });
+        return Mono.just(result);
+    }
+
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/CmptTemplate.java

+package com.dlbridge.jadp.plugins.cmpt.bean;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+public class CmptTemplate {
+
+    private int templateId;
+
+    private int cmptId;
+
+    private String templateName;
+
+    private String templateBg;
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/TemplateMapper.java

+package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
+
+
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate;
+
+import java.util.List;
+
+public interface TemplateMapper {
+
+    List<CmptTemplate> queryAllTemplate();
+
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/TemplateMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.TemplateMapper">
+
+    <select id="queryAllTemplate" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate">
+        select template_id templateId,cmpt_id cmptId,
+               template_name templateName,
+               template_bg
+        from gk_cmpt_template
+        where del_flag=0
+    </select>
+</mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/TemplateService.java

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate;
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.TemplateMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class TemplateService {
+
+    @Resource
+    private TemplateMapper templateMapper;
+
+    public List<CmptTemplate> queryAllTemplate() {
+        return templateMapper.queryAllTemplate();
+    }
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptSettingController.java

@@ -177,7 +177,7 @@ public class CmptSettingController {
             count = remoteService.getCmptEnrollCount(cmptId);
         }else if (type == 15 || type == 16) { // 自动打卡，扫描打卡
             count = geexekScoreService.hasCheckPoint(cmptId);
-            if(count < 3){
+            if(count < 2){
                 return Result.fail().setContent(count);
             }
         } else {

src/main/resources/application-dev.properties

 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.password=mysql_master_geexek_408
+#spring.datasource.username=mysql_master
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://rm-bp15ojs1ys1eur32zwo.mysql.rds.aliyuncs.com/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 spring.datasource.password=geexekNewPass4!
 spring.datasource.username=geexek
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://47.111.166.211:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+spring.datasource.url=jdbc:mysql://47.111.166.211:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+
 mybatis.typeAliasesPackage=com.dlbridge.jadp.plugins
 mybatis.mapperLocations=classpath:com/dlbridge/jadp/plugins/**/**.xml
 mybatis.configuration.map-underscore-to-camel-case=true
@@ -60,9 +65,9 @@ spring.redis.host=localhost
 spring.redis.jedis.pool.min-idle=10
 spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.max-active=10
-spring.servlet.multipart.max-file-size=10Mb
+spring.servlet.multipart.max-file-size=52428800
 spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-request-size=50Mb
+spring.servlet.multipart.max-request-size=52428800
 spring.application.name=micro-gksite
 
 management.endpoints.web.exposure.include=*
@@ -107,5 +112,5 @@ spring.cloud.sentinel.datasource.ds.nacos.groupId=dev
 ## 规则类型
 spring.cloud.sentinel.datasource.ds.nacos.rule-type=flow
 
-
+spring.main.allow-bean-definition-overriding=true
 base.url=http://localhost:8080
\ No newline at end of file

src/test/java/com/dlbridge/jadp/ContextTest.java

@@ -2,6 +2,7 @@ package com.dlbridge.jadp;
 
 import com.dlbridge.feign.ScoreService;
 import com.dlbridge.jadp.plugins.cmpt.bean.*;
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.DataMapper;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.CmptSetting;
 import com.dlbridge.jadp.plugins.cmpt.service.*;
 import org.junit.Test;
@@ -21,6 +22,9 @@ import java.util.stream.Collectors;
 @SpringBootTest
 public class ContextTest {
 
+    @Resource
+    DataMapper dataMapper;
+
     @Resource
     private CmptService cmptService;
 
@@ -138,4 +142,32 @@ public class ContextTest {
 
         });
     }
+
+    @Test
+    public void testDate(){
+        List<DataVo> allDoubleUnion = dataMapper.getAllDoubleUnion();
+        List list = new ArrayList();
+        allDoubleUnion.forEach(dataVo -> {
+            String userIds = dataVo.getUserIds();
+            int index = 0;
+            StringBuilder sb = new StringBuilder();
+            for(String userId : userIds.split(",")){
+                // 判断当前userId是否在小程序绑定过
+                int count = dataMapper.existedInMicro(userId);
+                if(count > 0){    // 以小程序为主
+                    index++;
+                    String cmptId = dataMapper.getCompetitionByRegisterId(userIds.split(","));
+                    sb.append(cmptId);
+                }
+            }
+            if(index == userIds.split(",").length){
+                System.out.println("两个userId:"+userIds+", 在小程序中绑定过，cmptId:"+sb.toString());
+            }else if(index == 0){
+                System.out.println("无 userId:"+userIds+", 在小程序中绑定过，cmptId:"+sb.toString());
+            }else{
+                System.out.println("部分userId:"+userIds+", 在小程序中绑定过，cmptId:"+sb.toString());
+            }
+
+        });
+    }
 }