自选号牌

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

@@ -282,7 +282,7 @@
 
 
     <select id="getEnrollUsersByUserMapId" resultType="java.util.HashMap">
-        select a.callPhone mobileNum,a.gender,a.IDNumber idCardNo,a.userName name,b.timerRoadId roadId,a.registerId
+        select a.callPhone mobileNum,a.gender,ifnull(a.IDNumber,'111111111111111111') idCardNo,a.userName name,b.timerRoadId roadId,a.registerId
         from raceenroll.competitionusermap a
             inner join raceenroll.competitionroadmap b on a.roadId=b.roadId
         where a.userMapId=#{userMapId}

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

@@ -148,6 +148,9 @@ public class MicroApiController {
             }
         }
         RoadUser user = remoteService.getEnrollUsersByPhone(cmptId, phone);
+        if(user == null){
+            return Result.fail().setMsg("未找到报名信息！").setContent(info);
+        }
         info.setUserMapId(user.getUserMapId());
         return Result.success().setMsg("绑定成功！").setContent(info);
     }
@@ -208,6 +211,9 @@ public class MicroApiController {
                 }
             }
             RoadUser user = remoteService.getEnrollUsersByPhone(cmptId, purePhoneNumber);
+            if(user == null){
+                return Result.fail().setMsg("未找到报名信息！").setContent(info);
+            }
             info.setUserMapId(user.getUserMapId());
             return Result.success().setMsg("绑定成功！").setContent(info);
 
@@ -1211,17 +1217,22 @@ public class MicroApiController {
     @GetMapping(value = "/manualMarkNO")
     @ResponseBody
     public Result manualMarkNO(@RequestParam("cmptId") int cmptId,@RequestParam("userMapId") int userMapId,
-                               @RequestParam("markNo") String markNo,@RequestParam("manualMarkNo") String manualMarkNo,
+                               @RequestParam(value = "markNo",required = false) String markNo,@RequestParam("manualMarkNo") String manualMarkNo,
                                @RequestParam("userId") int userId) {
 
         log.info("c:"+cmptId+",u:"+userMapId+"m:"+markNo+",om:"+manualMarkNo+",userId："+userId);
+
+        if(StringUtils.isNotBlank(markNo)){ // 未
             List<CmptScoreRuleScoreInfo> scores = cmptScoreRuleScoreInfoService.getScoreInfosBycmptIdAndMarkNoEnd(cmptId, markNo);
 
 
             if(scores.size() > 0){
                 return Result.fail().setMsg("已经有成绩数据，无法自选号码牌！");
             }
+        }
+
         Object o = hashOperations.get("manual:markno:" + cmptId, manualMarkNo);
+
         if(o != null){
             return Result.fail().setMsg("该号码牌已经被分配！");
         }
@@ -1263,7 +1274,7 @@ public class MicroApiController {
             String json = new Gson().toJson(param);
             log.info("请求参数："+json);
             ResponseEntity<String> responseEntity = restTemplate.getForEntity(timerURL+"/mergePersonEnroll.do?org-id=1-3&personEnroll={json}", String.class,json);
-            log.info("计时1返回结果："+responseEntity.getBody());
+            log.info("计时2返回结果："+responseEntity.getBody());
             JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());
             int status = jsonObject.getIntValue("status");
             if(status == 0){

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

@@ -30,6 +30,8 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -141,4 +143,16 @@ public class ScanController {
         }
     }
 
+    public static void main(String[] args) {
+
+        Pattern compile = Pattern.compile("([\\d])\\1{1,}([\\d])\\2{1,}([\\d])\\3{1,}");
+        for(int i=0;i<999999;i++){
+            String s = String.format("%06d",i);
+            Matcher matcher = compile.matcher(s);
+            if(matcher.matches()){
+                System.out.println(s);
+            }
+        }
+    }
+
 }