From 390d0a6408196b56cc49c021a5d87a9adb373178 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 28 Jul 2022 17:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=88=E6=9A=82=E6=8F=90=E4=BA=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/IcCityManagementDao.java | 5 ++ .../service/impl/CoverageServiceImpl.java | 70 ++++++++++++------- .../mapper/govorg/IcCityManagementDao.xml | 70 +++++++++++++++++-- .../mapper/govproject/IcEventDao.xml | 4 +- 4 files changed, 118 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java index 5fcc8ac3c2..04746db059 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java @@ -24,6 +24,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取公共服务信息 @@ -32,6 +33,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取重点危化品企业信息 @@ -40,6 +42,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取优势资源信息 @@ -48,6 +51,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取企事业单位巡查信息 @@ -56,5 +60,6 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); + Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); } \ No newline at end of file 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 0d2b4a922a..5a050263b6 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 @@ -244,17 +244,23 @@ public class CoverageServiceImpl implements CoverageService { PageInfo allIcUserPageInfo = getIcUserPageInfo(formDTO); result.setUserInfos(allIcUserPageInfo.getList()); result.setUserInfosTotal(allIcUserPageInfo.getTotal()); - }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){ + }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ + for (String resource : resources) { - if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ - PageInfo eventPageInfo = getEventInfo(formDTO); - result.setEventInfos(eventPageInfo.getList()); - result.setEventInfoTotal(eventPageInfo.getTotal()); - break; + if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){ + } } - }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ - } }else { // 查询居民 @@ -263,59 +269,73 @@ public class CoverageServiceImpl implements CoverageService { result.setUserInfosTotal(allIcUserPageInfo.getTotal()); List reInfos = new ArrayList<>(); for (String table : tables) { + if (formDTO.getIsPage() && reInfos.size() == formDTO.getPageSize()){ + break; + } + Integer flag = formDTO.getPageSize() - reInfos.size(); switch (table){ case TableConstant.IC_SUPERIOR_RESOURCE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); List superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); - if (!superiorResourceInfos.isEmpty()){ + if (formDTO.getIsPage() && superiorResourceInfos.size() > flag){ + reInfos.addAll(superiorResourceInfos.subList(NumConstant.ZERO, flag)); + }else { reInfos.addAll(superiorResourceInfos); } break; case TableConstant.IC_CITY_MANAGEMENT: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); List cityManageInfos = govOrgService.getCityManageInfos(formDTO); - if (!cityManageInfos.isEmpty()){ + if (formDTO.getIsPage() && cityManageInfos.size() > flag){ + reInfos.addAll(cityManageInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(cityManageInfos); } break; case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO)); List communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO); - if (!communitySelOrgInfos.isEmpty()){ + if (formDTO.getIsPage() && communitySelOrgInfos.size() > flag){ + reInfos.addAll(communitySelOrgInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(communitySelOrgInfos); } break; case TableConstant.IC_DANGEROUS_CHEMICALS: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); List dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); - if (!dangerousChemicalsInfos.isEmpty()){ + if (formDTO.getIsPage() && dangerousChemicalsInfos.size() > flag){ + reInfos.addAll(dangerousChemicalsInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(dangerousChemicalsInfos); } break; case TableConstant.IC_ENTERPRISE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); List enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); - if (!enterpriseInfos.isEmpty()){ + if (formDTO.getIsPage() && enterpriseInfos.size() > flag){ + reInfos.addAll(enterpriseInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(enterpriseInfos); } break; case TableConstant.IC_PUBLIC_SERVICE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); List publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); - if (!publicServiceInfos.isEmpty()){ + if (formDTO.getIsPage() && publicServiceInfos.size() > flag){ + reInfos.addAll(publicServiceInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(publicServiceInfos); } break; - case TableConstant.IC_EVENT: - PageInfo eventPageInfo = getEventInfo(formDTO); - result.setEventInfos(eventPageInfo.getList()); - result.setEventInfoTotal(eventPageInfo.getTotal()); - break; default: break; } } result.setResourceInfos(reInfos); + result.setResourceInfoTotal(Long.valueOf(String.valueOf(reInfos.size()))); + } + for (String resource : resources) { + if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ + PageInfo eventPageInfo = getEventInfo(formDTO); + result.setEventInfos(eventPageInfo.getList()); + result.setEventInfoTotal(eventPageInfo.getTotal()); + break; + } } return result; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml index 21c839a27e..29476955de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml @@ -20,7 +20,9 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') - AND `NAME` LIKE CONCAT('%',#{name},'%') + + AND `NAME` LIKE CONCAT('%',#{name},'%') + + + + + + \ No newline at end of file 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 f35dd89392..547ff69899 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 @@ -16,6 +16,8 @@ AND customer_id = #{customerId} AND DIFFICULT_POINT = '1' AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%') - AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + + AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + \ No newline at end of file