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

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

@@ -61,9 +61,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -273,22 +270,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);
                     }
                 }
@@ -1219,7 +1216,7 @@ public class CoverageServiceImpl implements CoverageService {
     @Override
     public List<DataListLeftSubTotalResDTO> dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO) {
         List<DataListLeftSubTotalResDTO> resultList=new ArrayList<>();
-        List<OrgInfoCommonDTO> list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCoverageType(), formDTO.getOrgId());
+        List<OrgInfoCommonDTO> list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId());
         if(CollectionUtils.isNotEmpty(list)){
             resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class);
             for(DataListLeftSubTotalResDTO orgRes:resultList){

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'
+          <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>
+          <if test='orgId != null and orgId != "" '>
               AND u.PIDS LIKE CONCAT('%',#{orgId},'%')
+          </if>
     </select>
 
    <!--志愿者数量 -->

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'
+            <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>