新增梅花积分多外接口

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -1270,14 +1270,14 @@ public class CzrkServiceImpl implements ICzrkService {
     }
 
     @Override
-    public AjaxResult vaccineStatistics(String code,String lenth) {
+    public AjaxResult vaccineStatistics(String code, String lenth) {
 
         JSONObject results = new JSONObject(16);
 
         SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         SysDept dept = sysUser.getDept();
 
-        if(StringUtils.isEmpty(code)){
+        if (StringUtils.isEmpty(code)) {
             //判断账号权限
             List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
             if (roleKeySets.contains("province") || roleKeySets.contains("city") || roleKeySets.contains("region") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
@@ -1287,7 +1287,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
                     results = jsonObject;
 
-                }else{
+                } else {
                     List<SysDept> allDepts = remoteDeptService.listChildrenDepts(1L);
                     //查找户籍人口总数
                     List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
@@ -1317,8 +1317,6 @@ public class CzrkServiceImpl implements ICzrkService {
                 }
 
 
-
-
             } else if (roleKeySets.contains("villageTowns")) {
 
                 JSONObject jsonObject = redisService.getCacheObject(dept.getAreaId());
@@ -1326,7 +1324,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
                     results = jsonObject;
 
-                }else{
+                } else {
 
                     // 镇领导，只能查看本镇下人员
                     //获取本镇下所有乡村
@@ -1362,7 +1360,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
                     results = jsonObject;
 
-                }else{
+                } else {
                     ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
                     JSONObject townsResult = new JSONObject(16);
                     // 村领导
@@ -1380,7 +1378,7 @@ public class CzrkServiceImpl implements ICzrkService {
                         if (!"1".equals(czrk.getStatus())) {
                             hjzrs--;
                         }
-                        if("Y".equals(czrk.getIsNucleicAcid())){
+                        if ("Y".equals(czrk.getIsNucleicAcid())) {
                             hjymjz++;
                         }
 
@@ -1398,21 +1396,21 @@ public class CzrkServiceImpl implements ICzrkService {
                     results.put("type", "3");
                 }
             }
-        }else{
+        } else {
 
             JSONObject jsonObject = redisService.getCacheObject(code);
             if (isNotEmpty(jsonObject)) {
 
                 results = jsonObject;
 
-            }else{
-                if(lenth.equals("1")){
+            } else {
+                if (lenth.equals("1")) {
                     // 镇领导，只能查看本镇下人员
                     //获取本镇下所有乡村
                     List<SysDept> allDept = remoteDeptService.listChildrenDepts(1L);
                     Long deptId = null;
                     for (SysDept sysDept : allDept) {
-                        if(sysDept.getAreaId().equals(code)){
+                        if (sysDept.getAreaId().equals(code)) {
                             deptId = sysDept.getId();
                             break;
                         }
@@ -1442,7 +1440,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
                     results.put("townDatas", towsDataList);
                     results.put("type", "2");
-                }else{
+                } else {
                     ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
                     JSONObject townsResult = new JSONObject(16);
                     String name = "";
@@ -1461,11 +1459,11 @@ public class CzrkServiceImpl implements ICzrkService {
                         if (!"1".equals(czrk.getStatus())) {
                             hjzrs--;
                         }
-                        if("Y".equals(czrk.getIsNucleicAcid())){
+                        if ("Y".equals(czrk.getIsNucleicAcid())) {
                             hjymjz++;
                         }
 
-                        if(StringUtils.isEmpty(name) && StringUtils.isEmpty(czrk.getVillage())){
+                        if (StringUtils.isEmpty(name) && StringUtils.isEmpty(czrk.getVillage())) {
                             name = czrk.getVillage();
                         }
 
@@ -1487,7 +1485,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
         }
 
-        return AjaxResult.success("成功",results);
+        return AjaxResult.success("成功", results);
     }
 
     @Override
@@ -1517,16 +1515,17 @@ public class CzrkServiceImpl implements ICzrkService {
 
     /**
      * 一键未认领(把未填写到村级别的户籍用户设置为未认领,根据不同镇来操作)
+     *
      * @return
      */
     @Override
     public int setNoRl() {
         SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         log.info("{}于{}一键设置未认领表"
-                , sysUser.getUserName(), DateUtils.dateTimeNow() );
+                , sysUser.getUserName(), DateUtils.dateTimeNow());
         Czrk czrk = new Czrk();
-        CzrkUtils.setQueryRole(czrk,sysUser, Czrk.HJ);
-        return  czrkMapper.setNoRl(czrk);
+        CzrkUtils.setQueryRole(czrk, sysUser, Czrk.HJ);
+        return czrkMapper.setNoRl(czrk);
     }
 
 
@@ -1551,7 +1550,7 @@ public class CzrkServiceImpl implements ICzrkService {
                     hjzrs++;
                 }
 
-                if("Y".equals(czrk.getIsNucleicAcid())){
+                if ("Y".equals(czrk.getIsNucleicAcid())) {
                     hjymjz++;
                 }
             }
@@ -1585,7 +1584,7 @@ public class CzrkServiceImpl implements ICzrkService {
                     hjzrs++;
                 }
 
-                if("Y".equals(czrk.getIsNucleicAcid())){
+                if ("Y".equals(czrk.getIsNucleicAcid())) {
                     hjymjz++;
                 }
             }
@@ -1595,6 +1594,7 @@ public class CzrkServiceImpl implements ICzrkService {
         result.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
         result.put("name", deptName);
     }
+
     @Override
     public Czrk getById(Long id) {
         if (isEmpty(id)) {
@@ -2793,6 +2793,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
     /**
      * 对外梅花积分接口
+     *
      * @return
      */
     @Override
@@ -2811,12 +2812,12 @@ public class CzrkServiceImpl implements ICzrkService {
         String privateKey = ipTimes.getString("app_secret");
         String body = jsonRequest.getBody();
         String idCard = "";
-        if (StringUtils.isNotEmpty(body)){
-             //拿私钥进行RSA解密
+        if (StringUtils.isNotEmpty(body)) {
+            //拿私钥进行RSA解密
             idCard = RSAUtil.decryptByPrivateKey(HexUtils.fromHexString(body), privateKey);
         }
         //判断身份证号是否符合要求
-        if (StringUtils.isBlank(idCard)||idCard.length() != 18){
+        if (StringUtils.isBlank(idCard) || idCard.length() != 18) {
             return AjaxResult.error("传入的参数格式不正确");
         }
 
@@ -2840,10 +2841,7 @@ public class CzrkServiceImpl implements ICzrkService {
             return AjaxResult.error("今日访问次数已用尽，请明日再试");
         }
         int result = czrkJzdzService.selectCzrkJzdzByIdCard(idCard);
-        if (result == 0) {
-            log.error("ip:{}, 时间:{}, 根据idCard:{}, 未查询到信息, 已经查询了 {} 次", ip, today, idCard, cacheTimes);
-            return AjaxResult.error("未查询到信息");
-        }
+        log.error("ip:{}, 时间:{}, 根据idCard:{},  该用户已经查询了 {} 次身份证信息", ip, today, idCard, cacheTimes);
         long time = DateUtils.getTodayEnd().getTime(), time1 = DateUtils.getNowDate().getTime();
         redisService.setCacheObject(redisKey, cacheTimes, ((time - time1) / 1000), TimeUnit.SECONDS);
         return AjaxResult.success(result);