From c8b7fa309611c190d0e6cad0be1860ccbe3060be Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 7 Dec 2022 15:28:18 +0800
Subject: [PATCH] =?UTF-8?q?EpmetUserOpenFeignClient=EF=BC=8C=E6=A2=B3?=
 =?UTF-8?q?=E7=90=86=E6=88=BF=E5=B1=8B=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E4=BA=9B=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/feign/EpmetUserOpenFeignClient.java | 76 +++++++++++++++++--
 .../main/resources/mapper/IcResiUserDao.xml   |  2 +
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index f8edd1a77e..c80eab326e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -673,6 +673,11 @@ public interface EpmetUserOpenFeignClient {
     @GetMapping(value = "/epmetuser/user/queryUserClient/{userId}")
     Result<UserDTO> queryUserClient(@PathVariable("userId") String userId);
 
+    /**
+     * @V23
+     * @param formDTO
+     * @return 查询每个楼栋，18类别下，居民数量
+     */
     @PostMapping("/epmetuser/icresiuser/categorycount")
     Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
 
@@ -685,19 +690,24 @@ public interface EpmetUserOpenFeignClient {
 
     /**
      * 根据身份证号||ic_resi_user.id找居民端小程序里的人
-     *
+     * @V23
      * @param formDTO
      * @return
      */
     @PostMapping(value = "/epmetuser/user/findepmetuser")
     Result<ResiUserResDTO> findEpmetUser(@RequestBody ResiUserFormDTO formDTO);
 
+    /**
+     * @V23
+     * @param icResiUserId
+     * @return 查询当前居民的姓名，和房屋id
+     */
     @GetMapping("/epmetuser/icresiuser/findfamilymem/{icResiUserId}")
     Result<IcResiUserBriefDTO> findFamilyMem(@PathVariable("icResiUserId") String icResiUserId);
 
     /**
      * 查找居民端小程序里的用户对应ic里的人。以及家属们
-     *
+     * @V23
      * @param formDTO
      * @return
      */
@@ -716,17 +726,19 @@ public interface EpmetUserOpenFeignClient {
     Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkListV2(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO);
 
     /**
+     * @V23
      * 获取ic_resi_user
      * @param icResiUserId
-     * @return
+     * @return 根据居民id，查询居民主表信息
      */
     @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}")
     Result<IcResiUserDTO> getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId);
 
     /**
+     * @V23
      * 获取ic_resi_user
      * @param icResiUserIdList
-     * @return
+     * @return 根据居民id，查询居民主表信息（批量查询）
      */
     @PostMapping(value = "/epmetuser/icresiuser/list-icresiuser")
     Result<List<IcResiUserDTO>> getListIcResiUserDTO(@RequestBody List<String> icResiUserIdList);
@@ -748,6 +760,7 @@ public interface EpmetUserOpenFeignClient {
      * @param ids
      * @author zxc
      * @date 2022/3/2 10:32 上午
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/getexistuserbyhouseids")
     Result<List<String>> getExistUserByHouseIds(@RequestBody List<String> ids);
@@ -759,6 +772,7 @@ public interface EpmetUserOpenFeignClient {
      * @return com.epmet.commons.tools.utils.Result
      * @author zhy
      * @date 2022/4/26 10:48
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/rent/updateimage")
     Result updateImage(@RequestBody RentTenantFormDTO formDTO);
@@ -770,10 +784,17 @@ public interface EpmetUserOpenFeignClient {
      * @return com.epmet.commons.tools.utils.Result
      * @author zhy
      * @date 2022/4/26 10:48
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/rent/getrentresiuserinfo")
     Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO);
 
+    /**
+     * 【人房】房屋、居民统计列表数据
+     * @param userDTO
+     * @return
+     * @V23
+     */
     @PostMapping("/epmetuser/icresiuser/userchartlist")
     Result<List<UserChartResultDTO>> userChartList(@RequestBody UserChartFormDTO userDTO);
 
@@ -781,6 +802,7 @@ public interface EpmetUserOpenFeignClient {
      * desc:条件获取房屋成员信息
      * @param formDTO
      * @return
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/getResiUserGroupHomeId")
     Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO);
@@ -789,6 +811,7 @@ public interface EpmetUserOpenFeignClient {
      * desc:更新居民所属 eg：所属网格等等
      * @param formDTO
      * @return
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/changeIcResiUserBelongTo")
     Result<Boolean> changeIcResiUserBelongTo(@RequestBody IcUserBelongToChangedFormDTO formDTO);
@@ -797,6 +820,7 @@ public interface EpmetUserOpenFeignClient {
      * 使用身份证号查询家属信息
      * @param idCard
      * @return
+     * @V23
      */
     @GetMapping("/epmetuser/icresiuser/findFamilyMemByIdCard/{id-card}")
     Result<IcResiUserBriefDTO> findFamilyMemByIdCard(@PathVariable("id-card") String idCard);
@@ -805,6 +829,7 @@ public interface EpmetUserOpenFeignClient {
      * 身份证号查询居民信息
      * @param idCard
      * @return
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/getByResiIdCard/{idcard}")
     Result<IcResiUserDTO> getByResiIdCard(@PathVariable("idcard") String idCard);
@@ -814,6 +839,7 @@ public interface EpmetUserOpenFeignClient {
      *
      * @param idCard
      * @return
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/getAllUserIds")
     Result<List<String>> getAllUserIds(@RequestParam("idcard") String idCard, @RequestParam("customerId") String customerId);
@@ -836,24 +862,51 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/userresiinfo/getStaffAndResi")
     Result<List<StaffAndResiResultDTO>> getStaffAndResi(@RequestBody List<String> userIds);
 
+    /**
+     * 党员管理，同步到居民信息
+     * @V23
+     * @param formDTO
+     * @return
+     */
     @PostMapping("/epmetuser/icresiuser/icPartyMemberSync")
     Result<com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO> icPartyMemberSync(@RequestBody IcPartyMemberDTO formDTO);
 
+    /**
+     * icVolunteerDataExtractionTask
+     * @param customerId
+     * @return 志愿者数据抽取
+     * @V23
+     */
     @PostMapping("/epmetuser/icVolunteerPoly/volunteerDataExtraction/{customerId}")
     Result volunteerDataExtraction(@PathVariable("customerId") String customerId);
 
+    /**
+     * 获取用户绑定的房屋信息
+     * @return
+     */
     @PostMapping("/epmetuser/myHome/homeInfo")
     Result<HomeInfoResultDTO> getHomeInfo();
 
+    /**
+     * 获取居民信息里的志愿者
+     * @V23
+     * @param formDTO
+     * @return
+     */
     @PostMapping("/epmetuser/icresiuser/getVolunteerList")
     Result<List<OptionDataResultDTO>> getVolunteerList(@RequestBody IcResiUserDTO formDTO);
 
+    /**
+     * @param icUserId
+     * @return 获取居民信息对应的居民端用户ID
+     * @V23
+     */
     @PostMapping("/epmetuser/icresiuser/getUserId/{icUserId}")
     Result<List<String>> getUserId(@PathVariable("icUserId") String icUserId);
 
     /**
      * 获取录入居民的数量
-     *
+     * @V23
      * @Param formDTO
      * @Return {@link Result<Map<String, Integer>>}
      * @Author zhaoqifeng
@@ -864,7 +917,7 @@ public interface EpmetUserOpenFeignClient {
 
     /**
      * desc: 同步数据，房内居民数量 类别统计数据量等只用客户id当条件
-     *
+     * @V23
      * @param customerId
      * @return com.epmet.commons.tools.utils.Result<java.lang.String>
      * @author LiuJanJun
@@ -899,10 +952,16 @@ public interface EpmetUserOpenFeignClient {
      * 居民列表，非动态
      * @param input
      * @return
+     * @V23
      */
     @PostMapping("/epmetuser/icresiuser/nonDynamic/listResi")
     Result<PageData<IcResiNonDynamicResultDTO>> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input);
 
+    /**
+     * icUpdateYlfnTask
+     * @V23
+     * @return 判定是否是育龄妇女
+     */
     @PostMapping("/epmetuser/icresiuser/updateYlfn")
     Result updateYlfn();
 
@@ -956,6 +1015,11 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/dataSyncConfig/vaccineInfoScanTask")
     Result vaccineInfoScanTask(@RequestBody DataSyncTaskParam formDTO);
 
+    /**
+     * @V23
+     * @param formDTO
+     * @return
+     */
     @PostMapping("/epmetuser/icresiuser/rhzkList")
     Result<List<RHZKStatisticsResultDTO>> renHuCondition(@RequestBody RHZKStatisticsFormDTO formDTO);
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 036cb5946b..b3e82440ef 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -418,6 +418,8 @@
             </foreach>
         </if>
     </select>
+
+    <!--  查询每个楼栋，18类别下，居民数量  -->
     <select id="getHomeUserCategoryCount" resultType="java.util.Map">
         SELECT
             HOME_ID,