From 7b031417bf878a5d5ac0df06bae0022287a7f856 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 15 May 2020 09:07:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E5=B8=83dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-mine/gov-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml index 57ca9f2f4e..4a12a19e35 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.11 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.12 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 52fb15e28e..41d113ec99 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.11 + 0.3.12 com.epmet gov-mine diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index ca5bdc1094..4bb60fd355 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.34 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.35 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 8bae1a2d21..7a51925c4c 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.34 + 0.3.35 com.epmet gov-org diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml index 8e2903fed2..8f8df757fe 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.8 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.9 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 9b1397bf37..57ad325ec3 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.8 + 0.3.9 com.epmet oper-customize From 0c808ae5aa03c6d17f13c414e69b3bb4ba6cbc9b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 15 May 2020 10:47:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?getMyGrids=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8Cresigroup=20=E7=BC=93=E5=AD=98=E5=BA=93db1,ga?= =?UTF-8?q?teway=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 4 ++++ .../service/impl/StaffAgencyServiceImpl.java | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index b96276ef8a..ee6408e6d3 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -130,14 +130,17 @@ lb://resi-guide-server + lb://gov-org-server lb://oper-access-server + lb://resi-mine-server lb://resi-group-server + lb://resi-partymember-server lb://gov-grid-server @@ -146,6 +149,7 @@ lb://gov-access-server + lb://gov-mine-server lb://resi-hall-server diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java index ae7a56de8f..ec96daa291 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java @@ -112,7 +112,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService { private boolean checkIssueProcessing(String gridId, List issueProcessingList) { boolean flag = false; for (GridProcessingCountResultDTO gridProcessingCountResultDTO : issueProcessingList) { - if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) { + if (gridId.equals(gridProcessingCountResultDTO.getGridId()) + && null!=gridProcessingCountResultDTO.getCount() + && gridProcessingCountResultDTO.getCount() > 0) { flag = true; break; } @@ -123,7 +125,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService { private boolean checkPartyMemberProcessing(String gridId, List partyMemberProcessingList) { boolean flag = false; for (GridProcessingCountResultDTO gridProcessingCountResultDTO : partyMemberProcessingList) { - if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) { + if (gridId.equals(gridProcessingCountResultDTO.getGridId()) + && null != gridProcessingCountResultDTO.getCount() + && gridProcessingCountResultDTO.getCount() > 0) { flag = true; break; } @@ -134,7 +138,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService { private boolean checkResiProcessing(String gridId, List resiProcessingList) { boolean flag = false; for (GridProcessingCountResultDTO gridProcessingCountResultDTO : resiProcessingList) { - if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) { + if (gridId.equals(gridProcessingCountResultDTO.getGridId()) + && null!=gridProcessingCountResultDTO.getCount() + && gridProcessingCountResultDTO.getCount() > 0) { flag = true; break; } @@ -145,7 +151,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService { private boolean checkGroupProcessing(String gridId, List groupProcessingList) { boolean flag = false; for (GridProcessingCountResultDTO gridProcessingCountResultDTO : groupProcessingList) { - if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) { + if (gridId.equals(gridProcessingCountResultDTO.getGridId()) + && null!=gridProcessingCountResultDTO.getCount() + && gridProcessingCountResultDTO.getCount() > 0) { flag = true; break; } From 0ccd5515fc7a785694c37f9545806899ea30e623 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 15 May 2020 10:48:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?getMyGrids=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8Cresigroup=20=E7=BC=93=E5=AD=98=E5=BA=93db1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/feign/GovIssueFeignClient.java | 3 ++- epmet-module/resi-group/resi-group-server/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java index 1b7642c82a..a1a86b35a4 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.result.GridProcessingCountResultDTO; import com.epmet.feign.fallback.GovIssueFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -25,5 +26,5 @@ public interface GovIssueFeignClient { * @Date 2020/5/13 15:47 **/ @PostMapping(value = "/gov/issue/issue/queryvotingissuecount",consumes = MediaType.APPLICATION_JSON_VALUE) - Result queryVotingIssueCount(@RequestBody List gridIdList); + Result> queryVotingIssueCount(@RequestBody List gridIdList); } diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 277302d93e..ff65886f95 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -118,7 +118,7 @@ epmet_resi_group_user EpmEt-db-UsEr - 0 + 1 192.168.1.130 6379 123456 @@ -148,7 +148,7 @@ epmet elink@833066 - 0 + 1 r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com 6379 EpmEtrEdIs!q@w