浏览代码

修改大苏接口 身份证

魏熙美 6 年前
父节点
当前提交
dbc0df983c

+ 1
- 1
CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserController.java 查看文件

41
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
41
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
42
     })
42
     })
43
     public ResponseBean addUser(@RequestParam(value = "userName") String userName,
43
     public ResponseBean addUser(@RequestParam(value = "userName") String userName,
44
-                                @RequestParam(value = "idCard") String idCard,
44
+                                @RequestParam(value = "idCard", required = false) String idCard,
45
                                 @RequestParam(value = "gender") String gender,
45
                                 @RequestParam(value = "gender") String gender,
46
                                 @RequestParam(value = "phone") String phone){
46
                                 @RequestParam(value = "phone") String phone){
47
         ResponseBean responseBean = iTaUserService.addTaUser(userName, idCard, gender, phone);
47
         ResponseBean responseBean = iTaUserService.addTaUser(userName, idCard, gender, phone);

+ 2
- 1
CODE/foreign-service/src/main/java/com/community/huiju/enums/ResponseErrorsMessages.java 查看文件

35
     SIGN_DATETIME_ERROR(1023, "签名已过期!"),
35
     SIGN_DATETIME_ERROR(1023, "签名已过期!"),
36
     SIGN_ENCRYPT_MD5_ERROR(1024, "未使用md5加密方式加密!"),
36
     SIGN_ENCRYPT_MD5_ERROR(1024, "未使用md5加密方式加密!"),
37
     NOT_EQUIPMENT(1025, "系统设备未设置!"),
37
     NOT_EQUIPMENT(1025, "系统设备未设置!"),
38
-    NOT_PERMISSIONS_SET(1025, "权限组未配置!")
38
+    NOT_PERMISSIONS_SET(1025, "权限组未配置!"),
39
+    ERROR_ID_CARD(1026, "身份证不合法!"),
39
     ;
40
     ;
40
 
41
 
41
 
42
 

+ 14
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/ITaUserService.java 查看文件

2
 
2
 
3
 import com.baomidou.mybatisplus.extension.service.IService;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.community.commom.utils.AccountValidatorUtil;
4
 import com.community.commom.utils.AccountValidatorUtil;
5
+import com.community.commom.utils.IdcardValidator;
5
 import com.community.huiju.common.base.ResponseBean;
6
 import com.community.huiju.common.base.ResponseBean;
6
 import com.community.huiju.enums.ResponseErrorsMessages;
7
 import com.community.huiju.enums.ResponseErrorsMessages;
7
 import com.community.huiju.exception.WisdomException;
8
 import com.community.huiju.exception.WisdomException;
8
 import com.community.huiju.model.TaUser;
9
 import com.community.huiju.model.TaUser;
9
 import lombok.extern.slf4j.Slf4j;
10
 import lombok.extern.slf4j.Slf4j;
11
+import org.apache.commons.lang.StringUtils;
10
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
12
 
14
 
33
         }
35
         }
34
     }
36
     }
35
 
37
 
38
+    /**
39
+     * 校验身份证
40
+     * @param idCard
41
+     */
42
+    default void checkIdCart(String idCard) {
43
+        if (StringUtils.isBlank(idCard)) {
44
+            throw new WisdomException(ResponseErrorsMessages.NOT_ID_CARD.getCode(), ResponseErrorsMessages.NOT_ID_CARD.getMsg());
45
+        }
46
+        if (!IdcardValidator.isValidatedAllIdcard(idCard)) {
47
+            throw  new WisdomException(ResponseErrorsMessages.ERROR_ID_CARD.getCode(), ResponseErrorsMessages.ERROR_ID_CARD.getMsg());
48
+        }
49
+    }
36
 
50
 
37
     /**
51
     /**
38
      * 添加用户
52
      * 添加用户

+ 6
- 3
CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java 查看文件

42
             responseBean.addError(ResponseErrorsMessages.NOT_USER_NAME.getCode(), ResponseErrorsMessages.NOT_USER_NAME.getMsg());
42
             responseBean.addError(ResponseErrorsMessages.NOT_USER_NAME.getCode(), ResponseErrorsMessages.NOT_USER_NAME.getMsg());
43
             return responseBean;
43
             return responseBean;
44
         }
44
         }
45
-        if (StringUtils.isBlank(idCard)) {
46
-            responseBean.addError(ResponseErrorsMessages.NOT_ID_CARD.getCode(), ResponseErrorsMessages.NOT_ID_CARD.getMsg());
47
-            return responseBean;
45
+        if (StringUtils.isNotBlank(idCard)) {
46
+            this.checkIdCart(idCard);
48
         }
47
         }
49
         if (StringUtils.isBlank(gender)) {
48
         if (StringUtils.isBlank(gender)) {
50
             responseBean.addError(ResponseErrorsMessages.NOT_GENDER.getCode(), ResponseErrorsMessages.NOT_GENDER.getMsg());
49
             responseBean.addError(ResponseErrorsMessages.NOT_GENDER.getCode(), ResponseErrorsMessages.NOT_GENDER.getMsg());
97
             return responseBean;
96
             return responseBean;
98
         }
97
         }
99
 
98
 
99
+        if (StringUtils.isNotBlank(idCard)) {
100
+            this.checkIdCart(idCard);
101
+        }
102
+
100
         UpdateWrapper<TaUser> userUpdateWrapper = new UpdateWrapper<>();
103
         UpdateWrapper<TaUser> userUpdateWrapper = new UpdateWrapper<>();
101
         userUpdateWrapper.eq("id", userId);
104
         userUpdateWrapper.eq("id", userId);
102
         userUpdateWrapper.set(StringUtils.isNotBlank(userName), "user_name", userName);
105
         userUpdateWrapper.set(StringUtils.isNotBlank(userName), "user_name", userName);