根据身份证获取居民信息（党员管理用，主要显示住址）

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/5/20 9:55
+ */
+@Data
+public class IcResiUserInfoDTO implements Serializable {
+    private static final long serialVersionUID = -6071352387529766881L;
+    private String icResiUserId;
+    private String name;
+    private String mobile;
+    private String address;
+}

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

@@ -1070,4 +1070,19 @@ public class IcResiUserController implements ResultDataResolver {
     public Result<IcPartyMemberDTO> icPartyMemberSync(@RequestBody IcPartyMemberDTO formDTO) {
         return new Result<IcPartyMemberDTO>().ok(icResiUserService.icPartyMemberSync(formDTO));
     }
+
+    /**
+     * 根据身份证获取居民信息（党员管理用，主要显示住址）
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< IcResiUserInfoDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/5/20 10:11
+     */
+    @PostMapping("getUserByIdCard")
+    public Result<IcResiUserInfoDTO> getUserByIdCard(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<IcResiUserInfoDTO>().ok(icResiUserService.getUserByIdCard(formDTO));
+    }
 }

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

@@ -346,4 +346,14 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/5/17 19:12
      */
     IcPartyMemberDTO icPartyMemberSync(IcPartyMemberDTO formDTO);
+
+    /**
+     * 根据身份证获取居民信息（党员管理用，主要显示住址）
+     *
+     * @Param formDTO
+     * @Return {@link IcResiUserInfoDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/5/20 9:59
+     */
+    IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO);
 }

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

@@ -2052,6 +2052,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
                 wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
+                wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR);
                 user = baseDao.selectOne(wrapper);
                 if(null == user) {
                     return dto;
@@ -2084,6 +2085,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
             wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
+            wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR);
             IcResiUserEntity user = baseDao.selectOne(wrapper);
             //居民信息不存在时返回
             if(null == user) {
@@ -2124,6 +2126,41 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return dto;
     }
 
+    /**
+     * 根据身份证获取居民信息（党员管理用，主要显示住址）
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link IcResiUserInfoDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/5/20 9:59
+     */
+    @Override
+    public IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO) {
+        IcResiUserInfoDTO result = new IcResiUserInfoDTO();
+        LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
+        wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
+        wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR);
+        IcResiUserEntity entity = baseDao.selectOne(wrapper);
+        if (null != entity) {
+            result.setIcResiUserId(entity.getId());
+            result.setName(entity.getName());
+            result.setMobile(entity.getMobile());
+            //查询网格信息
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId());
+            //查询房屋信息
+            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), entity.getHomeId());
+            if (null != gridInfo && null != houseInfo) {
+                String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                        .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                        .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                result.setAddress(address);
+            }
+        }
+        return result;
+    }
+
     /**
      * desc:根据字段值获取 options
      * @param customerId