From 7069a3c978e70fa686757f1ff5c46107e25ec8ef Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 13:45:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 15 ++++++--------- .../resources/mapper/epmetuser/IcResiUserDao.xml | 11 +++++++++-- .../resources/mapper/govproject/IcEventDao.xml | 13 ++++++++++--- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 523b1f1fbe..943680915d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -60,9 +60,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 @@ -269,22 +266,22 @@ public class CoverageServiceImpl implements CoverageService { List>> futures = new ArrayList<>(); for (String resource : resources) { if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO),executorService); futures.add(c); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index dfcd87920f..f883a695f9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/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} + + AND u.CUSTOMER_ID = #{customerId} + + + AND u.id = #{icUserId} + AND u.`NAME` LIKE CONCAT('%',#{name},'%') - AND u.PIDS LIKE CONCAT('%',#{orgId},'%') + + AND u.PIDS LIKE CONCAT('%',#{orgId},'%') + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index 547ff69899..c037d97239 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/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' + + AND customer_id = #{customerId} + + + AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%') + + + AND id = #{icEventId} + AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') From 186bdcd448c41e8400cd2ff7bc6d9f15d9f72eb9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 14:01:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87.?= =?UTF-8?q?=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 523b1f1fbe..f32f7bc6a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -60,9 +60,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 @@ -1196,7 +1193,7 @@ public class CoverageServiceImpl implements CoverageService { @Override public List dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO) { List resultList=new ArrayList<>(); - List list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCoverageType(), formDTO.getOrgId()); + List list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId()); if(CollectionUtils.isNotEmpty(list)){ resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class); for(DataListLeftSubTotalResDTO orgRes:resultList){