From 0eb88e00dc35d322071d28130ec279b6105bac1c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 21 Oct 2020 09:50:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=99=84=E8=BF=91=E7=BD=91=E6=A0=BC=E6=95=B0?= =?UTF-8?q?=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/StrangerAccessRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java index 0157b798ad..72e16e1dfd 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -266,7 +266,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl> queryResult = govOrgFeignClient.queryCustomerGridList(third); From 7c2080595a6de2802b4c21c3c63a2fd0c173ca9e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 21 Oct 2020 16:13:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20188?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 51cc5de923..77aa8fdaf5 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.187 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.188 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index b2897a67ff..d0e5b00d4c 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.187 + 0.3.188 data-statistical com.epmet From 9303a2dfe2f10b592e757bf54c25b1cacb2a76b9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 21 Oct 2020 16:14:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=83=A8=E7=BD=B2report=20116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index 415d075518..def823e4b2 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.115 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.116 ports: - "8109:8109" diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 980cd089a5..8c32245250 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.115 + 0.3.116 data-report-server From 97e59930063af5fe66048a757bdec7cfbf1313f8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 21 Oct 2020 16:24:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=BA=A7=E7=BB=84=E7=BB=87=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/AgencyServiceImpl.java | 18 ++++++++++++++---- .../resources/mapper/CustomerAgencyDao.xml | 1 - 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 826e186d7f..7595aafa33 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -237,11 +237,21 @@ public class AgencyServiceImpl implements AgencyService { @Override public Result subAgencyList(SubAgencyFormDTO formDTO) { SubAgencyResultDTO subAgencyResultDTO = new SubAgencyResultDTO(); - //1:根据当前机关Id查询直属下一级机关列表 + //1:根据当前机关Id查询直属下一级机关列表，只返回前十条 List agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId()); - subAgencyResultDTO.setAgencyList(null == agencyList ? new ArrayList() : agencyList); - //2:统计下一级机关数 - subAgencyResultDTO.setSubAgencyCount(agencyList.size()); + if (null == agencyList || agencyList.size() < NumConstant.ONE) { + subAgencyResultDTO.setAgencyList(new ArrayList()); + subAgencyResultDTO.setSubAgencyCount(NumConstant.ZERO); + } else { + subAgencyResultDTO.setSubAgencyCount(agencyList.size()); + if (agencyList.size() > NumConstant.TEN) { + List newList = agencyList.subList(NumConstant.ZERO, NumConstant.TEN); + subAgencyResultDTO.setAgencyList(newList); + } else { + subAgencyResultDTO.setAgencyList(agencyList); + } + } + return new Result().ok(subAgencyResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 0721780e09..4e295b44cf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -67,7 +67,6 @@ WHERE del_flag = '0' AND pid = #{pId} ORDER BY created_time DESC - LIMIT 10