根据身份证号||ic_resi_user.id找居民端小程序里的人

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiUserFormDTO.java

@@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
- * 根据身份证号找人，也可根据epmetUserId查询，或者icResiUserId
+ * 根据身份证号||ic_resi_user.id找居民端小程序里的人
  */
 @Data
 public class ResiUserFormDTO implements Serializable {
@@ -18,11 +18,6 @@ public class ResiUserFormDTO implements Serializable {
      */
     private String idNum;
 
-    /**
-     * epemt_user.user.id
-     */
-    private String epmetUserId;
-
     /**
      * ic_resi_user.id
      */
@@ -30,7 +25,4 @@ public class ResiUserFormDTO implements Serializable {
 
     @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
-
-    //@NotBlank(message = "findType不能为空;根据身份证号：byIdNum;根据ic居民：byIc;根据小程序里的居民：byEpmetUser", groups = AddUserInternalGroup.class)
-    //private String findType;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -662,11 +662,11 @@ public interface EpmetUserOpenFeignClient {
     Result<List<CustomerStaffDTO>> getByRealNames(@RequestBody GetByRealNamesFormDTO formDTO);
 
     /**
-     * 根据身份证号找人，也可根据epmetUserId查询，或者icResiUserId
+     * 根据身份证号||ic_resi_user.id找居民端小程序里的人
      *
      * @param formDTO
      * @return
      */
-    @PostMapping(value = "/epmetuser/user/finduser")
+    @PostMapping(value = "/epmetuser/user/findepmetuser")
-    Result<ResiUserResDTO> findUser(@RequestBody ResiUserFormDTO formDTO);
+    Result<ResiUserResDTO> findEpmetUser(@RequestBody ResiUserFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -481,13 +481,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     /**
-     * 根据身份证号找人
+     * 根据身份证号||ic_resi_user.id找居民端小程序里的人
      *
      * @param formDTO
      * @return
      */
     @Override
-    public Result<ResiUserResDTO> findUser(ResiUserFormDTO formDTO) {
+    public Result<ResiUserResDTO> findEpmetUser(ResiUserFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findUser", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findEpmetUser", formDTO);
     }
 }

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

@@ -187,15 +187,15 @@ public class UserController {
 	}
 
 	/**
-	 * 根据身份证号找人，也可根据epmetUserId查询，或者icResiUserId
+	 * 根据身份证号||ic_resi_user.id找居民端小程序里的人
 	 *
 	 *
 	 * @param formDTO
 	 * @return
 	 */
-	@PostMapping("finduser")
+	@PostMapping("findepmetuser")
-	public Result<ResiUserResDTO> findUser(@RequestBody ResiUserFormDTO formDTO){
+	public Result<ResiUserResDTO> findEpmetUser(@RequestBody ResiUserFormDTO formDTO){
 		ValidatorUtils.validateEntity(formDTO,ResiUserFormDTO.AddUserInternalGroup.class);
-		return new Result<ResiUserResDTO>().ok(userService.findUser(formDTO));
+		return new Result<ResiUserResDTO>().ok(userService.findEpmetUser(formDTO));
 	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java

@@ -106,11 +106,11 @@ public interface UserService extends BaseService<UserEntity> {
     UserDTO queryUserClient(String userId);
 
     /**
-     * 根据身份证号找人
+     * 根据身份证号||ic_resi_user.id找居民端小程序里的人
      *
      *
      * @param formDTO
      * @return
      */
-    ResiUserResDTO findUser(ResiUserFormDTO formDTO);
+    ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO);
 }

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

@@ -534,8 +534,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //新增以下2个返参
         ResiUserFormDTO resiUserFormDTO = new ResiUserFormDTO();
         resiUserFormDTO.setIcResiUserId(formDTO.getUserId());
+        resiUserFormDTO.setIdNum(personData.getIdCard());
         resiUserFormDTO.setCustomerId(formDTO.getCustomerId());
-        ResiUserResDTO resiUserResDTO = userService.findUser(resiUserFormDTO);
+        //根据身份证号+ic_resi_user.id找epmetUserId
+        ResiUserResDTO resiUserResDTO = userService.findEpmetUser(resiUserFormDTO);
         personData.setEpmetUserId(null != resiUserResDTO ? resiUserResDTO.getEpmetUserId() : StrConstant.EPMETY_STR);
         personData.setIcResiUserId(formDTO.getUserId());
 

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

@@ -350,33 +350,32 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     /**
-     * 根据身份证号找人，也可根据epmetUserId查询，或者icResiUserId
+     * 根据身份证号||ic_resi_user.id找居民端小程序里的人
      *
      * @param formDTO
      * @return
      */
     @Override
-    public ResiUserResDTO findUser(ResiUserFormDTO formDTO) {
+    public ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO) {
-        if (StringUtils.isBlank(formDTO.getIdNum()) && StringUtils.isBlank(formDTO.getEpmetUserId()) && StringUtils.isBlank(formDTO.getIcResiUserId())) {
+        if (StringUtils.isBlank(formDTO.getIdNum()) && StringUtils.isBlank(formDTO.getIcResiUserId())) {
-            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"身份证号、epmetuserId、icResiUserId至少输入一个","至少选择一种查询方式");
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "身份证号、icResiUserId至少输入一个", "至少选择一种查询方式");
-        }
-        ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class);
-        //可以根据身份证号查询，也可以根据ic_resi_user.id查询
-        if (StringUtils.isBlank(formDTO.getIcResiUserId())) {
-            IcResiUserDTO icResiUser = icResiUserService.getByIdCard(formDTO.getCustomerId(), formDTO.getIdNum(), formDTO.getIcResiUserId());
-            resiUserResDTO.setIcResiUserId(null != icResiUser ? icResiUser.getId() : StrConstant.EPMETY_STR);
-            resiUserResDTO.setIdNum(null != icResiUser ? icResiUser.getIdCard() : StrConstant.EPMETY_STR);
         }
         //可以根据身份证号查询，也可以根据epmet_user.user.id查询
-        if (StringUtils.isBlank(formDTO.getEpmetUserId())) {
+        if (StringUtils.isNotBlank(formDTO.getIcResiUserId()) && StringUtils.isBlank(formDTO.getIdNum())) {
+            IcResiUserDTO icResiUserDTO = icResiUserService.getByIdCard(formDTO.getCustomerId(), null, formDTO.getIcResiUserId());
+            if (null == icResiUserDTO) {
+                throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据ic_resi_user.id没有找到记录id=" + formDTO.getIcResiUserId(), "至少选择一种查询方式");
+            }
+            formDTO.setIdNum(icResiUserDTO.getIdCard());
+        }
+        ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class);
+        if (StringUtils.isNotBlank(formDTO.getIdNum())) {
             UserBaseInfoDTO userBaseInfoDTO = userBaseInfoService.getUserIdByIdNum(formDTO.getCustomerId(),
-                    formDTO.getIdNum(),
+                    formDTO.getIdNum(), null);
-                    formDTO.getEpmetUserId());
             if (null == userBaseInfoDTO || StringUtils.isBlank(userBaseInfoDTO.getUserId())) {
                 log.info("user_base_info没有找到,去查下user_resi_info表吧");
                 UserResiInfoDTO userResiInfoDTO = userResiInfoDao.selectByIdNum(formDTO.getCustomerId(),
-                        formDTO.getIdNum(),
+                        formDTO.getIdNum(), null);
-                        formDTO.getEpmetUserId());
                 resiUserResDTO.setEpmetUserId(null != userResiInfoDTO ? userResiInfoDTO.getId() : StrConstant.EPMETY_STR);
             } else {
                 resiUserResDTO.setEpmetUserId(userBaseInfoDTO.getUserId());