From ae95120eb2d34a11914855eb2d864cbda67c8551 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Apr 2020 10:38:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/docker-compose.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-auth/docker-compose.yml | 2 +- epmet-auth/pom.xml | 2 +- epmet-gateway/docker-compose.yml | 2 +- epmet-gateway/pom.xml | 2 +- epmet-module/gov-access/gov-access-server/docker-compose.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- epmet-module/gov-grid/gov-grid-server/docker-compose.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- epmet-module/gov-mine/gov-mine-server/docker-compose.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-module/oper-access/oper-access-server/docker-compose.yml | 2 +- epmet-module/oper-access/oper-access-server/pom.xml | 2 +- epmet-module/oper-crm/oper-crm-server/docker-compose.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize/oper-customize-server/docker-compose.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- epmet-module/resi-guide/resi-guide-server/docker-compose.yml | 2 +- epmet-module/resi-guide/resi-guide-server/pom.xml | 2 +- epmet-module/resi-mine/resi-mine-server/docker-compose.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml index da9863a0cf..b77b2d2e39 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:0.3.3 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 2508ef6a93..cf9ae81208 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.2 + 0.3.3 com.epmet epmet-admin diff --git a/epmet-auth/docker-compose.yml b/epmet-auth/docker-compose.yml index a5dbd9c813..4e3d43613b 100644 --- a/epmet-auth/docker-compose.yml +++ b/epmet-auth/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth:0.3.3 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index d94ff80dda..24a6a334f0 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.2 + 0.3.3 com.epmet epmet-cloud diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml index 33fe9f7968..c24ed39d34 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway:0.3.4 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 5722303127..81c41a50ad 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.3 + 0.3.4 com.epmet epmet-cloud diff --git a/epmet-module/gov-access/gov-access-server/docker-compose.yml b/epmet-module/gov-access/gov-access-server/docker-compose.yml index e2706f9e46..97308b20a8 100644 --- a/epmet-module/gov-access/gov-access-server/docker-compose.yml +++ b/epmet-module/gov-access/gov-access-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.4 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 83f0c96850..39eb648ee5 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.3 + 0.3.4 gov-access com.epmet diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml index a05c005de8..437246d6fd 100644 --- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml +++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.6 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.7 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 15f4c19976..479a30aa60 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.6 + 0.3.7 com.epmet gov-grid diff --git a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml b/epmet-module/gov-mine/gov-mine-server/docker-compose.yml index d04661f1bf..6255e062a1 100644 --- a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml +++ b/epmet-module/gov-mine/gov-mine-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.4 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.5 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 46cafb3e14..9433e1feaf 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.4 + 0.3.5 com.epmet gov-mine diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index 410c3767d7..dc94201250 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.20 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.21 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 0211983cad..5e315eebe9 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.20 + 0.3.21 com.epmet gov-org diff --git a/epmet-module/oper-access/oper-access-server/docker-compose.yml b/epmet-module/oper-access/oper-access-server/docker-compose.yml index 6f5b56c0f0..61d6756b90 100644 --- a/epmet-module/oper-access/oper-access-server/docker-compose.yml +++ b/epmet-module/oper-access/oper-access-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.3 ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index db52d49149..f09cd3015d 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.2 + 0.3.3 oper-access com.epmet diff --git a/epmet-module/oper-crm/oper-crm-server/docker-compose.yml b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml index 2ddf57643b..75883a89ed 100644 --- a/epmet-module/oper-crm/oper-crm-server/docker-compose.yml +++ b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:0.3.4 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 3c73eeb6e4..a0529f4f4d 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.3 + 0.3.4 com.epmet oper-crm diff --git a/epmet-module/oper-customize/oper-customize-server/docker-compose.yml b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml index 96e96cacbe..2978e0bc66 100644 --- a/epmet-module/oper-customize/oper-customize-server/docker-compose.yml +++ b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:0.3.3 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 5213c6b8ff..dbfcd30b63 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.2 + 0.3.3 com.epmet oper-customize diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index 687b044179..9aff8cbcfb 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.4 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index b246579931..1d1e6da619 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.3 + 0.3.4 com.epmet resi-group diff --git a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml index b583b67e34..a59cc76276 100644 --- a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml +++ b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.3 ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 710c376539..a14f57ff89 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.2 + 0.3.3 com.epmet resi-guide diff --git a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml index 189cc27233..49332b795d 100644 --- a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml +++ b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.3 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index bc113e5290..25d9224c79 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.2 + 0.3.3 com.epmet resi-mine diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index 4860db4369..f7c720ca4a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.6 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.7 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 611ffc22f0..f746a56032 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.6 + 0.3.7 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 5336083637..e78e9c1a21 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.16 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.17 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 9ed1998002..1adb0d85af 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.16 + 0.3.17 com.epmet epmet-user From 2fd1db04f806106c2572cc50bc239bc684f065a8 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Wed, 29 Apr 2020 13:13:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96pids?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index fb9dcf6ae0..62a6993740 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -170,7 +170,7 @@ FROM customer_agency WHERE - pid = #{pid} + id = #{pid} limit 1 From bdfcce663b6df1ad08f4c7ca4913e3bdc2fca401 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Wed, 29 Apr 2020 13:26:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 3a1cdfa37d..ab835da389 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -208,11 +208,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl Date: Wed, 29 Apr 2020 13:28:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index dc94201250..8361613dab 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.22 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 5e315eebe9..3d5a8a15cb 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.21 + 0.3.22 com.epmet gov-org From 4fc0aa5956e6468d32961b3aa461bafb6fe249fe Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Wed, 29 Apr 2020 14:29:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E9=80=BB=E8=BE=91=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartymemberInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index 741f2c505b..56dc878bc9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -144,12 +144,12 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl certified(CertifiedFormDTO certifiedFormDTO) { certifiedFormDTO.setPageNo(certifiedFormDTO.getPageNo() - NumConstant.ONE); List certifiedResultDTOS = partyMemberInfoDao.selectCertifiedList(certifiedFormDTO); - for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) { - certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L); - } if (certifiedResultDTOS.size()==0){ return new ArrayList<>(); } + for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) { + certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L); + } Result> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS); Result gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO); for (CertifiedResultDTO datum : listResult.getData()) { From 7d02b8827ee9165941f18a643eba39caf2546b63 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 15:18:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E6=AE=B5=E7=BE=A4?= =?UTF-8?q?=E7=BB=84=E7=9B=B8=E5=85=B3=20=E4=BF=AE=E6=94=B9auidtting?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8EAudited=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=9D=E9=A2=98=E5=8A=A0=E5=85=A5=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/SendMsgResi2GovFormDTO.java | 51 +++++++++++++++++++ .../epmet-message-server/pom.xml | 6 +++ .../com/epmet/feign/GovOrgFeignClient.java | 37 ++++++++++++++ .../fallback/GovOrgFeignClientFallBack.java | 18 +++++++ .../com/epmet/service/UserMessageService.java | 10 +++- .../service/impl/UserMessageServiceImpl.java | 33 ++++++++++++ .../java/com/epmet/utils/ModuleConstant.java | 24 +++++++++ .../service/impl/ResiTopicServiceImpl.java | 2 - .../dto/group/form/GroupAuditedFromDTO.java | 2 - .../service/impl/ResiGroupServiceImpl.java | 5 +- 10 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java new file mode 100644 index 0000000000..3ea73a34b5 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendMsgResi2GovFormDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 居民端的行为触发发送消息给政府端的入参 + * @Author yinzuomei + * @Date 2020/4/19 20:54 + */ +@Data +public class SendMsgResi2GovFormDTO implements Serializable { + private static final long serialVersionUID = -1844010483732604630L; + + /** + * 发送人Id resiUser的Id + * */ + private String from; + + /** + * 角色key + * */ + private String roleKey; + + /** + * 消息内容 + * */ + private String msg; + + /** + * 组织Id 可能是agencyId、deptId、gridId + * */ + private String institutionId; + + /** + * 组织标识 1：agency 2：department 3:grid + * */ + private String institutionFlag; + + /** + *客户Id + */ + private String customerId; + + /** + * 等级 1：当前组织下 2：所属机构(agency)下 + * 当institutionFlag为1时，permissionLevel默认为1 + * */ + private String permissionLevel; +} diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 46bb33b442..03180554fb 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -90,6 +90,12 @@ feign-httpclient 10.3.0 + + com.epmet + gov-org-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..06ad630418 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,37 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerDepartmentDTO; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * @Description gov-org服务feginClient 服务间调用 + * @Author wangc + * @Date 2020/3/16 14:48 + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { + + /** + * @param id - gridId + * @return Result + * @Author wangc + * @Description 查询网格信息 + * @Date 2020/3/30 10:45 + **/ + @GetMapping("/gov/org/customergrid/{id}") + Result getGrid(String id); + + /** + * @Description 查询部门信息 + * @param id + * @author wangc + * @date 2020.04.29 15:02 + */ + @GetMapping("/gov/org/customerdepartment/{id}") + Result getDept(String id); +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..485e0b5883 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,18 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + + +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + @Override + public Result get(String id) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", id); + } +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index ca08d47299..6b867b26b1 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -22,9 +22,9 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.dto.form.SendMsgResi2GovFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; - import java.util.List; import java.util.Map; @@ -135,4 +135,12 @@ public interface UserMessageService extends BaseService { * @Description 批量插入未读消息 **/ Result saveUserMessageList(List msgList); + + /** + * @Description 居民端动作触发发消息给政府端 + * @param msgResi2GovFormDTO + * @author wangc + * @date 2020.04.29 14:42 + */ + Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index e5f3a2ba9e..6c425c8d59 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -24,16 +24,24 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserMessageConstans; import com.epmet.dao.UserMessageDao; +import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.dto.form.SendMsgResi2GovFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.UserMessageRedis; import com.epmet.service.UserMessageService; +import com.epmet.utils.ModuleConstant; import org.apache.commons.lang3.StringUtils; +import org.bouncycastle.math.raw.Mod; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,9 +58,12 @@ import java.util.Map; */ @Service public class UserMessageServiceImpl extends BaseServiceImpl implements UserMessageService { + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private UserMessageRedis userMessageRedis; + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override public PageData page(Map params) { @@ -171,4 +182,26 @@ public class UserMessageServiceImpl extends BaseServiceImpl gridInfo = govOrgFeignClient.get(msgResi2GovFormDTO.getInstitutionId()); + if(!gridInfo.success() || null == gridInfo.getData() || StringUtils.isBlank(gridInfo.getData().getPid())){ + logger.warn(""); + } + } + + + //2.1根据AgencyId查找staff_role下所有的staffId且是未被禁用的，调用epmet-user服务 + + //2.2是本机构下的所有拥有roleKey的工作人员还是本网格下所有拥有roleKey的工作人员 + //如果是本网格下则需要再次调用gov-org服务校验查询出相应角色的员工是否在本网格下，如果是本机构下则跳过此操作 + + //3.创建消息，调用epmet-message服务 + + return null; + } } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java index 863fa85e40..0843644411 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/utils/ModuleConstant.java @@ -26,5 +26,29 @@ public interface ModuleConstant extends Constant { */ String MAIL_CONFIG_KEY = "MAIL_CONFIG_KEY"; + /** + * 组织：机构 + * */ + String INSTITUTION_AGENCY = "1"; + + /** + * 组织：部门 + * */ + String INSTITUTION_DEPT = "2"; + + /** + * 祖师：网格 + * */ + String INSTITUTION_GRID = "3"; + + /** + * 当前组织下 + * */ + String PERMISSION_LEVEL_CURRENT = "1"; + + /** + * 所属机构(agency)下 + * */ + String PERMISSION_LEVEL_PARENT = "2"; } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java index b07c045e22..d4612fcb7e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java @@ -46,8 +46,6 @@ public class ResiTopicServiceImpl implements ResiTopicService { **/ @Override public Result> allTopics(ResiTopicPageFormDTO topicPageFormDTO) { - topicPageFormDTO.setPageNo(NumConstant.ONE); - topicPageFormDTO.setPageSize(NumConstant.MAX); return resiGroupFeignClient.getPastTopicListGov(topicPageFormDTO); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java index f1401ff8df..2e838f61b6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java @@ -26,11 +26,9 @@ public class GroupAuditedFromDTO implements Serializable { /** * 页码 */ - @NotBlank(message = "页码不能为空") private Integer pageNo; /** * 每页显示数量 */ - @NotBlank(message = "每页显示数量不能为空") private Integer pageSize; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index ac0f67d50a..e229b1c51b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -111,6 +111,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -335,7 +336,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Wed, 29 Apr 2020 15:41:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=AE=BF=E9=97=AE=E7=BD=91=E6=A0=BC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/CustomerStaffGridDao.xml | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml index b4490ab565..8ad0297daf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml @@ -18,26 +18,18 @@