安全检查卡号问题修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -5,6 +5,7 @@ import java.util.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zd.common.core.utils.*;
 import com.zd.laboratory.domain.LabWhitelist;
 import com.zd.laboratory.service.*;
 import com.zd.model.constant.UserConstants;
@@ -14,10 +15,6 @@ import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.constant.SecurityConstants;
 import com.zd.model.domain.ResultData;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.FileConfigUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.UrlFormatUtils;
-import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.annotation.Log;
@@ -413,6 +410,11 @@ public class LabSecurityApplyController extends BaseController
         //根据id查询用户信息
         R<SysUser> rDate =remoteUserService.getUserInfoByUserId(tokensysUser.getUserId(), SecurityConstants.INNER);
         SysUser  sysUser = rDate.getData();
+        //卡号解密
+        if(StringUtils.isNotEmpty(sysUser.getCardNumSimple())){
+            sysUser.setCardNum(DESUtils.decrypt(sysUser.getCardNumSimple()));
+        }
+
 
         //PC端根据条件校验，小程序端不做校验（操作流程不同）
         if(StringUtils.isNotBlank(remark)) {

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

@@ -249,7 +249,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
             ){
                 //更新用户信息
                 AjaxResult ajax=remoteUserService.editStudent(labSecurityApplyVO.getSysUser());
-                System.out.println(ajax);
                 String str = JSON.toJSONString(ajax);
                 JSONObject json = JSON.parseObject(str);
                 if(500==json.getInteger("code")){

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysStudentController.java

@@ -23,6 +23,7 @@ import com.zd.system.api.entity.SysUserStudentByExcel;
 import com.zd.system.api.entity.SysUserStudentByExport;
 import com.zd.system.domain.SysPost;
 import com.zd.system.service.*;
+import com.zd.system.service.impl.SysTeacherServiceImpl;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +69,8 @@ public class SysStudentController extends BaseController {
     RedisService redisService;
     @Autowired
     private ISysUserService userService;
+    @Autowired
+    private SysTeacherServiceImpl sysTeacherService;
 
     private static String USER_TYPE = UserConstants.USER_TYPE_STUDENT;
 
@@ -266,6 +269,15 @@ public class SysStudentController extends BaseController {
         } else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(sysStudentService.checkEmailUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }else if(StringUtils.isNotEmpty(user.getCardNum())){
+            String num = DESUtils.encrypt(user.getCardNum());
+            SysUser sysUser= userService.selectUserInfoByCardNum(user.getUserId(),num);
+            if(null!=sysUser){
+                return AjaxResult.error("卡号重复，请重新录入！");
+            }else{
+                //处理卡号加密
+                sysTeacherService.passCardNum(user,1);
+            }
         }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(sysStudentService.updateUserStatus(user));