Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage

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

@@ -266,22 +266,22 @@ public class CoverageServiceImpl implements CoverageService {
                 List<CompletableFuture<List<ResourceInfoResultDTO>>> futures = new ArrayList<>();
                 for (String resource : resources) {
                     if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){
-                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO));
+                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO),executorService);
                         futures.add(c);
                     }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){
-                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO));
+                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO),executorService);
                         futures.add(c);
                     }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){
-                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO));
+                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO),executorService);
                         futures.add(c);
                     }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){
-                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO));
+                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO),executorService);
                         futures.add(c);
                     }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){
-                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO));
+                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO),executorService);
                         futures.add(c);
                     }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){
-                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO));
+                        CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO),executorService);
                         futures.add(c);
                     }
                 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -164,11 +164,18 @@
             ifnull(u.RHZK,'') as rhzk
         FROM ic_resi_user u
         WHERE u.DEL_FLAG = '0'
-          AND u.CUSTOMER_ID = #{customerId}
+          <if test='customerId != null and customerId != ""'>
+              AND u.CUSTOMER_ID = #{customerId}
+          </if>
+          <if test='icUserId != null and icUserId != ""'>
+              AND u.id = #{icUserId}
+          </if>
           <if test='name != null and name != "" '>
               AND u.`NAME` LIKE CONCAT('%',#{name},'%')
           </if>
-          AND u.PIDS LIKE CONCAT('%',#{orgId},'%')
+          <if test='orgId != null and orgId != "" '>
+              AND u.PIDS LIKE CONCAT('%',#{orgId},'%')
+          </if>
     </select>
 
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml

@@ -13,9 +13,16 @@
             LATITUDE
         FROM ic_event
         WHERE del_flag = '0'
-          AND customer_id = #{customerId}
-          AND DIFFICULT_POINT = '1'
-          AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%')
+            AND DIFFICULT_POINT = '1'
+            <if test='customerId != null and customerId != ""'>
+                AND customer_id = #{customerId}
+            </if>
+            <if test='orgId != null and orgId != ""'>
+                AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%')
+            </if>
+            <if test='icEventId != null and icEventId != ""'>
+                AND id = #{icEventId}
+            </if>
           <if test=' name != null and name != "" '>
               AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%')
           </if>

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.38__coverage_update.sql

@@ -0,0 +1,6 @@
+alter table ic_coverage_category_dict
+    add column PLACE_TYPE_IN_ANALYSIS varchar(32) comment '在可视化系统中所属的plact_type，跟COVERAGE_TYPE可能不同，COVERAGE_TYPE是给管理平台用的' after PLACE_TYPE;
+alter table ic_coverage_category_dict
+    add column MENU_URL varchar(200) comment '要跟菜单绑定(客户配置了这个菜单，这里才显示)' after PLACE_TYPE_IN_ANALYSIS;
+alter table ic_coverage_category_dict
+    add column DATA_TYPE varchar(32) comment '数据类别(governedTarget:被管理对象；resources:资源列表)' after MENU_URL;