根据身份证号找人：/epmetuser/user/finduser

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

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class ResiUserFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "身份证号不能为空", groups = AddUserInternalGroup.class)
+    private String idNum;
+
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.form.ResiUserFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class ResiUserResDTO implements Serializable {
+    private String idNum;
+    private String customerId;
+    private String epmetUserId;
+    private String icResiUserId;
+}

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

@@ -660,4 +660,13 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping(value = "epmetuser/customerstaff/getbyrealnames")
     Result<List<CustomerStaffDTO>> getByRealNames(@RequestBody GetByRealNamesFormDTO formDTO);
+
+    /**
+     * 根据身份证号找人
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping(value = "/epmetuser/user/finduser")
+    Result<ResiUserResDTO> findUser(@RequestBody ResiUserFormDTO formDTO);
 }

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

@@ -479,4 +479,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<CustomerStaffDTO>> getByRealNames(GetByRealNamesFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getByRealNames", formDTO);
     }
+
+    /**
+     * 根据身份证号找人
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public Result<ResiUserResDTO> findUser(ResiUserFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findUser", formDTO);
+    }
 }

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

@@ -185,4 +185,17 @@ public class UserController {
 		}
 		return new Result<UserDTO>().ok(userService.queryUserClient(userId));
 	}
+
+	/**
+	 * 根据身份证号找人
+	 *
+	 *
+	 * @param formDTO
+	 * @return
+	 */
+	@PostMapping("finduser")
+	public Result<ResiUserResDTO> findUser(@RequestBody ResiUserFormDTO formDTO){
+		ValidatorUtils.validateEntity(formDTO,ResiUserFormDTO.AddUserInternalGroup.class);
+		return new Result<ResiUserResDTO>().ok(userService.findUser(formDTO));
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -162,4 +162,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<DemandUserResDTO> selectDemandUsers(@Param("agencyId") String agencyId,
                                              @Param("gridId")String gridId,
                                              @Param("name")String name);
+
+    String selectIdByIdCard(@Param("customerId") String customerId, @Param("idNum")String idNum);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -80,4 +80,6 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @date 2020.07.30 19:16
      **/
     String selectIdByUserId(@Param("userId") String userId);
+
+    String selectUserId(@Param("customerId") String customerId, @Param("idNum")String idNum);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@@ -103,4 +103,6 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @return
 	 */
     Integer selectCountByIdNum(@Param("idNum") String idNum,@Param("customerId") String customerId);
+
+	String selectByIdNum(@Param("customerId") String customerId, @Param("idNum")String idNum);
 }

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

@@ -141,4 +141,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     List<FormItemResult> listFormItems(String customerId, String formCode);
 
     List<DemandUserResDTO> queryDemandUsers(DemandUserFormDTO formDTO);
+
+    /**
+     * 返回ic_resi_user.id
+     *
+     * @param customerId
+     * @param idNum
+     * @return
+     */
+    String getByIdCard(String customerId, String idNum);
 }

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

@@ -189,4 +189,6 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      * @date 2020.08.21 17:16
     **/
     ExtUserInfoResultDTO extUserInfo(CommonUserIdFormDTO param);
+
+    String getUserIdByIdNum(String customerId, String idNum);
 }

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

@@ -104,4 +104,13 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2021/9/10 8:50 上午
      */
     UserDTO queryUserClient(String userId);
+
+    /**
+     * 根据身份证号找人
+     *
+     *
+     * @param formDTO
+     * @return
+     */
+    ResiUserResDTO findUser(ResiUserFormDTO formDTO);
 }

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

@@ -21,7 +21,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
@@ -47,7 +46,6 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IcPlatformConstant;
 import com.epmet.constant.IcResiUserConstant;
-import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.*;
@@ -852,4 +850,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public List<DemandUserResDTO> queryDemandUsers(DemandUserFormDTO formDTO) {
         return baseDao.selectDemandUsers(formDTO.getAgencyId(),formDTO.getGridId(),formDTO.getName());
     }
+
+    /**
+     * 返回ic_resi_user.id
+     *
+     * @param customerId
+     * @param idNum
+     * @return
+     */
+    @Override
+    public String getByIdCard(String customerId, String idNum) {
+        return baseDao.selectIdByIdCard(customerId,idNum);
+    }
 }

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

@@ -442,4 +442,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }
         return result;
     }
+
+    @Override
+    public String getUserIdByIdNum(String customerId, String idNum) {
+        return baseDao.selectUserId(customerId,idNum);
+    }
 }

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

@@ -19,6 +19,7 @@ import com.epmet.entity.UserEntity;
 import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.EpmetPointOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.service.IcResiUserService;
 import com.epmet.service.UserBaseInfoService;
 import com.epmet.service.UserService;
 import com.epmet.util.ModuleConstant;
@@ -53,7 +54,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private EpmetPointOpenFeignClient epmetPointOpenFeignClient;
     @Autowired
     private UserResiInfoDao userResiInfoDao;
-
+    @Autowired
+    private IcResiUserService icResiUserService;
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
 
@@ -344,4 +346,23 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return baseDao.selectByUserId(userId);
     }
 
+    /**
+     * 根据身份证号找人
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public ResiUserResDTO findUser(ResiUserFormDTO formDTO) {
+        ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class);
+        String icResiUserId = icResiUserService.getByIdCard(formDTO.getCustomerId(), formDTO.getIdNum());
+        resiUserResDTO.setIcResiUserId(icResiUserId);
+        String userId = userBaseInfoService.getUserIdByIdNum(formDTO.getCustomerId(), formDTO.getIdNum());
+        if (StringUtils.isBlank(userId)) {
+            resiUserResDTO.setEpmetUserId(userResiInfoDao.selectByIdNum(formDTO.getCustomerId(), formDTO.getIdNum()));
+        }
+        resiUserResDTO.setEpmetUserId(userId);
+        return resiUserResDTO;
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -308,4 +308,15 @@
     ORDER BY
         CONVERT ( ir.NAME USING gbk ) ASC
     </select>
+
+    <select id="selectIdByIdCard" parameterType="map" resultType="java.lang.String">
+        select
+            ir.id
+         FROM
+            ic_resi_user ir
+        WHERE
+        ir.DEL_FLAG = '0'
+        and ir.customer_id=#{customerId}
+        and ir.ID_CARD=#{idNum}
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -120,4 +120,13 @@
         WHERE DEL_FLAG = '0'
         AND USER_ID = #{userId}
     </select>
+
+    <select id="selectUserId" parameterType="map" resultType="java.lang.String">
+        SELECT
+          distinct user_id
+        FROM user_base_info
+        WHERE DEL_FLAG = '0'
+        AND customer_id = #{=customerId}
+        and id_num=#{idNum}
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -186,4 +186,15 @@
             AND uri.id_num = #{idNum}
             and uri.customer_id=#{customerId}
     </select>
+
+    <select id="selectByIdNum" parameterType="map" resultType="java.lang.String">
+        SELECT
+            distinct uri.user_id
+        FROM
+            user_resi_info uri
+        WHERE
+            uri.DEL_FLAG = '0'
+            AND uri.id_num = #{idNum}
+            and uri.customer_id=#{customerId}
+    </select>
 </mapper>