【证件类型】护照-访客、信息采集、房屋租赁、党员认证、居民注册修改完，待测试

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.IdCardRegexUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.*;
 import com.epmet.dto.*;
@@ -167,6 +168,14 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	@Transactional(rollbackFor = Exception.class)
 	public Result submit(PartymemberInfoDTO partyMemberInfoDTO) {
 		log.info("submit param:{}",JSON.toJSONString(partyMemberInfoDTO));
+
+		// 证件类型判断----start----
+		IdCardRegexUtils regex = IdCardRegexUtils.parse(partyMemberInfoDTO.getIdCard());
+		if (regex == null) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+		}
+		// 证件类型判断----end----
+
 		Result result = new Result();
 
 		//校验手机验证码是否正常

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@@ -4,15 +4,19 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.IdCardRegexUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.IcResiCollectService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -180,6 +184,18 @@ public class IcResiCollectController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO);
         formDTO.setOrigin("internal");//固定为内部
+
+        // 证件类型判断----start----
+        for (IcResiCollectMemFormDTO member : formDTO.getMemberList()) {
+            if (StringUtils.isNotBlank(member.getIdNum())) {
+                IdCardRegexUtils regex = IdCardRegexUtils.parse(member.getIdNum());
+                if (regex == null) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+                }
+            }
+        }
+        // 证件类型判断----end----
+
         return icResiCollectService.saveCollectInfo(formDTO);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java

@@ -3,9 +3,12 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.IdCardRegexUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -117,6 +120,12 @@ public class IcResiCollectVisitorController {
     public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto);
+        // 证件类型判断----start----
+        IdCardRegexUtils regex = IdCardRegexUtils.parse(dto.getIdCard());
+        if (regex == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+        }
+        // 证件类型判断----end----
         return icResiCollectVisitorService.saveInfo(dto);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -307,12 +307,30 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @PostMapping("rent/updateimage")
     public Result updateImage(@LoginUser TokenDto tokenDto, @RequestBody RentTenantFormDTO formDTO) {
+
+        // 身份证号验证
+        if (StringUtils.isNotBlank(formDTO.getUser().getIdCard())) {
+            checkIdCard(formDTO.getUser().getIdCard());
+        }
+
+        if (StringUtils.isNotBlank(formDTO.getIdCard())) {
+            checkIdCard(formDTO.getIdCard());
+        }
+
         String resiUserId = icResiUserService.updateImage(tokenDto, formDTO);
         //推送MQ事件
         editResiMq(formDTO.getCustomerId(), resiUserId);
         return new Result();
     }
 
+    private void checkIdCard(String idCard) {
+        // 证件类型判断----start----
+        IdCardRegexUtils regex = IdCardRegexUtils.parse(idCard);
+        if (regex == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+        }
+    }
+
     private void editResiMq(String customerId, String userId) {
         //推送MQ事件
         IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -26,10 +26,13 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.IdCardTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.IdCardRegexUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserConstant;
@@ -243,6 +246,16 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 */
 	@Transactional(rollbackFor = Exception.class)
 	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
+
+		if (StringUtils.isNotBlank(userResiInfoDTO.getIdNum())) {
+			// 证件类型判断----start----
+			IdCardRegexUtils regex = IdCardRegexUtils.parse(userResiInfoDTO.getIdNum());
+			if (regex == null) {
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+			}
+			// 证件类型判断----end----
+		}
+
         //1:注册信息表新增数据
 		baseDao.insert(ConvertUtils.sourceToTarget(userResiInfoDTO, UserResiInfoEntity.class));
 		//更新该用户在该客户下的注册状态