卡号变更优化

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisUpdateAndAddListener.java

@@ -1,33 +0,0 @@
-package com.zd.laboratory.event;
-
-import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.data.redis.listener.PatternTopic;
-import org.springframework.stereotype.Component;
-
-/**
- * 暂时不使用
- * @Author: zhoupan
- * @Date: 2021/10/20/11:19
- * @Description:
- */
-//@Component
-public class RedisUpdateAndAddListener implements MessageListener {
-
-    //监听的主题  现在只监听0号数据库
-    private  final PatternTopic topic = new PatternTopic("__keyevent@0__:set");
-    //直接订阅key
-    private  final PatternTopic topic2 = new PatternTopic("__keyspace@0__:sss*");
-
-    @Override
-    public void onMessage(Message message, byte[] bytes) {
-        String topic = new String(bytes);
-        String msg = new String(message.getBody());
-        System.out.println("收到key更新或修改，消息主题是："+ topic+",消息内容是："+msg);
-    }
-
-
-    public PatternTopic getTopic() {
-        return topic;
-    }
-}

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

@@ -517,6 +517,7 @@ public class HaiKangDoorService {
         LabHaikangUser labHaikangUser = new LabHaikangUser();
         labHaikangUser.setJoinUserId(user.getUserId());
         List<LabHaikangUser> list = labHaikangUserMapper.queryAll(labHaikangUser);
+        log.info("修改用户卡号：" + user.getUserId() + " ++++++++++ " + user.getCardNumSimple());
 
         Map<Long, List<LabHaikangUser>> map = list.stream().collect(
                 Collectors.groupingBy(
@@ -536,19 +537,8 @@ public class HaiKangDoorService {
                 continue;
             } else {
                 for (LabHaikangUser haikangUser : v) {
-                    haikangUser.setCardNo(user.getCardNumSimple());
-                    if (StringUtils.isNotBlank(haikangUser.getCardNo())) {
+//                    if (StringUtils.isNotBlank(haikangUser.getCardNo())) {
                         //由于卡号现在统一加密变了，顾原来的16进制不用了，改成现在的这种des加密解密
-                        haikangUser.setCardNo(DESUtils.decrypt(haikangUser.getCardNo()));
-                        String cardNo = 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;
-//                        }
-
 
                         try {
                             HaikangResult haikangResult = CardManage.deleteCardInfo(haikangUser.getJobNo());
@@ -556,17 +546,21 @@ public class HaiKangDoorService {
                                 haikangUser.setIfCard(false);
                             }
 
-                            haikangResult = CardManage.addCardInfo(haikangUser.getJobNo(), cardNo);
-                            if(haikangResult.getStatusCode() == 1){
-                                haikangUser.setIfCard(true);
+                            if(StringUtils.isNotBlank(user.getCardNumSimple())){
+                                haikangUser.setCardNo(DESUtils.decrypt(user.getCardNumSimple()));
+                                haikangResult = CardManage.addCardInfo(haikangUser.getJobNo(), haikangUser.getCardNo());
+                                if(haikangResult.getStatusCode() == 1){
+                                    haikangUser.setIfCard(true);
+                                }
                             }
+
                             labHaikangUserMapper.update(haikangUser);
                         } catch (JSONException e) {
                             e.printStackTrace();
                             log.error("用户修改卡号发生异常：" + e.getMessage());
                         }
                     }
-                }
+//                }
 
                 count += v.stream().filter(a -> !a.isIfCard()).count();
                 AcsBase.sdk_logout();

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysStudentServiceImpl.java

@@ -428,7 +428,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
         SysUser oldUser = userMapper.selectUserById(user.getUserId());
 
         int count = userMapper.updateStudentUser(user);
-        if(StringUtils.isNotEmpty(user.getCardNumSimple()) && oldUser != null && StringUtils.isNotEmpty(oldUser.getCardNumSimple()) && !oldUser.getCardNumSimple().equals(user.getCardNumSimple())){
+        if(user.getCardNumSimple() == null || !user.getCardNumSimple().equals(oldUser.getCardNumSimple())){
             remoteMessageContentService.updateUserCard(user);
         }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysTeacherServiceImpl.java

@@ -10,7 +10,6 @@ import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.api.feign.RemoteMessageContentService;
 import com.zd.model.constant.UserConstants;
-import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.SysDept;
 import com.zd.model.entity.SysRole;
@@ -410,7 +409,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
 
         int count = userMapper.updateTeacherUser(user);
 
-        if(StringUtils.isNotEmpty(user.getCardNumSimple()) && oldUser != null && StringUtils.isNotEmpty(oldUser.getCardNumSimple()) && !oldUser.getCardNumSimple().equals(user.getCardNumSimple())){
+        if(user.getCardNumSimple() == null || !user.getCardNumSimple().equals(oldUser.getCardNumSimple())){
             user.setPermitMenus(null);
             remoteMessageContentService.updateUserCard(user);
         }