From 460e5fb12e6f5454e669025604d09f9436c5d52d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 21 Jun 2022 20:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E3=80=91=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=EF=BC=9A=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/impl/IcResiServiceImpl.java | 1 + .../impl/GovOrgCoverageServiceImpl.java | 4 ++++ .../service/heart/impl/HeartServiceImpl.java | 2 ++ .../service/impl/CoverageServiceImpl.java | 20 +++++++++++++++++-- .../mapper/epmetuser/IcResiUserDao.xml | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index afc06839be..fe7844ae43 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -51,6 +51,7 @@ public class IcResiServiceImpl implements IcResiService { if (StringUtils.isNotBlank(search)) { query.like(IcResiUserEntity::getName, search); } + query.orderByAsc(IcResiUserEntity::getCreatedTime); return resiUserDao.selectList(query); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 1118254af6..f54bdc9453 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -106,6 +106,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (isPage) { PageHelper.startPage(pageNo ,pageSize); } + query.orderByAsc(IcCityManagementEntity::getCreatedTime); return cityManagementDao.selectList(query); } @@ -133,6 +134,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (isPage) { PageHelper.startPage(pageNo ,pageSize); } + query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime); return dangerousChemicalsDao.selectList(query); } @@ -166,6 +168,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (isPage) { PageHelper.startPage(pageNo ,pageSize); } + query.orderByAsc(IcPublicServiceEntity::getCreatedTime); return publicServiceDao.selectList(query); } @@ -183,6 +186,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (isPage) { PageHelper.startPage(pageNo ,pageSize); } + query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime); return superiorResourceDao.selectList(query); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java index 332720d70a..187519d964 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -50,6 +50,7 @@ public class HeartServiceImpl implements HeartService { if (isPage) { PageHelper.startPage(pageNo, pageSize); } + query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime); return communitySelfOrganizationDao.selectList(query); } @@ -80,6 +81,7 @@ public class HeartServiceImpl implements HeartService { if (isPage) { PageHelper.startPage(pageNo, pageSize); } + query.orderByAsc(IcPartyUnitEntity::getCreatedTime); return partyUnitDao.selectList(query); } } 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 c8e01dbeeb..ab357cac69 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 @@ -14,7 +14,6 @@ import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; -import com.epmet.dataaggre.service.epmetuser.impl.IcResiServiceImpl; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.heart.HeartService; @@ -97,6 +96,10 @@ public class CoverageServiceImpl implements CoverageService { String staffPids = getStaffPidsFromStaffInfo(staffInfo); String agencyId = staffInfo.getAgencyId(); + // 分页不太好分，先查出所有的数据，然后partation()吧 + int start = (pageNo - 1) * pageSize; + int end = pageNo * pageSize; + List rls = new ArrayList<>(); for (String coverageType : coverageTypes) { List ccm = mapping.get(coverageType); @@ -105,8 +108,21 @@ public class CoverageServiceImpl implements CoverageService { } for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) { // 执行查询 - List rl = doDataListSearch(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), e.getCategoryKey(), search, pageNo, pageSize, isPage); + List rl = doDataListSearch( + EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + e.getCategoryKey(), search, 1, end, isPage); + rls.addAll(rl); + + if (!isPage) { + // 不分页的话，直接下一个category + continue; + } + + // 要分页的话就要截取一下 + if (rls.size() >= end) { + return rls.subList(start, end); + } } } return rls; 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 d4fdc69fa7..d35557b5c5 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 @@ -49,6 +49,7 @@ and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%') and resi.DEL_FLAG = '0' and s.DEL_FLAG = '0' + order by s.CREATED_TIME asc