卡号变更，海康门禁影响范围修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/HaiKangDoorService.java

@@ -216,6 +216,9 @@ public class HaiKangDoorService {
 
                 list.forEach(h -> {
                     h.setVerifyType(3);
+                    if(StringUtils.isNotBlank(h.getCardNo())){
+                        h.setCardNo(DESUtils.decrypt(h.getCardNo()));
+                    }
                 });
                 haikangUsers.addAll(list);
             }
@@ -235,6 +238,9 @@ public class HaiKangDoorService {
                             list = labHaikangUserMapper.queryUserInfoByIds(ids);
                             list.forEach(h -> {
                                 h.setVerifyType(2);
+                                if(StringUtils.isNotBlank(h.getCardNo())){
+                                    h.setCardNo(DESUtils.decrypt(h.getCardNo()));
+                                }
                                 applys.forEach(p -> {
                                     if (p.getUserId().equals(h.getJoinUserId())) {
                                         h.setInvalidTime(p.getValidEndTime());
@@ -255,6 +261,9 @@ public class HaiKangDoorService {
                             list = labHaikangUserMapper.queryUserInfoByIds(ids);
                             list.forEach(h -> {
                                 h.setVerifyType(1);
+                                if(StringUtils.isNotBlank(h.getCardNo())){
+                                    h.setCardNo(DESUtils.decrypt(h.getCardNo()));
+                                }
                             });
                             haikangUsers.addAll(list);
                         }
@@ -374,6 +383,9 @@ public class HaiKangDoorService {
         List<LabHaikangUser> list = labHaikangUserMapper.queryUserInfoByIds(ids);
         list.forEach(a -> {
             for (LabHaikangUser b : entities) {
+                if(StringUtils.isNotBlank(b.getCardNo())){
+                    b.setCardNo(DESUtils.decrypt(b.getCardNo()));
+                }
                 if(b.getJoinUserId().equals(a.getJoinUserId())){
                     b.setJobNo(a.getJobNo());
                     b.setCardNo(a.getCardNo());
@@ -457,6 +469,9 @@ public class HaiKangDoorService {
         ids.add(labSecurityApply.getUserId());
         List<LabHaikangUser> list = labHaikangUserMapper.queryUserInfoByIds(ids);
         LabHaikangUser haikangUser = list.get(0);
+        if(StringUtils.isNotBlank(haikangUser.getCardNo())){
+            haikangUser.setCardNo(DESUtils.decrypt(haikangUser.getCardNo()));
+        }
         haikangUser.setCipher("" + (int) ((Math.random() * 9 + 1) * 100000));
         SaveUtil.setCommonAttr(haikangUser, loginUser);
         haikangUser.setInvalidTime(labSecurityApply.getValidEndTime());
@@ -819,6 +834,9 @@ public class HaiKangDoorService {
                         hKUserInfo.setPassword(haikangUser.getCipher());
                         haikangUser.setVerifyType(1);
                         haikangUser.setHardId(hardware.getId());
+                        if(StringUtils.isNotBlank(haikangUser.getCardNo())){
+                            haikangUser.setCardNo(DESUtils.decrypt(haikangUser.getCardNo()));
+                        }
 
                         // 添加日志
                         LabHaikangUserLog labHaikangUserLog = new LabHaikangUserLog();
@@ -901,16 +919,8 @@ public class HaiKangDoorService {
         HaikangResult result = UserManage.AddUserInfo(hKUserInfo);
         if(result.getStatusCode() == 1){
             haikangUser.setState(true);
-
             if (StringUtils.isNotBlank(haikangUser.getCardNo())) {
-                if(haikangUser.getCardNo().length() == 7){
-                    haikangUser.setCardNo("0" + haikangUser.getCardNo());
-                }
-                String cardNo = Long.parseLong(haikangUser.getCardNo(),16) + "";
-                if(cardNo.length() == 9){
-                    cardNo = "0" + cardNo;
-                }
-                result = CardManage.addCardInfo(haikangUser.getJobNo(), cardNo);
+                result = CardManage.addCardInfo(haikangUser.getJobNo(), haikangUser.getCardNo());
                 if(result.getStatusCode() == 1){
                     haikangUser.setIfCard(true);
                 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabHaikangUserMapper.xml

@@ -288,7 +288,7 @@
             stu.face_img as face_url,
             u.user_id as join_user_id,
             u.nick_name as nick_name,
-            u.card_num as card_no,
+            u.card_num_simple as card_no,
             u.user_name as job_no
         from
             sys_user u left join lab_students_info stu on u.user_id = stu.user_id