【图层】可视化，做了一些优化

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java

@@ -13,7 +13,7 @@ public enum CoveragePlaceTypeEnum {
     CITY_MANAGEMENT("city_management", "城市管理"),
     COMMUNITY_ORG("community_org", "社区自组织"),
     PUBLIC_SERVICE("public_service", "公共服务"),
-    RESI("resi", "居民"),
+    RESI("resi", "公共服务人群"),
     PARTY_UNIT("party_unit", "联建单位"),
     VOLUNTEER("volunteer", "志愿者"),
     GROUP_RENT("group_rent", "群租房"),

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java

@@ -19,7 +19,7 @@ public class AnalysisGovernedTargetsResult {
     private String coverageType;
     private String placeType;
     private String placeTypeName;
-    private Integer count = 0;
+    private Integer quantity = 0;
 
     private List<AnalysisGovernedTargetsResult> children;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java

@@ -26,7 +26,7 @@ public class AnalysisResourceCategoriesResult {
     /**
      * 个数
      */
-    private Integer count;
+    private Integer quantity;
 
     /**
      * 没有placeTypeInAnalysis，直接属于图层的
@@ -49,7 +49,7 @@ public class AnalysisResourceCategoriesResult {
         private String categoryName;
         private String coverageType;
         private String placeType;
-        private Integer count = 0;
+        private Integer quantity = 0;
     }
 
     /**
@@ -61,7 +61,7 @@ public class AnalysisResourceCategoriesResult {
     public static class PlaceType {
         private String placeType;
         private String placeTypeName;
-        private Integer count = 0;
+        private Integer quantity = 0;
         private List<Category> categories;
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java

@@ -60,6 +60,11 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity {
 
 	private String dataType;
 
+	/**
+	 * 数量
+	 */
+	private Integer quantity;
+
     /**
      * 排序
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -251,41 +251,41 @@ public class CoverageServiceImpl implements CoverageService {
     public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType,
                                    String categoryKey, String search) {
 
-        if (PLACE_TYPE_RESI.equals(placeType)) {
+        if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) {
             // 使用分类查询居民信息
             return icResiService.countResisByCategories4Coverage(customerId, agencyId,
                     staffOrgIds, categoryKey, search);
-        } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) {
             // 特殊人群
             return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
-        } else if (PLACE_TYPE_EVENT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {
             // 难点痛点
             return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true);
-        } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) {
             // 城市资源管理
             return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey);
-        } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.COMMUNITY_ORG.getCode().equals(placeType)) {
             // 社区自组织
             return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey);
-        } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) {
             // 机关直属部门(联建单位)  楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
             if (categoryKey.equals("pu_jgzsbm")) {
                 String partyUnitType = "3";
                 return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search);
             }
-        } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) {
             // 危化企业
             return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey);
-        } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) {
             // 企事业单位巡查
             return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
-        } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) {
             // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
             return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT);
-        } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.PUBLIC_SERVICE.getCode().equals(placeType)) {
             // 公共服务
             return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey);
-        } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.SUPERIOR_RESOURCE.getCode().equals(placeType)) {
             // 优势资源
             return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey);
         }
@@ -311,7 +311,7 @@ public class CoverageServiceImpl implements CoverageService {
         // 根据categoryKey查询类别名称
         IcCoverageCategoryDictEntity categoryDict = orgCoverageService.selectByCategoryKey(categoryKey);
 
-        if (PLACE_TYPE_RESI.equals(placeType)) {
+        if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) {
             // 使用分类查询居民信息
             List<IcResiUserEntity> resiEntities = icResiService.listResisByCategories4Coverage(
                     customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage);
@@ -325,7 +325,7 @@ public class CoverageServiceImpl implements CoverageService {
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
-        } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) {
             // 特殊人群
             List<IcResiInfoResultDTO> resiInfos = icResiService.listSpecialResisBySpecialType(
                     customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage);
@@ -338,7 +338,7 @@ public class CoverageServiceImpl implements CoverageService {
                         isPage ? re.getName() : null, coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
-        } else if (PLACE_TYPE_EVENT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {
             // 难点痛点
             List<IcEventEntity> icEventEntities = govProjectService.searchIcEventEntities(
                     customerId, staffOrgIds, search, true, isPage, pageNo, pageSize);
@@ -349,7 +349,7 @@ public class CoverageServiceImpl implements CoverageService {
                             e.getLatitude(), e.getLongitude()))
                     .collect(Collectors.toList());
 
-        } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) {
             // 城市资源管理
             List<IcCityManagementEntity> cityResources = orgCoverageService.searchCityResourceEntities(
                     customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
@@ -359,7 +359,7 @@ public class CoverageServiceImpl implements CoverageService {
                             isPage ? resource.getName() : null, resource.getLatitude(), resource.getLongitude()))
                     .collect(Collectors.toList());
 
-        } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.COMMUNITY_ORG.getCode().equals(placeType)) {
             // 社区自组织
             List<IcCommunitySelfOrganizationEntity> l = heartService.searchCommunityOrgEntities(
                     customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
@@ -370,7 +370,7 @@ public class CoverageServiceImpl implements CoverageService {
                             isPage ? org.getOrganizationName() : null, org.getLatitude(), org.getLongitude()))
                     .collect(Collectors.toList());
 
-        } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) {
             // 机关直属部门(联建单位)  楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
             if (categoryKey.equals("pu_jgzsbm")) {
                 String partyUnitType = "3";
@@ -383,7 +383,7 @@ public class CoverageServiceImpl implements CoverageService {
                         .collect(Collectors.toList());
             }
             return new ArrayList<>();
-        } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) {
             // 危化企业
             List<IcDangerousChemicalsEntity> l = orgCoverageService.searchDangerousChemicalEntities(
                     customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
@@ -393,7 +393,7 @@ public class CoverageServiceImpl implements CoverageService {
                             isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude()))
                     .collect(Collectors.toList());
 
-        } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) {
             // 企事业单位巡查
             List<IcEnterisePatrolResultDTO> list = orgCoverageService.listEnterprisePatrol(
                     customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
@@ -403,7 +403,7 @@ public class CoverageServiceImpl implements CoverageService {
                             isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude()))
                     .collect(Collectors.toList());
 
-        } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) {
             // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
             List<IcHouseEntity> houses = orgCoverageService.searchByResiNumber(
                     customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT, isPage, pageNo, pageSize);
@@ -421,7 +421,7 @@ public class CoverageServiceImpl implements CoverageService {
                         isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? houseName : null, latitude, longitude);
             }).collect(Collectors.toList());
 
-        } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.PUBLIC_SERVICE.getCode().equals(placeType)) {
             // 公共服务
             List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities(
                     customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
@@ -429,7 +429,7 @@ public class CoverageServiceImpl implements CoverageService {
                     .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey,
                             isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude()))
                     .collect(Collectors.toList());
-        } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
+        } else if (CoveragePlaceTypeEnum.SUPERIOR_RESOURCE.getCode().equals(placeType)) {
             // 优势资源
             List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities(
                     customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
@@ -504,31 +504,31 @@ public class CoverageServiceImpl implements CoverageService {
                     // 没有placetype的
                     categoriesOfThisCoverage.getCategories()
                             .add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), c.getCategoryName(),
-                                    c.getCoverageType(), c.getPlaceType(), 0));
+                                    c.getCoverageType(), c.getPlaceType(), c.getQuantity()));
                 } else {
                     // 有placetype的
                     AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(c.getPlaceTypeInAnalysis());
                     if (placeType == null) {
                         placeType = new AnalysisResourceCategoriesResult.PlaceType(
-                                c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), 0, new ArrayList<>());
+                                c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), c.getQuantity(), new ArrayList<>());
                         placeTypeMap.put(c.getPlaceTypeInAnalysis(), placeType);
                     }
                     placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(),
-                            c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), 0));
+                            c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), c.getQuantity()));
 
-                    placeType.setCount(placeType.getCount() + 0); // todo 0改为category的count
+                    placeType.setQuantity(placeType.getQuantity() + c.getQuantity()); // todo 0改为category的count
                 }
             });
 
             AtomicReference<Integer> total = new AtomicReference<>(0);
             placeTypeMap.forEach((placeTypeKey, placeType) -> {
                 categoriesOfThisCoverage.getPlaceTypesInAnalysis().add(placeType);
-                total.updateAndGet(v -> v + placeType.getCount());
+                total.updateAndGet(v -> v + placeType.getQuantity());
             });
 
             categoriesOfThisCoverage.setCoverageType(coverage.getKey());
             categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getKey()).getCoverageName());
-            categoriesOfThisCoverage.setCount(total.get());
+            categoriesOfThisCoverage.setQuantity(total.get());
             results.add(categoriesOfThisCoverage);
         }
 
@@ -553,7 +553,7 @@ public class CoverageServiceImpl implements CoverageService {
             if (StringUtils.isEmpty(placeTypeInAnalysis)) {
                 // 只有一层，没有子级
                 results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(),
-                        rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>()));
+                        rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>()));
             } else {
                 // 有子级，需要使用placeTypeInAnalysis分组
                 List<AnalysisGovernedTargetsResult> targets = placeTypeMap.get(placeTypeInAnalysis);
@@ -562,7 +562,7 @@ public class CoverageServiceImpl implements CoverageService {
                     placeTypeMap.put(placeTypeInAnalysis, targets);
                 }
                 targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(),
-                        rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>()));
+                        rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>()));
             }
         });
 
@@ -580,7 +580,7 @@ public class CoverageServiceImpl implements CoverageService {
         List<IcResiCategoryWarnConfigEntity> categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId());
         List<AnalysisGovernedTargetsResult> ggfwrqCategories = categoriesNeed2Warn.stream().map(wc ->
                 new AnalysisGovernedTargetsResult(wc.getColumnName(), wc.getTableName(),
-                        CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getCode(),
+                        CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getName(),
                         0, new ArrayList<>())).collect(Collectors.toList());
 
         AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult();

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml

@@ -13,6 +13,7 @@
         <result property="placeTypeInAnalysis" column="PLACE_TYPE_IN_ANALYSIS"/>
         <result property="menuUrl" column="MENU_URL"/>
         <result property="dataType" column="DATA_TYPE"/>
+        <result property="quantity" column="QUANTITY"/>
         <result property="sort" column="SORT"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java

@@ -62,7 +62,10 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity {
 	private String coverageType;
 
 	private String dataType;
-
+	/**
+	 * 数量
+	 */
+	private Integer quantity;
     /**
      * 排序
      */