自选号牌

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/bean/DataDetailVo.java

+package com.dlbridge.jadp.plugins.cmpt.bean;
+
+import lombok.Data;
+
+@Data
+public class DataDetailVo {
+
+
+
+}

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

+package com.dlbridge.jadp.plugins.cmpt.bean;
+
+import lombok.Data;
+
+@Data
+public class DataVo {
+
+    private String unionId;
+
+    private String userIds;
+
+    private int count;
+}

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

@@ -34,4 +34,6 @@ public class Func {
     @ApiModelProperty(value = "序列")
     private Integer seq;
 
+    private Integer status;
+
 }

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

@@ -81,4 +81,6 @@ public interface CmptMapper {
     Map<String, String> getAllStatistic();
 
     Map<String, String> getEnrollUsersByUserMapId(int userMapId);
+
+    RoadUser getEnrollUsersByPhone(@Param("cmptId") Integer cmptId,@Param("callPhone")  String phone);
 }

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

@@ -264,16 +264,18 @@
 
     <select id="getAllStatistic" resultType="java.util.HashMap">
       <![CDATA[ select
-          (SELECT count(1) from gk_cmpt where cmpt_status=2 and del_flag=0) `all`,
+          (SELECT count(1) from gk_cmpt a
+        left join common.neucmpt b on a.cmpt_id=b.gtcmptid
+        left join raceenroll.competition c on b.gcmptid=c.cmptId where cmpt_status=2 and del_flag=0 and c.createUserId <> 427744) `all`,
           (SELECT count(1) from gk_cmpt a
         left join common.neucmpt b on a.cmpt_id=b.gtcmptid
         left join raceenroll.competition c on b.gcmptid=c.cmptId
-        where a.cmpt_status=2 and a.del_flag=0 and c.opentime < now() and c.deadline > now()) enroll,
+        where a.cmpt_status=2 and a.del_flag=0 and c.opentime < now() and c.deadline > now() and c.createUserId <> 427744) enroll,
         (
         SELECT count(1) from gk_cmpt a
         left join common.neucmpt b on a.cmpt_id=b.gtcmptid
         left join raceenroll.competition c on b.gcmptid=c.cmptId
-        where a.cmpt_status=2 and a.del_flag=0 and c.startTime < now() and c.endTime > now()) race
+        where a.cmpt_status=2 and a.del_flag=0 and c.startTime < now() and c.endTime > now() and c.createUserId <> 427744) race
         from dual
         ]]>
     </select>
@@ -285,4 +287,11 @@
             inner join raceenroll.competitionroadmap b on a.roadId=b.roadId
         where a.userMapId=#{userMapId}
     </select>
+
+    <select id="getEnrollUsersByPhone" resultType="com.dlbridge.jadp.plugins.cmpt.bean.RoadUser">
+        select b.userMapId userMapId
+        from common.neucmpt a inner join raceenroll.competitionusermap b on a.gcmptid=b.cmptid
+        where a.gtcmptid = #{cmptId} and b.callPhone = #{callPhone} and isdelete=0 and enrollstatus=1
+
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -120,7 +120,7 @@
     </update>
 
     <select id="queryFuncs" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
-        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb
+        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`
         from gk_cmptsetting
         where cmptid = #{cmptId} and visibility=1 and del_flag=0 and status>0
         order by seq
@@ -128,7 +128,7 @@
     </select>
 
     <select id="queryAllFuncs" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
-        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb
+        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`
         from gk_cmptsetting
         where cmptid = #{cmptId} and visibility=1 and del_flag=0 and status=1
         order by seq

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

@@ -95,9 +95,8 @@ public class CmptService {
             if (cmpt != null && cmpt.getStatus() == 1) { // 已经绑定
                 logger.info("已绑定数据，需更新:" + cmpt);
                 cmpt.setEnrollId(info.getMarkNo());
-
-
                 cmptMapper.updateUserCmptById(cmpt);
+                info.setManualMarkNo(cmpt.getManualMarkNo());
                 return info;
             } else {
                 UserCmpt userCmpt = new UserCmpt().setCmptId(cmptId)
@@ -136,8 +135,8 @@ public class CmptService {
             Object o = valueOperations.get("gk:view:" + cmpt.getCmptId());
             if(o != null){
                 cmpt.setView((Integer) o);
-                cmpt.setEnroll(remoteService.getCmptEnrollCount(cmpt.getCmptId()));
             }
+            cmpt.setEnroll(remoteService.getCmptEnrollCount(cmpt.getCmptId()));
         });
         return PageFactory.setContent(list, page, count);
     }
@@ -239,4 +238,8 @@ public class CmptService {
             return null;
         }
     }
+
+    public RoadUser getEnrollUsersByPhone(Integer cmptId, String phone) {
+        return cmptMapper.getEnrollUsersByPhone(cmptId,phone);
+    }
 }

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

@@ -118,7 +118,7 @@ public class RemoteService {
                     info.setPhone(content.getString("phone"));
                     info.setRemark(content.getString("remark"));
                     info.setGender("0".equals(content.getString("gender")) ? "男":"女");
-                    info.setIdentityNo(content.getString("identityNo"));
+                    //info.setIdentityNo(content.getString("identityNo"));
                     return info;
                 } else {
                     return null;
@@ -584,4 +584,8 @@ public class RemoteService {
     public Map<String, String> getEnrollUsersByUserMapId(int userMapId) {
         return  cmptService.getEnrollUsersByUserMapId(userMapId);
     }
+
+    public RoadUser getEnrollUsersByPhone(Integer cmptId, String phone) {
+        return  cmptService.getEnrollUsersByPhone(cmptId,phone);
+    }
 }

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

@@ -102,11 +102,9 @@ public class MicroApiController {
     @Value("${geexek.shamus.url}")
     private String shamusURL;
 
-
     @Resource
     private ManualService manualService;
 
-
     @Resource
     private HashOperations hashOperations;
 
@@ -114,20 +112,22 @@ public class MicroApiController {
 
     @Resource
     private NewsService newsService;
+
     @Resource
     private BannerService bannerService;
+
     @Resource
     private FuncSettingService funcSettingService;
+
     @Resource
     private RoadsGpsCheckpointService roadsGpsCheckpointService;
+
     @Resource
     private  CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
 
     @Resource
     CustomerService customerService;
-    /**
-     * @return
-     */
+
     @PostMapping(value = "/bindCmpt")
     @ApiResponses({
             @ApiResponse(code = 200, message = "成功"),
@@ -147,9 +147,8 @@ public class MicroApiController {
                 return Result.fail().setMsg("报名成功，未查询到组委会分配的号码牌！");
             }
         }
-        List<RoadUser> enrollUsers = remoteService.getEnrollUsers(cmptId, userId);
-        Optional<RoadUser> first = enrollUsers.stream().filter(user -> phone.equals(user.getMobile())).findFirst();
-        info.setUserMapId(first.get().getUserMapId());
+        RoadUser user = remoteService.getEnrollUsersByPhone(cmptId, phone);
+        info.setUserMapId(user.getUserMapId());
         return Result.success().setMsg("绑定成功！").setContent(info);
     }
 
@@ -208,9 +207,8 @@ public class MicroApiController {
                     return Result.fail().setMsg("报名成功，未查询到组委会分配的号码牌！");
                 }
             }
-            List<RoadUser> enrollUsers = remoteService.getEnrollUsers(cmptId, userId);
-            Optional<RoadUser> first = enrollUsers.stream().filter(user -> purePhoneNumber.equals(user.getMobile())).findFirst();
-            info.setUserMapId(first.get().getUserMapId());
+            RoadUser user = remoteService.getEnrollUsersByPhone(cmptId, purePhoneNumber);
+            info.setUserMapId(user.getUserMapId());
             return Result.success().setMsg("绑定成功！").setContent(info);
 
         } catch (Exception e) {
@@ -307,12 +305,12 @@ public class MicroApiController {
     public Result<List<Func>> func(@PathVariable("cmptId") int cmpId,
                                    HttpServletRequest request) {
         String enrollId = request.getParameter("enrollId");
-        List<Func> list = null;
-        if (StringUtils.isBlank(enrollId)) {
+        List<Func> list =  cmptSetting.queryFuncs(cmpId);
+       /* if (StringUtils.isBlank(enrollId)) {
             list = cmptSetting.queryAllFuncs(cmpId); // 查询 可对外的
         } else {  // 绑定后
             list = cmptSetting.queryFuncs(cmpId); // 仅公开
-        }
+        }*/
         return Result.success().setContent(list);
     }
 
@@ -1216,10 +1214,21 @@ public class MicroApiController {
                                @RequestParam("markNo") String markNo,@RequestParam("manualMarkNo") String manualMarkNo) {
 
 
+        List<CmptScoreRuleScoreInfo> scores = cmptScoreRuleScoreInfoService.getScoreRuleScoreInfosBycmptIdAndMarkNo(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("该号码牌已经被分配！");
         }
+        EnrollInfo userInfoByMarkNo = remoteService.getUserInfoByMarkNo(manualMarkNo, cmptId);// 获取原计时信息
+        String stock = manualMarkNo.split("-")[0];
+        String markno = manualMarkNo.split("-")[1];
+        if(userInfoByMarkNo != null){
+            return Result.fail().setMsg("该号码牌已经被分配！");
+        }
         EnrollInfo userInfo = null;
         if(StringUtils.isNotBlank(markNo)){
             userInfo = remoteService.getUserInfoByMarkNo(markNo, cmptId); // 获取原计时信息
@@ -1228,15 +1237,17 @@ public class MicroApiController {
             Map<String,String> param = remoteService.getEnrollUsersByUserMapId(userMapId);
             param.put("cmptId",cmptId+"");
 
-            param.put("markNo",manualMarkNo);
-            param.put("deviceId",manualMarkNo);
+            param.put("markNo",StringUtils.isBlank(stock) ? manualMarkNo.replace("-","") : manualMarkNo);
+            param.put("deviceId",StringUtils.isBlank(stock) ? manualMarkNo.replace("-","") : manualMarkNo);
             param.put("enrollId","-1");
-
-
+            param.put("remark4",stock);
+            param.put("remark5",markno);
+            param.put("gender","男".equals(userInfo.getGender()) ? "0":"1");
             if(param.get("roadId") == null){
                 return Result.fail().setMsg("未找到赛事项目！");
             }
             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("返回结果："+responseEntity.getBody());
             JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());
@@ -1254,16 +1265,17 @@ public class MicroApiController {
             Map<String,String> param = remoteService.getEnrollUsersByUserMapId(userMapId);
             param.put("cmptId",cmptId+"");
 
-            param.put("markNo",manualMarkNo);
-            param.put("deviceId",manualMarkNo);
+            param.put("markNo",StringUtils.isBlank(stock) ? manualMarkNo.replace("-","") : manualMarkNo);
+            param.put("deviceId",StringUtils.isBlank(stock) ? manualMarkNo.replace("-","") : manualMarkNo);
             param.put("roadId",userInfo.getRoadId()+"");
             param.put("name",userInfo.getUserName());
-            param.put("gender",userInfo.getGender());
+            param.put("gender","男".equals(userInfo.getGender()) ? "0":"1");
             param.put("mobileNum",userInfo.getPhone());
-            param.put("idCardNo",userInfo.getIdentityNo());
             param.put("enrollId",userInfo.getEnrollId());
-
+            param.put("remark4",stock);
+            param.put("remark5",markno);
             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("返回结果："+responseEntity.getBody());
             JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());
@@ -1276,8 +1288,10 @@ public class MicroApiController {
             }else{
                 return Result.fail().setMsg(jsonObject.getString("message"));
             }
-
         }
     }
 
+    public static void main(String[] args) {
+        System.out.println("-aaa".split("-")[0]+","+"-aaa".split("-")[1]);
+    }
 }