赛事信息

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

@@ -26,7 +26,7 @@ public class TemplateController {
         Result result = Result.fail();
         Optional.of(cmptTemplates).ifPresent(r -> {
            if(r.size()>0){
-               result.setCode(200).setContent(cmptTemplates);
+               result.setMsg("成功").setCode(200).setContent(cmptTemplates);
            }
         });
         return Mono.just(result);

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

@@ -173,6 +173,7 @@
             </if>
             <if test="cmptName != null">
                 a.cmpt_name = #{cmptName},
+                c.cmptName = #{cmptName},
             </if>
             <if test="startTime != null">
                 a.start_time = #{startTime},

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

@@ -82,6 +82,9 @@
     <update id="update">
         UPDATE gk_cmptsetting
         <set>
+            <if test="func.name != null">
+                `name` = #{func.name},
+            </if>
             <if test="func.nameWeb != null">
                 name_web = #{func.nameWeb},
             </if>

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

@@ -65,8 +65,10 @@ public class RemoteService {
     }
 
     public EnrollInfo getUserInfoByPhone(String phone, Integer cmptId) {
-        ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "getEnrollInfo.do?cmptId="
-                + cmptId + "&phone=" + phone, String.class);
+        String url = timerURL + "getEnrollInfo.do?cmptId="
+                + cmptId + "&phone=" + phone;
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
+        log.info("requet get url:"+url);
         if (forEntity.getStatusCode() == HttpStatus.OK) {
             String resultString = forEntity.getBody();
             log.info("resultString:" + resultString);

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

@@ -64,6 +64,7 @@ public class ScoreSettingController {
     }
 
 
+
     @RequestMapping("test/{cmptId}")
     @ResponseBody
     @HystrixCommand(fallbackMethod = "testFallBack")
@@ -87,7 +88,7 @@ public class ScoreSettingController {
 
         List<CmptScoreRule> rules = scoreRuleService.getRules(cmptId);
 
-        if(rules != null || rules.size() > 0){
+        if(rules != null && rules.size() > 0){
             scoreRuleService.deleteRuleByCmptId(cmptId);
         }
 
@@ -104,7 +105,7 @@ public class ScoreSettingController {
             rule.setUpdateTime(LocalDateTime.now());
             rule.setScoreRule(type);
             rule.setScoreUploadTimes(999);
-            rule.setOrderRule(rules.get(0).getOrderRule());
+            rule.setOrderRule(rules.size() > 0 ? rules.get(0).getOrderRule():4);
             lists.add(rule);
         }
 
@@ -113,4 +114,12 @@ public class ScoreSettingController {
         return Result.success().setContent(lists);
     }
 
+    @RequestMapping("currentRule/{cmptId}")
+    @ResponseBody
+    public Result currentRule(@PathVariable("cmptId") Integer cmptId) {
+        int currentRuleType = scoreRuleService.getCurrentRuleType(cmptId);
+
+        return Result.success().setContent(currentRuleType);
+    }
+
 }