Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform

 Conflicts:

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

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-user/epmet-user-server/pom.xml

@@ -21,7 +21,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-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

@@ -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));
 
@@ -350,30 +350,18 @@ public class IcResiUserController {
             if (item.getChildGroup() != null){
                 if (!item.getChildGroup().getTableName().equals(BASE_TABLE_NAME)) {
                     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;*/
-
     }
 
     /**
@@ -396,8 +384,9 @@ public class IcResiUserController {
     }
 
     @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

@@ -134,4 +134,15 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                           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

@@ -83,13 +83,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
-    
+
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-    
+
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
-    
+
     @Override
     public PageData<IcResiUserDTO> page(Map<String, Object> params) {
         IPage<IcResiUserEntity> page = baseDao.selectPage(
@@ -328,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);
@@ -348,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);
@@ -375,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)) {
@@ -506,21 +506,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         || "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 (columnWrapper.combinedLabel.equals("家庭信息:与户主关系")) {
+
-                        System.out.println(6);
-                    }
                     if ("local".equals(optionSourceType)) {
                         // 根据单元格内容，取到指定的option
                         Map<String, String> options = columnWrapper.getOptions();
@@ -538,6 +536,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     columnWrapper.setColValue(checkBoxColValue);
                 }
 
+
+
+            }
+
                 columnNames.add(columnWrapper.getColumnName());
                 columnValues.add(columnWrapper.getColValue());
             }
@@ -691,7 +693,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
 
         List<OptionResultDTO> options = null;
-        
+
         switch (pureUri) {
             case "/epmetuser/icresidemanddict/demandoption":
                 options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
@@ -746,9 +748,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 break;
 
         }
-        
+
         if (options == null) return null;
-        
+
         return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue));
 
         // 通用api调用，无法实现
@@ -887,6 +889,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
          */
         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,
@@ -901,4 +913,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;
+    }
+}