Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java

@@ -1,6 +1,7 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory;
@@ -21,4 +22,54 @@ public interface EpmetAdminOpenFeignClient {
      */
     @PostMapping("/sys/cors-config/list")
     Result<List<CorsConfigResultDTO>> list();
+
+    /**
+     * @Description 文化程度
+     * @Param
+     * @Return {@link Result<List< OptionResultDTO >>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 17:27
+     */
+    @PostMapping("/sys/dict/data/education")
+    Result<List<OptionResultDTO>> getEducationOption();
+
+    /**
+     * @Description 住房性质
+     * @Param
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 17:27
+     */
+    @PostMapping("/sys/dict/data/house")
+    Result<List<OptionResultDTO>> getHouseOption();
+
+    /**
+     * @Description 民族
+     * @Param
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 17:27
+     */
+    @PostMapping("/sys/dict/data/nation")
+    Result<List<OptionResultDTO>> getNationOption();
+
+    /**
+     * @Description 九小场所
+     * @Param
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 17:27
+     */
+    @PostMapping("/sys/dict/data/ninesmallplaces")
+    Result<List<OptionResultDTO>> getNineSmallPlacesOption();
+
+    /**
+     * @Description 人员关系
+     * @Param
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 17:27
+     */
+    @PostMapping("/sys/dict/data/relationship")
+    Result<List<OptionResultDTO>> getRelationshipOption();
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java

@@ -1,6 +1,7 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
@@ -15,4 +16,29 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli
     public Result<List<CorsConfigResultDTO>> list() {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "list", null);
     }
+
+    @Override
+    public Result<List<OptionResultDTO>> getEducationOption() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getEducationOption", null);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getHouseOption() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseOption", null);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getNationOption() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getNationOption", null);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getNineSmallPlacesOption() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getNineSmallPlacesOption", null);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getRelationshipOption() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRelationshipOption", null);
+    }
 }

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -97,7 +97,21 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.2.6</version>
+            <version>2.2.10</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.github.wnjustdoit</groupId>

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -16,7 +16,21 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.2.6</version>
+            <version>2.2.10</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -1,10 +1,9 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.*;
-import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.CustomerPartyBranchDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.GovOrgOpenFeignClientFallbackFactory;
@@ -453,4 +452,59 @@ public interface GovOrgOpenFeignClient {
 
     @PostMapping(value = "/gov/org/house/queryListHouseInfo",consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody  Set<String> houseIds);
+
+    
+    
+    /**
+     * @Description 获取组织下网格选项
+     * @Param formDTO
+     * @Return {@link Result<List< OptionResultDTO >>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:02
+     */
+    @PostMapping("/gov/org/customergrid/gridoption")
+    Result<List<OptionResultDTO>> getGridOption(@RequestBody AgencyIdFormDTO formDTO);
+
+    /**
+     * 获取网格下支部小组
+     * @Param formDTO
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/27 9:58
+     */
+    @PostMapping("/gov/org/customerpartybranch/branchoption")
+    Result<List<OptionResultDTO>> getBranchOption(@RequestBody CustomerPartyBranchDTO formDTO);
+
+    /**
+     * @Description 获取小区内的楼栋
+     * @Param dto
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:46
+     */
+    @PostMapping("/gov/org/icbuilding/buildingoption")
+    Result<List<OptionResultDTO>> getBuildingOptions(IcBuildingDTO dto);
+
+    /**
+     * @Description 获取楼栋内单元
+     * @Param dto
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:46
+     */
+    @PostMapping("/gov/org/icbuildingunit/unitoption")
+    Result<List<OptionResultDTO>> getUnitOptions(IcBuildingUnitDTO dto);
+
+    @PostMapping("/gov/org/ichouse/houseoption")
+    Result<List<OptionResultDTO>> getHouseOption(@RequestBody HouseFormDTO formDTO);
+
+    /**
+     * @Description 获取网格下小区列表
+     * @Param dto
+     * @Return {@link Result< List< OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:38
+     */
+    @PostMapping("/gov/org/icneighborhood/neighborhoodoption")
+    Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -1,11 +1,10 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.*;
-import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.CustomerPartyBranchDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -276,6 +275,36 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListHouseInfo", houseIds);
     }
 
+    @Override
+    public Result<List<OptionResultDTO>> getGridOption(AgencyIdFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridOption", formDTO);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getBranchOption(CustomerPartyBranchDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getBranchOption", formDTO);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getBuildingOptions(IcBuildingDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getBuildingOptions", dto);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getUnitOptions(IcBuildingUnitDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getUnitOptions", dto);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getHouseOption(HouseFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHouseOption", formDTO);
+    }
+
+    @Override
+    public Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getNeighborHoodOptions", dto);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -118,7 +118,7 @@
         a.OWNER_ID_CARD as ownerIdCard,
 
         a.ID as houseId,
-        c.ID as neighbourHoodId,
+        c.ID as neighborHoodId,
         b.ID as buildingId,
         a.BUILDING_UNIT_ID as unitNumKey,
         a.HOUSE_TYPE as houseTypeKey,

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

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
@@ -646,4 +647,7 @@ public interface EpmetUserOpenFeignClient {
      */
     @GetMapping(value = "/epmetuser/user/queryUserClient/{userId}")
     Result<UserDTO> queryUserClient(@PathVariable("userId") String userId);
+
+    @PostMapping("/epmetuser/icresidemanddict/demandoption/demandoption")
+    Result<List<OptionResultDTO>> getDemandOptions();
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -463,4 +464,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<UserDTO> queryUserClient(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryUserClient", userId);
     }
+
+    @Override
+    public Result<List<OptionResultDTO>> getDemandOptions() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getDemandOptions", null);
+    }
 }

epmet-user/epmet-user-server/pom.xml

@@ -13,10 +13,29 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-admin-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.2.6</version>
+            <version>2.2.10</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java

@@ -101,4 +101,6 @@ public interface UserConstant {
 	String GRID_ID="GRID_ID";
 	String GENDER="GENDER";
 	String HOUSE_TYPE_KEY="HOUSE_TYPE";
+    String HOME_ID = "HOME_ID";
+
 }

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

@@ -37,11 +37,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CustomerFormResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.FormGroupDTO;
-import com.epmet.dto.result.FormItem;
-import com.epmet.dto.result.HomeUserResultDTO;
 import com.epmet.excel.IcResiUserExcel;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcResiUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -76,6 +74,8 @@ public class IcResiUserController {
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
     @Autowired
     private IcResiUserService icResiUserService;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @GetMapping("page")
     public Result<PageData<IcResiUserDTO>> page(@RequestParam Map<String, Object> params){
@@ -331,7 +331,7 @@ public class IcResiUserController {
         pageFormDTO.setPageFlag(false);
         //PageData<Map<String, Object>> mapPageData = icResiUserService.pageResiMap(pageFormDTO);
         //List<Map<String, Object>> list = mapPageData.getList();
-        List<Map<String, Object>> list = icResiUserService.dynamicQuery(pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
+        List<Map<String, Object>> list = icResiUserService.getDataForExport(pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
         //list = (List<Map<String, Object>>)JSON.parse("[{\"IS_BDHJ\":\"1\",\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest2\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":null,\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":null,\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":null,\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"},{\"IS_SPECIAL\":\"1\",\"IS_XFRY\":\"0\",\"REMARKS\":\"beizhu\",\"IS_PARTY\":\"1\",\"icResiUserId\":\"yzmtest\",\"HOME_ID\":\"中海国际社区一里城1号楼1单元101\",\"HOUSE_TYPE\":\"平房\",\"UNIT_NAME\":\"1单元\",\"GRID_ID\":\"市北区-市北区第三网格3\",\"IS_DB\":\"0\",\"GENDER\":\"男\",\"BIRTHDAY\":\"2021-10-04\",\"IS_VETERANS\":\"0\",\"IS_MB\":\"0\",\"IS_UNEMPLOYED\":\"0\",\"DEMAND_NAME\":\"心理咨询\",\"IS_KC\":\"0\",\"IS_ENSURE_HOUSE\":\"0\",\"IS_SD\":\"0\",\"NAME\":\"尹作梅\",\"RDSJ\":\"2021-10-28 00:00:00\",\"IS_VOLUNTEER\":\"1\",\"GRID_ID_VALUE\":\"e74829ffc43d5470eba6b5e060c11e63\",\"IS_SZ\":\"0\",\"IS_CJ\":\"0\",\"HOME_ID_VALUE\":\"200\",\"DEMAND_CATEGORY_IDS\":\"10180002\",\"VILLAGE_NAME\":\"中海国际社区一里城\",\"IS_DBH\":\"0\",\"IS_SN\":\"0\",\"BUILD_NAME\":\"1号楼\",\"IS_YLFN\":\"0\",\"IS_UNITED_FRONT\":\"0\",\"ID_CARD\":\"371325199310260529\",\"MOBILE\":\"15764229697\",\"IS_OLD_PEOPLE\":\"0\",\"DOOR_NAME\":\"101\"}]");
         log.info("list:{}", JSON.toJSONString(list));
 
@@ -349,42 +349,44 @@ public class IcResiUserController {
         resiFormItems.getItemList().forEach(item->{
             if (item.getChildGroup() != null){
                 if (!item.getChildGroup().getTableName().equals(BASE_TABLE_NAME)) {
-                    sheetMap.put( n.incrementAndGet(),mapData);
+                    sheetMap.put(n.incrementAndGet() ,mapData);
-                    System.out.println(n.get());
                 }
             }
         });
-        for (FormGroupDTO group : resiFormItems.getGroupList()) {
-
-        }
-
-
-
 
         Workbook workbook = ExcelExportUtil.exportExcel(sheetMap, params);
+        workbook.setActiveSheet(0);
+
         //header
+        String fileName = "居民信息.xls";
         response.setHeader("content-Type", "application/vnd.ms-excel");
-        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("居民信息.xls", "UTF-8"));
+        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8"));
         workbook.write(response.getOutputStream());
-
-       /* //方式1 通过mv导出
-       ModelAndView mv = new ModelAndView(new EasypoiTemplateExcelView());
-        mv.addObject(TemplateExcelConstants.FILE_NAME, "继续追踪导出详情-"));
-        mv.addObject(TemplateExcelConstants.PARAMS, new TemplateExportParams(templatePath));
-        mv.addObject(TemplateExcelConstants.MAP_DATA, mapData);
-        return mv;*/
-
     }
 
+    /**
+     * excel导入居民基本信息
+     * @param loginUser
+     * @return
+     */
     @PostMapping("import/excel")
-    public Result importExcelByEasyExcel() {
+    public Result importExcelByEasyExcel(@LoginUser TokenDto loginUser) {
-        Object header = icResiUserService.importExcel();
+
-        return new Result().ok(header);
+        LoginUserDetailsFormDTO userForm = new LoginUserDetailsFormDTO();
+        userForm.setApp(loginUser.getApp());
+        userForm.setClient(loginUser.getClient());
+        userForm.setUserId(loginUser.getUserId());
+
+        Result<LoginUserDetailsResultDTO> loginUserDetails = epmetUserOpenFeignClient.getLoginUserDetails(userForm);
+
+        Object result = icResiUserService.importIcResiInfoFromExcel(loginUserDetails.getData().getAgencyId());
+        return new Result().ok(result);
     }
 
     @PostMapping("test")
-    public Result<List<Map<String,Object>>> test(@LoginUser TokenDto tokenDto,@RequestBody DynamicQueryFormDTO formDTO){
+    public Result<List<Map<String,Object>>> test(@RequestBody DynamicQueryFormDTO formDTO){
-        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        //formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<List<Map<String,Object>>>().ok(icResiUserService.dynamicQuery(formDTO.getCustomerId(),
                 formDTO.getFormCode(),
                 formDTO.getResultTableName(),

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

@@ -24,6 +24,7 @@ import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.HomeUserResultDTO;
 import com.epmet.entity.IcResiUserEntity;
+import com.epmet.service.impl.IcResiUserServiceImpl;
 
 import java.util.List;
 import java.util.Map;
@@ -127,10 +128,21 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);
 
-    Object importExcel();
+    Object importIcResiInfoFromExcel(String currUserAgencyId);
 
     List<Map<String,Object>> dynamicQuery(String customerId,
                                           String formCode,
                                           String resultTableName,
                                           List<ResiUserQueryValueDTO> conditions);
-}
+
+    /**
+     * desc:条件导出
+     * @param customerId
+     * @param formCode
+     * @param baseTableName
+     * @param conditions
+     * @return
+     */
+    List<Map<String, Object>> getDataForExport(String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions);
+
+}

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

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.enums.HouseTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -38,12 +39,13 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.IcResiUserDao;
-import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.*;
-import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.excel.handler.DynamicEasyExcelListener;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.redis.IcResiUserRedis;
@@ -82,7 +84,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Autowired
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
 
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
+    @Autowired
+    private EpmetAdminOpenFeignClient adminOpenFeignClient;
 
     @Override
     public PageData<IcResiUserDTO> page(Map<String, Object> params) {
@@ -322,8 +328,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             if (map.containsKey(UserConstant.GRID_ID) && null != map.get(UserConstant.GRID_ID) && StringUtils.isNotBlank(map.get(UserConstant.GRID_ID).toString())) {
                 gridIds.add(map.get(UserConstant.GRID_ID).toString());
             }
-            if (map.containsKey("HOME_ID") && null != map.get("HOME_ID") && StringUtils.isNotBlank(map.get("HOME_ID").toString())) {
+            if (map.containsKey(UserConstant.HOME_ID) && null != map.get(UserConstant.HOME_ID) && StringUtils.isNotBlank(map.get(UserConstant.HOME_ID).toString())) {
-                houseIds.add(map.get("HOME_ID").toString());
+                houseIds.add(map.get(UserConstant.HOME_ID).toString());
             }
         }
         Result<List<AllGridsByUserIdResultDTO>> gridInfoRes=govOrgOpenFeignClient.getGridListByGridIds(gridIds);
@@ -342,7 +348,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 resultMap.put(UserConstant.GRID_ID, gridInfoMap.get(gridIdValue).getGridName());
             }
 
-            String homeId = null != resultMap.get("HOME_ID") ? resultMap.get("HOME_ID").toString() : StrConstant.EPMETY_STR;
+            String homeId = null != resultMap.get(UserConstant.HOME_ID) ? resultMap.get(UserConstant.HOME_ID).toString() : StrConstant.EPMETY_STR;
             resultMap.put("HOME_ID_VALUE", homeId);
             if (null != houseInfoMap && houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) {
                 HouseInfoDTO houseInfoDTO = houseInfoMap.get(homeId);
@@ -369,7 +375,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.BIESHU.getName());
                 }
 
-                resultMap.put("HOME_ID", neighBorName.concat(buildName).concat(unitName).concat(doorName));
+                resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName));
             }
 
             if (resultMap.containsKey(UserConstant.GENDER)) {
@@ -422,9 +428,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     @Override
-    public Object importExcel() {
+    public Object importIcResiInfoFromExcel(String currUserAgencyId) {
+        return importIcResiInfoFromExcel(0, 3, currUserAgencyId);
+//        imporExcel(1, 1);
+//        imporExcel(2, 1);
+//        imporExcel(3, 1);
+//        imporExcel(4, 1);
+//        imporExcel(5, 1);
+//        imporExcel(6, 2);
+//        imporExcel(7, 1);
+//        imporExcel(8, 1);
+    }
+
+    private Object importIcResiInfoFromExcel(int sheetNo, int headRowNumber, String currUserAgencyId) {
         DynamicEasyExcelListener readListener = new DynamicEasyExcelListener();
-        EasyExcelFactory.read(new File("/opt/test/基础信息表/resi_info.xls")).registerReadListener(readListener).headRowNumber(3).sheet(0).doRead();
+        EasyExcelFactory.read(new File("/opt/test/基础信息表/resi_info.xls")).registerReadListener(readListener).headRowNumber(3).sheet(sheetNo).doRead();
 
         List<Map<Integer, String>> headList = readListener.getHeadList();
         List<Map<Integer, String>> dataList = readListener.getDataList();
@@ -455,11 +473,72 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     }
                 }, formItem -> formItem)
         );
-        HashMap<String, List<ColumnWrapper>> headerColumnWrapper = integrate(formItemMap, combinedHeaders, dataList, abandonedHeaders);
+        Map<String, ColumnWrapper> headerColumnWrapper = integrate(formItemMap, combinedHeaders, dataList, abandonedHeaders);
+
+        // 持久化
+        persist(headerColumnWrapper, dataList, currUserAgencyId, abandonedHeaders, customerItems.get(0).getTableName());
 
         return headerColumnWrapper;
     }
 
+    /**
+     * 持久化
+     * @param headerColumnWrapper 数据库列包装信息
+     * @param dataRows 数据行集合
+     * @param currUserAgencyId 当前用户的组织id
+     * @param checkBoxOptionColumnIdxAndLabel 复选框的列号&label中文
+     */
+    private void persist(Map<String, ColumnWrapper> headerColumnWrapper, List<Map<Integer, String>> dataRows, 
+                         String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel, String tableName) {
+        for (Map<Integer, String> row : dataRows) {
+
+            // 当前行的列们
+//            List<ColumnWrapper> columnsOfCurrRow = new ArrayList<>();
+            
+            List<String> columnNames = new ArrayList<>(); 
+            List<String> columnValues = new ArrayList<>(); 
+
+            for (Map.Entry<String, ColumnWrapper> columnWrapperEntry : headerColumnWrapper.entrySet()) {
+
+                ColumnWrapper columnWrapper = columnWrapperEntry.getValue();
+                if ("input".equals(columnWrapper.getItemType())
+                        || "textarea".equals(columnWrapper.getItemType())
+                        || "datepicker".equals(columnWrapper.getItemType())
+                        || "timerange".equals(columnWrapper.getItemType())
+                ) {
+
+                    String cellContent = row.get(columnWrapper.getColIndexs().get(0));
+                    columnWrapper.setCellContent(cellContent);
+                    columnWrapper.setColValue(cellContent);
+
+                } else if ("select".equals(columnWrapper.getItemType())
+                        || "radio".equals(columnWrapper.getItemType())){
+
+                    String optionSourceType = columnWrapper.getOptionSourceType();
+                    // 取单元格的内容
+                    String cellContent = row.get(columnWrapper.getColIndexs().get(0));
+                    columnWrapper.setCellContent(cellContent);
+
+                    if ("local".equals(optionSourceType)) {
+                        // 根据单元格内容，取到指定的option
+                        Map<String, String> options = columnWrapper.getOptions();
+                        String colValue = options.get(cellContent);
+                        columnWrapper.setColValue(colValue);
+                    } else {
+                        // remote类型
+
+                        Map<String, String> options = listRemoteOptions(headerColumnWrapper, columnWrapper.getOptionSourceValue(), currUserAgencyId);
+                        String colValue = options.get(cellContent);
+                        columnWrapper.setColValue(colValue);
+                    }
+                } else if ("checkbox".equals(columnWrapper.getItemType())) {
+                    String checkBoxColValue = getCheckBoxColValue(columnWrapper, row, checkBoxOptionColumnIdxAndLabel);
+                    columnWrapper.setColValue(checkBoxColValue);
+                }
+            }
+        }
+    }
+
     /**
      * @description 合并头
      *
@@ -469,7 +548,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @date 2021.10.28 21:27:18
      */
     private HashMap<String, List<Integer>> combineHeaders(Map<Integer, List<String>> headers) {
-        HashMap<String, List<Integer>> itemAndColIndexs = new HashMap<>();
+        HashMap<String, List<Integer>> itemAndColIndexs = new LinkedHashMap<>();
 
         headers.forEach((k, v) -> {
             String tempKey = String.join(":", v);
@@ -485,7 +564,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @description 清洗headers
+     * @description 洗头
      *
      * @param headers
      * @param items
@@ -501,7 +580,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             List<String> v = entry.getValue();
             int lastPartIndex = v.size() - 1;
             String lastValuePart = v.get(lastPartIndex);
-            if (itemLabels.indexOf(lastValuePart) == -1) {
+            if (!itemLabels.contains(lastValuePart)) {
                 // 该部分为options，它的上一级是item，那么去掉options这一级
                 v.remove(lastPartIndex);
                 abandonedHeaders.put(colIdx, lastValuePart);
@@ -509,9 +588,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
 
         return abandonedHeaders;
-        //headers.forEach((k, v) -> {
-        //
-        //});
     }
 
     /**
@@ -521,9 +597,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @author wxz
      * @date 2021.10.28 17:08:51
      */
-    private HashMap<String, List<ColumnWrapper>> integrate(Map<String, FormItem> formItemMap, Map<String, List<Integer>> combinedHeaders,
+    private Map<String, ColumnWrapper> integrate(Map<String, FormItem> formItemMap, Map<String, List<Integer>> combinedHeaders,
                                                            List<Map<Integer, String>> datas, Map<Integer, String> abandonedHeaders) {
-        HashMap<String, List<ColumnWrapper>> data = new HashMap<>();
+
+//        HashMap<String, List<ColumnWrapper>> tables = new HashMap<>();
+        Map<String, ColumnWrapper> columns = new LinkedHashMap<>(combinedHeaders.size());
 
         for (Map.Entry<String, List<Integer>> entry : combinedHeaders.entrySet()) {
             String combinedHeader = entry.getKey();
@@ -539,49 +617,41 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
             // 填充options
             columnWrapper.setItemType(item.getItemType());
+            columnWrapper.setItemId(item.getItemId());
             String groupLabel = item.getGroupLabel();
             String combinedLabel = StringUtils.isBlank(groupLabel) ? item.getLabel() : groupLabel.concat(":").concat(item.getLabel());
             columnWrapper.setCombinedLabel(combinedLabel);
             columnWrapper.setColumnName(item.getColumnName());
             columnWrapper.setColIndexs(entry.getValue());
 
-            if ("remote".equals(item.getOptionSourceType())) {
+            columnWrapper.setOptionSourceType(item.getOptionSourceType());
-                Map<String, String> options = listRemoteOptions(item.getOptionSourceValue());
+            columnWrapper.setOptionSourceValue(item.getOptionSourceValue());
-                columnWrapper.setOptions(options);
+            columnWrapper.setOptions(item.getOptions().stream().collect(Collectors.toMap(OptionDTO::getLabel, OptionDTO::getValue)));
-            } else {
-                Map<String, String> options = item.getOptions().stream().collect(Collectors.toMap(OptionDTO::getLabel, OptionDTO::getValue));
-                columnWrapper.setOptions(options);
-            }
-
-            /*switch (item.getItemType()) {
-                case "input":
-                case "textarea":
-                case "datepicker":
-                case "timerange":
-                    //输入性的
-                    break;
-                case "checkbox":
-                    break;
-            }*/
 
+            columns.put(item.getItemId(), columnWrapper);
         }
-        return data;
+        return columns;
     }
 
     /**
      * 获取checkbox列值
-     * @param options
+     * @param columnWrapper 数据库列包装信息，每一列跳数据对应数据库的一个列
-     * @param writedColIdxs
+     * @param dataRow 数据行，每一条都是一行中的一个单元格
-     * @param abandonedHeaders
+     * @param checkboxOptions 复选框的选项。k: 列号,  value: checkboxlabel中文
      * @return
      */
-    private String getCheckBoxColValue(List<OptionDTO> options, List<Integer> writedColIdxs, Map<Integer, String> abandonedHeaders) {
+    private String getCheckBoxColValue(ColumnWrapper columnWrapper, Map<Integer, String> dataRow, Map<Integer, String> checkboxOptions) {
-
+
-        Map<String, String> optionMap = options.stream().collect(Collectors.toMap(OptionDTO::getLabel, OptionDTO::getValue));
+        Map<String, String> options = columnWrapper.getOptions();
-
+        List<Integer> colIndexs = columnWrapper.getColIndexs();
-        List<String> optionValues = writedColIdxs.stream().map(i -> {
+
-            String optionName = abandonedHeaders.get(i);
+        List<String> optionValues = colIndexs.stream().filter(i -> {
-            return optionMap.get(optionName);
+            String cellContent = dataRow.get(i);
+            if (StringUtils.isNotBlank(cellContent) && cellContent.equals("是")) return true;
+            return false;
+        }).map(i -> {
+            String checkboxOptionLabel = checkboxOptions.get(i);
+            return options.get(checkboxOptionLabel);
         }).collect(Collectors.toList());
 
         return String.join(",", optionValues);
@@ -589,12 +659,85 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     /**
      * 远程获取options
-     * @param uri
+     * @param fullUri
      * @return
      */
-    private Map<String, String> listRemoteOptions(String uri) {
+    private Map<String, String> listRemoteOptions(Map<String, ColumnWrapper> columnWrappers, String fullUri, String currUserAgencyId) {
+        String pureUri = null;
+        String cascadeItemId = null;
+        ColumnWrapper cascadeItemColumnWrapper = null;
+                
+        if (fullUri.indexOf("?") != -1) {
+            String[] uriParts = fullUri.split("\\?");
+            pureUri = uriParts[0];
+            cascadeItemId = uriParts[1];
+
+            // 根据uri上的id，找到关联的itemid，从而找到关联的item的值
+            cascadeItemColumnWrapper = columnWrappers.get(cascadeItemId);
+        } else {
+            pureUri = fullUri;
+        }
 
-        return null;
+        List<OptionResultDTO> options = null;
+
+        switch (pureUri) {
+            case "/epmetuser/icresidemanddict/demandoption":
+                options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
+                        EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/gov/org/customergrid/gridoption":
+                AgencyIdFormDTO form = new AgencyIdFormDTO();
+                form.setAgencyId(currUserAgencyId);
+                options = getResultDataOrThrowsException(govOrgOpenFeignClient.getGridOption(form), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/gov/org/customerpartybranch/branchoption":
+
+                CustomerPartyBranchDTO bform = new CustomerPartyBranchDTO();
+                bform.setGridId(cascadeItemColumnWrapper.getColValue());
+                options = getResultDataOrThrowsException(govOrgOpenFeignClient.getBranchOption(bform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/gov/org/icbuilding/buildingoption":
+                IcBuildingDTO buildingform = new IcBuildingDTO();
+                buildingform.setNeighborHoodId(cascadeItemColumnWrapper.getColValue());
+                options = getResultDataOrThrowsException(govOrgOpenFeignClient.getBuildingOptions(buildingform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/gov/org/icbuildingunit/unitoption":
+                IcBuildingUnitDTO buForm = new IcBuildingUnitDTO();
+                buForm.setBuildingId(cascadeItemColumnWrapper.getColValue());
+                options = getResultDataOrThrowsException(govOrgOpenFeignClient.getUnitOptions(buForm), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/gov/org/ichouse/houseoption":
+                HouseFormDTO hform = new HouseFormDTO();
+                hform.setUnitId(cascadeItemColumnWrapper.getColValue());
+                options = getResultDataOrThrowsException(govOrgOpenFeignClient.getHouseOption(hform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/gov/org/icneighborhood/neighborhoodoption":
+                IcNeighborHoodDTO nform = new IcNeighborHoodDTO();
+                nform.setAgencyId(currUserAgencyId);
+                nform.setGridId(cascadeItemColumnWrapper.getColValue());
+                options = getResultDataOrThrowsException(govOrgOpenFeignClient.getNeighborHoodOptions(nform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/sys/dict/data/education":
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getEducationOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/sys/dict/data/house":
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getHouseOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/sys/dict/data/nation":
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getNationOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/sys/dict/data/ninesmallplaces":
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getNineSmallPlacesOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+            case "/sys/dict/data/relationship":
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getRelationshipOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                break;
+
+        }
+
+        if (options == null) return null;
+
+        return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue));
 
         // 通用api调用，无法实现
         /*if (!uri.startsWith("/api")) uri = "/api".concat(uri);
@@ -711,13 +854,37 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         private String combinedLabel;
         private String columnName;
         private String itemType;
+        private String itemId;
         private List<Integer> colIndexs;
         //private List<String> colContents;
+        // 单元格内容
+        private String cellContent;
+        // 数据库中列的值
         private String colValue;
 
         // key:label，value:value
         private Map<String, String> options;
+
+        /**
+         * 选项来源,REMOTE;LOCAL;如果是动态加载的下拉框或者CHECKBOX等的情况下使用。URL:接口获取(LABEL,VALUE)；JSON:直接从JSON中取
+         */
+        private String optionSourceType;
+
+        /**
+         * 来源地址,REMOTE才有，固定格式;如果OPTIONS_SOURCE是URL，则此处填写要调用的接口的URL相对路径，例如：/API/GOV/ORG/XXXX。此处不应设置参数，若需要参数应当完全由后端，通过TOKEN信息来获取
+         */
+        private String optionSourceValue;
     }
+
+    /**
+     * desc:动态查询 某表的所有字段值
+     * @param customerId
+     * @param formCode
+     * @param resultTableName
+     * @param conditions
+     * @return
+     */
+    @Override
     public List<Map<String,Object>> dynamicQuery(String customerId,
                                                  String formCode,
                                                  String resultTableName,
@@ -732,4 +899,42 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         return baseDao.dynamicQuery(customerId,resultTableName,conditions,subTables);
     }
-}
+
+    /**
+     * desc:条件导出
+     *
+     * @param customerId
+     * @param formCode
+     * @param baseTableName
+     * @param conditions
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getDataForExport(String customerId, String formCode, String baseTableName, List<ResiUserQueryValueDTO> conditions) {
+        List<Map<String, Object>> mapList = this.dynamicQuery(customerId, formCode, baseTableName, conditions);
+        mapList.parallelStream().forEach(map -> {
+            Object gridId = map.get(UserConstant.GRID_ID);
+            if (gridId != null) {
+                CustomerGridFormDTO formDTO = new CustomerGridFormDTO();
+                formDTO.setGridId(gridId.toString());
+                Result<CustomerGridDTO> gridInfoRes = govOrgOpenFeignClient.getGridBaseInfoByGridId(formDTO);
+                if (gridInfoRes != null && gridInfoRes.success() && gridInfoRes.getData() != null) {
+                    map.put(UserConstant.GRID_ID, gridInfoRes.getData().getGridName());
+                }
+            }
+            Object homeId = map.get(UserConstant.HOME_ID);
+            if (homeId != null) {
+                HashSet<String> houseIds = new HashSet<>();
+                houseIds.add(homeId.toString());
+                Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds);
+                if (houseInfoRes != null && houseInfoRes.success() && CollectionUtils.isNotEmpty(houseInfoRes.getData())){
+                    HouseInfoDTO houseInfoDTO = houseInfoRes.getData().get(NumConstant.ZERO);
+                    map.put("VILLAGE_NAME", houseInfoDTO.getNeighborHoodName());
+                    map.put("BUILD_NAME", houseInfoDTO.getBuildingName());
+                    map.put("HOME_ID", houseInfoDTO.getDoorName());
+                }
+            }
+        });
+        return mapList;
+    }
+}