From 447e796d4e7d14a919316147360b8ea82eb7f9df Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 26 Aug 2020 10:38:32 +0800 Subject: [PATCH 001/589] data-report + 1 --- .../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 2d85c451a1..b798f27c5d 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.36 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.37 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 06716fe378..804d1d69fb 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.36 + 0.3.37 data-report-server From b35a61dff5b2e9f32ee2c34bdaaea33a414be7a1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Aug 2020 14:46:48 +0800 Subject: [PATCH 002/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 b798f27c5d..f1b94770e7 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.37 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.38 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 804d1d69fb..de8725eb13 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.37 + 0.3.38 data-report-server From 3dee4b54729bd3bbacaa0287bc5ef3fc77f6f62e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 26 Aug 2020 14:59:40 +0800 Subject: [PATCH 003/589] =?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 --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 4d59daef61..cda3b1ccf4 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.88 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.89 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 937125d59c..fa41f56375 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.88 + 0.3.89 com.epmet gov-org diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 1bc90fa0c0..7f765fd941 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.70 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.71 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 80da83c9fc..e40c128651 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.70 + 0.3.71 com.epmet oper-crm From f37b1ca42a94d2b0f3a864f7a095034f99d3b51a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 Aug 2020 15:03:40 +0800 Subject: [PATCH 004/589] =?UTF-8?q?oper-crm=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 7f765fd941..62ea28c230 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.71 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.72 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 e40c128651..a82f1030db 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.71 + 0.3.72 com.epmet oper-crm From 435e59b2769b4f9438013c75078cfec5c713756d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Aug 2020 15:24:05 +0800 Subject: [PATCH 005/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 f1b94770e7..ee11d5d57b 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.38 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.39 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index de8725eb13..6f37dbdad2 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.38 + 0.3.39 data-report-server From 477649df03c15d6bf8aa3eb7da5338ec29842eb0 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 26 Aug 2020 15:39:09 +0800 Subject: [PATCH 006/589] =?UTF-8?q?statistical=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/data-statistical/data-statistical-server/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 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 dd615ce5f1..2603d35c99 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.47 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.48 ports: - "8108:8108" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 300M \ No newline at end of file + memory: 300M diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 61af3816fc..b5a8f70361 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.47 + 0.3.48 data-statistical com.epmet @@ -386,4 +386,4 @@ - \ No newline at end of file + From d9b2ee27d0bf58ea7b1b42464c193fd9fa85aee9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 26 Aug 2020 15:39:39 +0800 Subject: [PATCH 007/589] =?UTF-8?q?data-report=20=20=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7+1?= 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 ee11d5d57b..dcb6b6d363 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.39 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.40 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 6f37dbdad2..d1151bea8a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.39 + 0.3.40 data-report-server From 04a92414bc7d64f15ab0f0a8b1267dcafe774a26 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 26 Aug 2020 15:43:31 +0800 Subject: [PATCH 008/589] =?UTF-8?q?=E6=97=A7=E6=8E=A5=E5=8F=A3=E6=94=B9?= =?UTF-8?q?=E9=80=A0=20=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 --- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 62ea28c230..681e5174ea 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.72 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.73 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 a82f1030db..7dd5bc42ce 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.72 + 0.3.73 com.epmet oper-crm From 68cc674df6af8b73031aab95dcf8481fe78ca886 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 Aug 2020 16:45:44 +0800 Subject: [PATCH 009/589] =?UTF-8?q?gov-project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 405b05715e..ef5fc3def7 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.43 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.44 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 35f0402420..dd461d1a5b 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.43 + 0.3.44 gov-project com.epmet From 242e5d3ad19d6d124cd1900e999b9ca2b6773a4a Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 26 Aug 2020 17:40:01 +0800 Subject: [PATCH 010/589] ext govorg user +1 --- .../epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-ext/epmet-ext-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 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index 812a39470d..f2ec248b74 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.6 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.7 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 805fa21d3a..bcf22ed124 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.6 + 0.0.7 com.epmet 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 cda3b1ccf4..4aac5ba3bc 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.89 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.90 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 fa41f56375..1374c52b13 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.89 + 0.3.90 com.epmet gov-org diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index e1af81c0ce..f91c0fd99a 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.124 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.125 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 55992afad3..af29a9c158 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.124 + 0.3.125 com.epmet epmet-user From e1a3cb3ccb093e548f0bdc218847c4db530eafbb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Aug 2020 18:10:23 +0800 Subject: [PATCH 011/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 dcb6b6d363..e1cc29d63e 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.40 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.41 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index d1151bea8a..5b4db690b5 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.40 + 0.3.41 data-report-server From 6a324d9f13501607de0af2f39dea58f4a956a541 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 26 Aug 2020 18:34:09 +0800 Subject: [PATCH 012/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=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/deploy/docker-compose-dev.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-activiti-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-activiti/epmet-activiti-server/pom.xml | 2 +- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-ext/epmet-ext-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 2 +- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../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 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- .../oper-access-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-access/oper-access-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-home/resi-home-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-voice/resi-voice-server/pom.xml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 66 files changed, 66 insertions(+), 66 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index 1b77c09bda..1dcdedc3a9 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.15 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.16 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 9058e3065d..3ec76fe59c 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.15 + 0.3.16 com.epmet epmet-admin diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index f533348156..e23b7358ee 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.69 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.70 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index aaff93a013..8883f38777 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.69 + 0.3.70 com.epmet epmet-cloud diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 3329f89b6d..a8c00f4fee 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.35 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.36 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 66279bb8ad..847c53fbd2 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.35 + 0.3.36 com.epmet epmet-cloud 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 e1cc29d63e..56e051544b 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.41 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.42 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 37efc5b840..0bf15c0224 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.41 + 0.3.42 data-report-server 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 2603d35c99..96f689df87 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.48 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.49 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 ad850947fb..b6ae0121f1 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.48 + 0.3.49 data-statistical com.epmet diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml index 8c5dcd8823..a1a3c271a2 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-activiti-server:0.3.0 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-activiti-server:0.3.1 ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 5a4cf59cab..c6129e9bd9 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.0 + 0.3.1 com.epmet epmet-activiti diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 047408c5df..fc55101b7d 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.16 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.17 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 1c8581eb13..169304d350 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.16 + 0.3.17 com.epmet epmet-common-service diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index f2ec248b74..917d144838 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.7 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.8 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 7fe0198686..1d44db0ac8 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.7 + 0.0.8 com.epmet diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 4d32065b75..93c0d6a466 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.52 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.53 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index c8d513e278..5b963aa293 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.52 + 0.0.53 com.epmet epmet-heart diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index eb9aa984f8..cf07363afd 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.26 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 3b0c5fcbf5..8aa02f11c7 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.25 + 0.3.26 com.epmet epmet-job diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 6edefa45a8..cbdef40f0f 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.29 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index deea95460a..1b0c446019 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.29 com.epmet epmet-message diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml index 2a5fc11a89..88d19fecd4 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-dev # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.26 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 8fc5bc1d67..8b0797b5e4 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.25 + 0.3.26 com.epmet epmet-oss diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 615c0d0b94..431a30b094 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.40 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.41 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index c67cf5c997..392e8f50d5 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-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.0.40 + 0.0.41 epmet-point com.epmet diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index d4706c5733..c94d8d4e5d 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.134 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.135 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index dea6287ed4..b7cef83c2c 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.134 + 0.0.135 com.epmet diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 6f7c7fe6d8..797497c920 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.40 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.41 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 5d4189286a..e91b24d5f6 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.40 + 0.3.41 gov-access com.epmet diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index d3ff3abf31..9aa02c9c23 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.38 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 c5bf66fd08..a6f403a8ee 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.37 + 0.3.38 com.epmet gov-grid diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 1195217951..02717b4ff1 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.52 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.53 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index a90b43312d..0ee89cc5b2 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.52 + 0.3.53 gov-issue com.epmet 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 9fce06f6fd..54b5bdcd8c 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.33 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.34 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 7d2e118675..073cf96190 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.33 + 0.3.34 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 4aac5ba3bc..cb86f9f606 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.90 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.91 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 6d3c639303..0f15fc3500 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.90 + 0.3.91 com.epmet gov-org diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index ef5fc3def7..dae2c6884b 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.44 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.45 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 3b749d9c49..d45adb3dc3 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.44 + 0.3.45 gov-project com.epmet diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index a188027a21..b371cbdd56 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.68 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.69 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 17268c4fe4..5671d77b51 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-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.68 + 0.3.69 gov-voice com.epmet diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml index 1c81fdec99..aa4a7ea8a1 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.18 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.19 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 e5c20ef1be..cc2b2e4b97 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.18 + 0.3.19 oper-access com.epmet diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 681e5174ea..27b884ece7 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.73 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.74 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 72709f952d..fbe9ee76c8 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.73 + 0.3.74 com.epmet oper-crm 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 91e39f33c5..fb245b3745 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.47 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.48 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 1257fbf218..3b4724aeb3 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.47 + 0.3.48 com.epmet oper-customize diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 29a259a5d2..5000c4a4ed 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.66 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.67 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 c07b96ad77..ad31e6630a 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.66 + 0.3.67 com.epmet resi-group diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index f65e0d6954..e94aee4c6f 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.21 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 4aefd4cbe1..bd018d987c 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.20 + 0.3.21 com.epmet resi-guide diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index 4ded433cc3..30333a4902 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.22 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.23 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index a81bf919dc..444ba95970 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-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.22 + 0.3.23 resi-hall com.epmet diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml index fa06f9f3c3..61039daa78 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.16 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.17 ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index f6eebaaad7..60ab5ea5a6 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-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.16 + 0.3.17 resi-home diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 420beafcf5..3de6667523 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.38 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.39 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 35d2c0edda..31ec3b085d 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.38 + 0.3.39 com.epmet resi-mine diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 80b020b242..8371396572 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.56 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.57 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 a202858016..7ee6d3c54e 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.56 + 0.3.57 com.epmet resi-partymember diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml index 7a023873b2..588e449cce 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.7 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.8 ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 5c087281de..7bf570ff3a 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-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.7 + 0.3.8 resi-voice com.epmet diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml index 1e20c49e26..ab02f96ce3 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.24 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.25 ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 46532a144e..b84911dd0b 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ 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.24 + 0.3.25 epmet-openapi-scan jar diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index f91c0fd99a..7e2a0ad5f0 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.125 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.126 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 0f3e844d64..d7c680f76c 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.125 + 0.3.126 com.epmet epmet-user From f0d7b29aa1958582243b19c188828afe5f20cd1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Aug 2020 10:57:55 +0800 Subject: [PATCH 013/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 56e051544b..23d0616eaa 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.42 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.43 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 0bf15c0224..0588cb0824 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.42 + 0.3.43 data-report-server From efa762b40af46052ddaa08f843f31342103d07d5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Aug 2020 13:26:41 +0800 Subject: [PATCH 014/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 23d0616eaa..504a66db94 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.43 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.44 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 0588cb0824..cad1b86fe2 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.43 + 0.3.44 data-report-server From 00e7f6e62670d8b4a568002d4633723d0c3296da Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 27 Aug 2020 13:48:31 +0800 Subject: [PATCH 015/589] =?UTF-8?q?statistical=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 96f689df87..e98f2bb9df 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.49 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.50 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 b6ae0121f1..898f7dee34 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.49 + 0.3.50 data-statistical com.epmet From ee11c50ac98a76dde8495e5e3cc7889d501afc19 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Aug 2020 14:19:45 +0800 Subject: [PATCH 016/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 504a66db94..62c198a116 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.44 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.45 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index cad1b86fe2..caa70080c2 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.44 + 0.3.45 data-report-server From b1cf540d9b639885048013e906ed44db1ee27690 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Aug 2020 14:29:54 +0800 Subject: [PATCH 017/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 62c198a116..27881e30dc 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.45 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.46 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index caa70080c2..61415e1d15 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.45 + 0.3.46 data-report-server From 8942f95c3d35ddc53179420b3c1c45a9ddfa0ebf Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 14:30:07 +0800 Subject: [PATCH 018/589] data-report +1 46 --- .../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 62c198a116..27881e30dc 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.45 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.46 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index caa70080c2..61415e1d15 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.45 + 0.3.46 data-report-server From 847fd4f886d47e177bfbb6f0a1e52d29d128eb08 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 14:32:34 +0800 Subject: [PATCH 019/589] data-report +1 47 --- .../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 27881e30dc..8d1f42845d 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.46 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.47 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 61415e1d15..b40ecf0735 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.46 + 0.3.47 data-report-server From d024b0f66e872fddd40df8ff0c636620b5bc5d7a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 27 Aug 2020 14:44:57 +0800 Subject: [PATCH 020/589] =?UTF-8?q?gov-project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index dae2c6884b..bc8e6d9672 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.45 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.46 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index d45adb3dc3..907d5e3992 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.45 + 0.3.46 gov-project com.epmet From 12a2fb4f5da3c0d3c52d609bf9130d4aec00c610 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Aug 2020 15:00:23 +0800 Subject: [PATCH 021/589] stats 51 --- .../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 e98f2bb9df..e8f857a304 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.50 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.51 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 898f7dee34..c2e8538c0f 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.50 + 0.3.51 data-statistical com.epmet From 643e63ed4ce2937eda338bdc78fa6dffe833beb0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 15:15:44 +0800 Subject: [PATCH 022/589] datareport +1 --- .../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 8d1f42845d..4a25b571f2 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.47 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.48 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index b40ecf0735..d9cc623620 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.47 + 0.3.48 data-report-server From e089df1c1bc1db9ea5ebcdcc21fdba6b96e0d2e3 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 15:26:12 +0800 Subject: [PATCH 023/589] datareport +1 --- .../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 4a25b571f2..27f4b7a4d2 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.48 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.49 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index d9cc623620..d5403231d3 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.48 + 0.3.49 data-report-server From c171cb71b3ae8adb8ecf178d9debc56514393aa1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 15:41:33 +0800 Subject: [PATCH 024/589] datareport +1 50 --- .../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 27f4b7a4d2..0f7a535640 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.49 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.50 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index d5403231d3..74880d0f0e 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.49 + 0.3.50 data-report-server From b93e5422b0876050b1a51d8fa3586a9a6954de59 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 17:22:29 +0800 Subject: [PATCH 025/589] =?UTF-8?q?user=20+1=20=20=20gov-mine=20+1=20=20?= =?UTF-8?q?=20=E5=9C=A8=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=B8=8A=E6=9C=80=E8=BF=91=E7=99=BB=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=97=B6=E6=96=B0=E5=A2=9E=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= 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 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 54b5bdcd8c..21fc60aeb5 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.34 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.35 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 073cf96190..4b49f76c76 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.34 + 0.3.35 com.epmet gov-mine diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 7e2a0ad5f0..2737dcfde3 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.126 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.127 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 d7c680f76c..922ad564ca 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.126 + 0.3.127 com.epmet epmet-user From 668fb4e6e9733cb3e0092b4387780c65fcaf55db Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 Aug 2020 17:35:01 +0800 Subject: [PATCH 026/589] =?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 --- .../gov-org/gov-org-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index cb86f9f606..c7447c6ca7 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.91 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.92 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 0f15fc3500..3a48e20504 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.91 + 0.3.92 com.epmet gov-org From 5acc077690eebf63ef1e55afc8dc7687fa25bd9c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 27 Aug 2020 17:46:11 +0800 Subject: [PATCH 027/589] =?UTF-8?q?statistical=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 e8f857a304..f2243b5622 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.51 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.52 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 c2e8538c0f..84cd7fb224 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.51 + 0.3.52 data-statistical com.epmet From 1d1e2f2c29fc9fe8a7ee1aa8ff9489d0ff58deb3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Aug 2020 09:37:25 +0800 Subject: [PATCH 028/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 0f7a535640..44549d4b92 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.50 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.51 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 74880d0f0e..5e8c6b6ba4 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.50 + 0.3.51 data-report-server From 4d0cd1cc259729c46d9098e9884b4859702901a2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Aug 2020 10:41:14 +0800 Subject: [PATCH 029/589] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 44549d4b92..40825d0ba9 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.51 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.52 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 5e8c6b6ba4..658044a7d1 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.51 + 0.3.52 data-report-server From f57793b8fb86512e083a436eb4afe391742f21a9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 28 Aug 2020 14:13:44 +0800 Subject: [PATCH 030/589] =?UTF-8?q?gov-project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index bc8e6d9672..9e65fc267b 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.46 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.47 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 907d5e3992..ea7d864925 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.46 + 0.3.47 gov-project com.epmet From 852e4db687733da1762cd6bca41985ab660a741a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 28 Aug 2020 15:39:03 +0800 Subject: [PATCH 031/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 fb245b3745..1ae2dae628 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.48 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.49 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 3b4724aeb3..948fea27c0 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.48 + 0.3.49 com.epmet oper-customize From 2a9e7437100669499ee6af62f1eb2756bc80ebc8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Aug 2020 09:45:58 +0800 Subject: [PATCH 032/589] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=20=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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 1ae2dae628..e2dc533ad8 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.49 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.50 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 948fea27c0..ad23a005f1 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.49 + 0.3.50 com.epmet oper-customize From 39b529db336c74e4a4314b86bef91c2067cbc908 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Aug 2020 10:15:26 +0800 Subject: [PATCH 033/589] =?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-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 2737dcfde3..5db407af03 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.127 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.128 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 922ad564ca..23f27c7560 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.127 + 0.3.128 com.epmet epmet-user From 178dd81e882ff27f00c1d3f1df04aaf95bddf922 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 31 Aug 2020 10:33:29 +0800 Subject: [PATCH 034/589] data-report + 1 -> 53 --- .../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 40825d0ba9..261ba6e42d 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.52 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.53 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 658044a7d1..3106fb608d 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.52 + 0.3.53 data-report-server From 34ce10f2eeb5b80b465855acafc22b711e775538 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 31 Aug 2020 11:07:24 +0800 Subject: [PATCH 035/589] =?UTF-8?q?heart,gov-org,gov-project,user=E6=9C=8D?= =?UTF-8?q?=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-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-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 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 93c0d6a466..c2188564d1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.53 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.54 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 5b963aa293..e4c46c066d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.53 + 0.0.54 com.epmet epmet-heart 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 c7447c6ca7..aea0f68630 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.92 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.93 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 22bdde41b0..fef7705764 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.92 + 0.3.93 com.epmet gov-org diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 9e65fc267b..cb86efe9ce 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.47 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.48 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index ea7d864925..d32305e713 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.47 + 0.3.48 gov-project com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 5db407af03..225f60469f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.128 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.129 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 23f27c7560..113f95ed12 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.128 + 0.3.129 com.epmet epmet-user From 9782bbcc0b195a135e9397f1ea799744e190f07b Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 31 Aug 2020 14:03:46 +0800 Subject: [PATCH 036/589] =?UTF-8?q?gov-org=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index aea0f68630..365abb2fb6 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.93 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.94 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 fef7705764..162ab46f9b 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.93 + 0.3.94 com.epmet gov-org From 60d23fd45642c3ca916fc08782719a83fe915b01 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 31 Aug 2020 15:44:49 +0800 Subject: [PATCH 037/589] data-report +1 54 --- .../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 261ba6e42d..946345708d 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.53 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.54 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 3106fb608d..ced01ccf25 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.53 + 0.3.54 data-report-server From 5fdb07e2dea46cca50a4ffa3c10c15c3d0caf69a Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 31 Aug 2020 15:57:59 +0800 Subject: [PATCH 038/589] datareport +1 55 --- .../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 946345708d..6173f92e98 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.54 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.55 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index ced01ccf25..39c0828750 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.54 + 0.3.55 data-report-server From 4dabfd1626feb2ec0b763c8cd4d3594427ca5e17 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 31 Aug 2020 16:13:13 +0800 Subject: [PATCH 039/589] data-report +1 -> 56 --- .../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 6173f92e98..75eba6216d 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.55 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.56 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 39c0828750..99fb4584ed 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.55 + 0.3.56 data-report-server From 84e63f46ef35254ddd9bd0ac05a5ba32cec4672a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Aug 2020 17:11:56 +0800 Subject: [PATCH 040/589] =?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-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index e23b7358ee..9ab9fbd0cc 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.70 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.71 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 8883f38777..c3e2bb8d13 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.70 + 0.3.71 com.epmet epmet-cloud From eb522b2294ad80d36e36f063f1517223de12d85e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Aug 2020 17:41:14 +0800 Subject: [PATCH 041/589] =?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 --- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 8371396572..31b73335f1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.57 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.58 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 7ee6d3c54e..79ba8a3b76 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.57 + 0.3.58 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 225f60469f..e770d169e7 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.129 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.130 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 113f95ed12..6b4be87adb 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.129 + 0.3.130 com.epmet epmet-user From de7c724b33568bbe3fe746e0d21dc026442d32be Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Aug 2020 17:47:23 +0800 Subject: [PATCH 042/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e2dc533ad8..f0b2f8c6e4 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.50 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.51 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 ad23a005f1..a54eebe16a 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.50 + 0.3.51 com.epmet oper-customize From 038fa35e8814058c929210c437997c52a6e25ec7 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 1 Sep 2020 11:06:59 +0800 Subject: [PATCH 043/589] data-report +1 -> 57 --- .../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 75eba6216d..79dd3dbb69 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.56 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.57 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 99fb4584ed..fc0b5380f9 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.56 + 0.3.57 data-report-server From 63f8f10294a19391f17fcd0079515a2d674d7a80 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Sep 2020 13:31:26 +0800 Subject: [PATCH 044/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f0b2f8c6e4..7cfe1a3122 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.51 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.52 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 a54eebe16a..826911e474 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.51 + 0.3.52 com.epmet oper-customize From b69d7fae485b4fb0a2ed7d1126dfa4055adcdf15 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 1 Sep 2020 16:52:43 +0800 Subject: [PATCH 045/589] =?UTF-8?q?epmet-user=20epmet-point=20gov-issue=20?= =?UTF-8?q?resi-mine=20=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-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 431a30b094..b60b736fea 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.41 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.42 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 392e8f50d5..136ce5d917 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-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.0.41 + 0.0.42 epmet-point com.epmet diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 02717b4ff1..85dd911897 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.53 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.54 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 0ee89cc5b2..495c5626b9 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.53 + 0.3.54 gov-issue com.epmet diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 3de6667523..493a7cf42f 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.39 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.40 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 31ec3b085d..a5087a808c 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.39 + 0.3.40 com.epmet resi-mine diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index e770d169e7..f62447e28d 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.130 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.131 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 6b4be87adb..66002056f9 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.130 + 0.3.131 com.epmet epmet-user From db121410b45f6246427097a24e7f513463a3d3e3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Sep 2020 17:52:29 +0800 Subject: [PATCH 046/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7cfe1a3122..2f0da0fed5 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.52 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.53 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 826911e474..ee80ca5b8b 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.52 + 0.3.53 com.epmet oper-customize From 28e3ae89bb9314205d7b066491dedf552f49b80a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Sep 2020 10:37:14 +0800 Subject: [PATCH 047/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2f0da0fed5..1a3606c5ab 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.53 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.54 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 ee80ca5b8b..54a24dd160 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.53 + 0.3.54 com.epmet oper-customize From c5c6c7524780b7043f3a8cbffb552dac774c7308 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 12:40:15 +0800 Subject: [PATCH 048/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 1a3606c5ab..0776f59a56 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.54 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.55 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 54a24dd160..bb8d572269 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.54 + 0.3.55 com.epmet oper-customize From 1e4a524af5f9c0ea762f398bdb8a165f46b4d237 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 14:44:33 +0800 Subject: [PATCH 049/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 0776f59a56..f22e8f6126 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.55 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.56 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 bb8d572269..789d0b99d7 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.55 + 0.3.56 com.epmet oper-customize From 1cd6be21706298bfee6eb39b7dd92232c574a2b9 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 15:15:21 +0800 Subject: [PATCH 050/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index fc55101b7d..b95d9d01a5 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.17 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.18 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 169304d350..2f6d3889e5 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.17 + 0.3.18 com.epmet epmet-common-service From 58cb853eca45f5d528ea656b35582afebb8a3278 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 15:33:53 +0800 Subject: [PATCH 051/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=A4=96=E9=83=A8=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=9D=97?= 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 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 79dd3dbb69..10c63a74a4 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.57 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.58 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index fc0b5380f9..ce8a6557bf 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.57 + 0.3.58 data-report-server 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 f2243b5622..5d318955df 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.52 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.53 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 84cd7fb224..2b42004dfa 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.52 + 0.3.53 data-statistical com.epmet From 6365b1e401f4a9c5ba5b06451afb9116eb856d10 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 16:17:13 +0800 Subject: [PATCH 052/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f22e8f6126..ef9b1b67b4 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.56 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.57 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 789d0b99d7..33e0895d58 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.56 + 0.3.57 com.epmet oper-customize From 34cfbf6db6a666143c3de3ce29733c0b05f10662 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 16:57:00 +0800 Subject: [PATCH 053/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ef9b1b67b4..bedb33a366 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.57 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.58 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 33e0895d58..527f88afab 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.57 + 0.3.58 com.epmet oper-customize From 4602c620c2ab442f47ac2faae53e09de9da774ed Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 2 Sep 2020 17:14:53 +0800 Subject: [PATCH 054/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bedb33a366..8273d86fc3 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.58 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.59 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 527f88afab..287ba99c02 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.58 + 0.3.59 com.epmet oper-customize From ad77e87f921dac3b5c17115a5b3c46ae234b8890 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 2 Sep 2020 17:48:45 +0800 Subject: [PATCH 055/589] data-report +1 -> 59 --- .../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 10c63a74a4..1f9af4c920 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.58 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.59 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index cf93830fce..1c5726fae7 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.58 + 0.3.59 data-report-server From c9c3a224c586d4227559c59ec04c2f2da22f499a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 3 Sep 2020 10:08:14 +0800 Subject: [PATCH 056/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8273d86fc3..7c81d2f9ab 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.59 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.60 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 287ba99c02..944f525005 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.59 + 0.3.60 com.epmet oper-customize From 832dcaff6ef2be73d6e64ef32655347c28eb584e Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 3 Sep 2020 10:34:14 +0800 Subject: [PATCH 057/589] data-report +1 -> 60 --- .../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 1f9af4c920..46cd9667f6 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.59 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.60 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 37375fef61..1bf1141274 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.59 + 0.3.60 data-report-server From ca5fdf4a26a8cdb5ec47fc32d1f5b3c5e45e28ac Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 3 Sep 2020 11:04:30 +0800 Subject: [PATCH 058/589] data-report +1 -> 61 --- .../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 46cd9667f6..6231a146c1 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.60 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.61 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 1bf1141274..5d235c1903 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.60 + 0.3.61 data-report-server From d7a8b9a40b9b39df577818e7c91d7e7e76acfbd8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 3 Sep 2020 13:42:08 +0800 Subject: [PATCH 059/589] =?UTF-8?q?=E6=B7=BB=E5=8A=A0flyway=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= 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 6231a146c1..fd99513e21 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.61 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.62 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 5d235c1903..e3714c355a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.61 + 0.3.62 data-report-server From be4cc31ecb78eed68ba9fd000727e7aeca819ad9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 3 Sep 2020 14:23:42 +0800 Subject: [PATCH 060/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= 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 +- .../resources/db/migration/V0.0.2__dim_ag_add_col_type.sql | 3 ++- 3 files changed, 4 insertions(+), 3 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 5d318955df..19bfac99ab 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.53 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.54 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 b9996ddc3c..f44c92e83c 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.53 + 0.3.54 data-statistical com.epmet diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql index 9f1554015e..701305aa6d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql @@ -1 +1,2 @@ -ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等'; \ No newline at end of file +#ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等'; +select 1; \ No newline at end of file From df0c5ae450d83337f434176ff88d11c086f634fd Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 3 Sep 2020 15:03:44 +0800 Subject: [PATCH 061/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 19bfac99ab..43821acf76 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.54 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.55 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 f44c92e83c..dec889698d 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.54 + 0.3.55 data-statistical com.epmet From 7abb5bf5bd6b79a1ad678e39ee7bec1eb91b561e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 3 Sep 2020 15:17:31 +0800 Subject: [PATCH 062/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= 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 43821acf76..3a2c3cc95c 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.55 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.56 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 dec889698d..0cff47d2b7 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.55 + 0.3.56 data-statistical com.epmet From 84de6cfe32baa2dda930aaa7c1c991c0d2c69fd7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Sep 2020 17:02:04 +0800 Subject: [PATCH 063/589] stats 57 --- .../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 3a2c3cc95c..b2a6c19d6e 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.56 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.57 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 0cff47d2b7..345ac4a44b 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.56 + 0.3.57 data-statistical com.epmet From 6f7dca1ecb7194e54c16c70b93bb2c1e4fc20636 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 4 Sep 2020 13:45:16 +0800 Subject: [PATCH 064/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7c81d2f9ab..3d9fbc24b9 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.60 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.61 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 944f525005..d6c27eb5ff 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.60 + 0.3.61 com.epmet oper-customize From f563d2f41afd6aa769ff61cd2d6613a5c74adc04 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Sep 2020 17:06:13 +0800 Subject: [PATCH 065/589] stats 58 --- .../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 b2a6c19d6e..cda119284c 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.57 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.58 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 345ac4a44b..a15de39c1e 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.57 + 0.3.58 data-statistical com.epmet From 3762e6b24bfa2f8f8d1a5ac6043ebdecd67000b6 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 7 Sep 2020 10:03:08 +0800 Subject: [PATCH 066/589] =?UTF-8?q?=E9=92=88=E5=AF=B9=E5=A4=96=E6=8C=82?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=8C=83=E5=9B=B4=E7=9A=84=E8=B0=83=E6=95=B4=20ext=20?= =?UTF-8?q?+1=20user=20+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-ext/epmet-ext-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index 917d144838..c86e6715e9 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.8 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.9 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 1d44db0ac8..0fc57956ef 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.8 + 0.0.9 com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index f62447e28d..20fa6f4ebe 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.131 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.132 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 66002056f9..c4829c9d49 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.131 + 0.3.132 com.epmet epmet-user From 3f12b3ef2c632fffa9eaeb43a033f85a769c072e Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 7 Sep 2020 15:16:55 +0800 Subject: [PATCH 067/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index b95d9d01a5..728b041b89 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.18 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.19 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 2f6d3889e5..518e4e99d5 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.18 + 0.3.19 com.epmet epmet-common-service From c51ba3d8769849cec8c9292bb33ab3a98ae2309c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 7 Sep 2020 15:24:18 +0800 Subject: [PATCH 068/589] =?UTF-8?q?gov-org=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 365abb2fb6..b317d5cfe0 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.94 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.95 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 162ab46f9b..c2b4a22e23 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.94 + 0.3.95 com.epmet gov-org From 66b2395045689c4851c6e47daefb57fd3d826859 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 7 Sep 2020 15:34:06 +0800 Subject: [PATCH 069/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 728b041b89..bf6d9eeda5 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.19 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.20 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 518e4e99d5..c284981561 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.19 + 0.3.20 com.epmet epmet-common-service From bd87f46e4775dbecfbb41d9ac756692af0a443bb Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 7 Sep 2020 15:40:19 +0800 Subject: [PATCH 070/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-common-service/common-service-server/pom.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index bf6d9eeda5..8f5ddb4182 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.21 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index c284981561..91a58e5114 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.20 + 0.3.21 com.epmet epmet-common-service @@ -64,6 +64,12 @@ jjwt 0.7.0 + + + com.epmet + oper-crm-client + 2.0.0 + From 63b360976a83ca90715124632a81da1240518d5f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Sep 2020 15:46:41 +0800 Subject: [PATCH 071/589] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AE=9A=E5=88=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=A7=92=E8=89=B2=E8=AE=BE=E7=BD=AE=20=20?= =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 3d9fbc24b9..9e9eff07ca 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.61 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.62 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 d6c27eb5ff..e47f42a723 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.61 + 0.3.62 com.epmet oper-customize diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 20fa6f4ebe..38b8f8e014 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.132 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.133 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 c4829c9d49..7ac1fe3dc0 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.132 + 0.3.133 com.epmet epmet-user From 5834534969ecb6bb81120ff152a895a21a4d6854 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 7 Sep 2020 16:32:53 +0800 Subject: [PATCH 072/589] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88gov-org?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index f2be2009e9..7985ba2401 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.95 ports: - "8092:8092" network_mode: host # 使用现有网络 From 93f27463a129c9ddaae040bae42da8f3b7a1cfab Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Sep 2020 09:57:38 +0800 Subject: [PATCH 073/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 9e9eff07ca..5d091b770f 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.62 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.63 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 e47f42a723..445521a354 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.62 + 0.3.63 com.epmet oper-customize diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 38b8f8e014..8d4099cc5c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.133 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.134 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 7ac1fe3dc0..867f8e8318 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.133 + 0.3.134 com.epmet epmet-user From 17f29e9c3f28cef3fc2e2173165565e29c83e4ba Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Sep 2020 10:47:42 +0800 Subject: [PATCH 074/589] =?UTF-8?q?opercustomize=E6=9C=AA=E5=BC=95?= =?UTF-8?q?=E5=85=A5user=E6=9C=8D=E5=8A=A1=E9=97=AE=E9=A2=98=20=20?= =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 5d091b770f..ca958683df 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.63 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.64 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 445521a354..b4e57fb854 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.63 + 0.3.64 com.epmet oper-customize @@ -64,6 +64,12 @@ 2.0.0 compile + + com.epmet + epmet-user-client + 2.0.0 + compile + From 90dcfdb966cbd7048ac194a003ca168166df68b0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 8 Sep 2020 12:59:49 +0800 Subject: [PATCH 075/589] data-report +1 -> 63 --- .../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 fd99513e21..e3fdc24e95 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.62 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.63 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index e3714c355a..f34c1f9479 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.62 + 0.3.63 data-report-server From 0962a489143786e25022ba7ef1972ccf86b27324 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Sep 2020 15:04:45 +0800 Subject: [PATCH 076/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ca958683df..7833a623c4 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.64 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.65 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 b4e57fb854..5eaf63a6d7 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.64 + 0.3.65 com.epmet oper-customize From 323815bd6c862ab75807984c9543e3566fcd6709 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Sep 2020 18:51:33 +0800 Subject: [PATCH 077/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statical?= 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 159fec681b..1bdad99549 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.58 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.59 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 a15de39c1e..c528ba17ea 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.58 + 0.3.59 data-statistical com.epmet From f5f259fdb9bdf9656d6bd4ceea9e47be0e15c36b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Sep 2020 10:13:50 +0800 Subject: [PATCH 078/589] =?UTF-8?q?130=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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7833a623c4..b26df1c15e 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.65 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.66 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 5eaf63a6d7..7f65721da1 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.65 + 0.3.66 com.epmet oper-customize From 2e3392a197dac78a04e5bc223806e7a5dea2582e Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 9 Sep 2020 12:24:45 +0800 Subject: [PATCH 079/589] =?UTF-8?q?statistical=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 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 1bdad99549..d5acc38e23 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.59 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.60 ports: - "8108:8108" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 300M \ No newline at end of file + memory: 300M diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index c528ba17ea..baf07dcaa1 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.59 + 0.3.60 data-statistical com.epmet From bbc7c74729bf6135bfc3880fa29b2baafd388036 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Sep 2020 14:16:39 +0800 Subject: [PATCH 080/589] =?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 --- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 31b73335f1..8b4f5a8668 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.58 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.59 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 79ba8a3b76..da3489649b 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.58 + 0.3.59 com.epmet resi-partymember From 515424bf306ca14430c9e150cf4348cc3911761a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Sep 2020 14:55:38 +0800 Subject: [PATCH 081/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b26df1c15e..f0ffb84d8e 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.66 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.67 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 7f65721da1..e4ba6d18b6 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.66 + 0.3.67 com.epmet oper-customize From 789ebbeb139602aa9b9ae9107f87c43e05110347 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 9 Sep 2020 15:45:46 +0800 Subject: [PATCH 082/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statiscal?= 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 d5acc38e23..88bbfaca3b 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.60 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.61 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 baf07dcaa1..96e66bd01e 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.60 + 0.3.61 data-statistical com.epmet From 5827b2229ed47193e212e86f54d232ceb5e7449d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Sep 2020 16:42:29 +0800 Subject: [PATCH 083/589] =?UTF-8?q?add=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index b317d5cfe0..dd895ccd93 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.95 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.96 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 aeafbbdde3..bf3734cb65 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.95 + 0.3.96 com.epmet gov-org From 808de90791ce2144da51df85337b02d87a41cce5 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 9 Sep 2020 16:59:51 +0800 Subject: [PATCH 084/589] resi-mine user point +1 --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index b60b736fea..126101a511 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.42 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.43 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 19dad360dd..c2d766320d 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-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.0.42 + 0.0.43 epmet-point com.epmet diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 493a7cf42f..80f65ca370 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.40 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.41 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 1cf70149cc..5dc7ab7246 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.40 + 0.3.41 com.epmet resi-mine diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 8d4099cc5c..162a865ff9 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.134 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.135 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 0cd995e493..7a6bbdbfd5 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.134 + 0.3.135 com.epmet epmet-user From 1da4e3056103779423ccee54a29ec3cf2bc7bb91 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Sep 2020 17:42:32 +0800 Subject: [PATCH 085/589] =?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 --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f0ffb84d8e..a3d253ab99 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.67 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.68 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 d2226f25c2..1a5269e037 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.67 + 0.3.68 com.epmet oper-customize From eea59abd940d22be3e961c60c29145443b9f6a28 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 9 Sep 2020 18:23:51 +0800 Subject: [PATCH 086/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2dev=20statical?= 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 88bbfaca3b..3e64b67289 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.61 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.62 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 a22261bcd3..a37d930a9e 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.61 + 0.3.62 data-statistical com.epmet From 1ab2bc64f9c5150eb29a94421b3c2c84aac4eedb Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Sep 2020 09:41:47 +0800 Subject: [PATCH 087/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index dd895ccd93..285e975f50 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.96 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.97 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 bf3734cb65..8ea95a22bc 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.96 + 0.3.97 com.epmet gov-org From 2bd0098d66577892cc050f5f2db5a70d6d02da61 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Sep 2020 09:48:58 +0800 Subject: [PATCH 088/589] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8F=92=E5=85=A5=20=E8=BF=98=E9=9C=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indexcal/impl/GridCorreLationServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java index 1db443914c..0e992f24df 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.support.normalizing.batch.IndexInputVO; import com.epmet.support.normalizing.batch.IndexOutputVO; import com.epmet.support.normalizing.batch.SampleValue; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -359,7 +360,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { } if (!CollectionUtils.isEmpty(gridScoreEntityList)) { gridScoreDao.deleteByCusAndMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode, isTotal); - gridScoreDao.insertBatches(gridScoreEntityList); + //批量插入 + List> partition = ListUtils.partition(gridScoreEntityList, 100); + partition.forEach(list -> { + gridScoreDao.insertBatches(list); + }); } } @@ -628,7 +633,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { } if (!CollectionUtils.isEmpty(gridScoreEntityList)) { gridScoreDao.deleteByCusAndMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode, NumConstant.ONE_STR); - gridScoreDao.insertBatches(gridScoreEntityList); + //批量插入 + List> partition = ListUtils.partition(gridScoreEntityList, 100); + partition.forEach(list -> { + gridScoreDao.insertBatches(list); + }); } } From 388bbe2f16ad9d3c83f592ddfcab9f9fa0203b85 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Sep 2020 09:53:48 +0800 Subject: [PATCH 089/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a3d253ab99..5b8f469f19 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.68 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.69 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 1a5269e037..c83287ad7a 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.68 + 0.3.69 com.epmet oper-customize From 3f5f1e0d0f2af8c626197adaf419579664456815 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Sep 2020 10:02:51 +0800 Subject: [PATCH 090/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 162a865ff9..63998cff71 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.135 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.136 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 7a6bbdbfd5..c5d824aa3a 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.135 + 0.3.136 com.epmet epmet-user From a12f40a0d8bceb545d005e12a6d7cbe80573747e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Sep 2020 10:03:54 +0800 Subject: [PATCH 091/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statical?= 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 3e64b67289..c19cca0929 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.62 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.63 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 a37d930a9e..4c6297cfaf 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.62 + 0.3.63 data-statistical com.epmet From 4dadb5cfa6af10a1cc9a15f153a8a83e2f41358a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Sep 2020 10:13:11 +0800 Subject: [PATCH 092/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 8f5ddb4182..192ddff69b 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.21 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.22 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index c1927613c2..3a09f706dd 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.21 + 0.3.22 com.epmet epmet-common-service From 2f7a40d134f7badcf50eebc39b903a3171cf8f37 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 10 Sep 2020 13:28:54 +0800 Subject: [PATCH 093/589] point + 1 --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 126101a511..c0f0ad822c 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.43 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.44 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index c2d766320d..8f9664c497 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-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.0.43 + 0.0.44 epmet-point com.epmet From 051266d9eb9a8ad1efa31a7e8123fb8f50a70405 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Sep 2020 17:25:14 +0800 Subject: [PATCH 094/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 c19cca0929..e5f9596581 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.63 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.64 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 4c6297cfaf..794baddece 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.63 + 0.3.64 data-statistical com.epmet From 777d2daa96c9fefb62907014ced79775dd451c03 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Sep 2020 09:16:12 +0800 Subject: [PATCH 095/589] report+stas +1 --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 e3fdc24e95..a32b93c70a 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.63 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.64 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 336c9f773f..a145c36705 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.63 + 0.3.64 data-report-server 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 e5f9596581..fafea26ea8 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.64 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.65 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 794baddece..b1633dcd18 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.64 + 0.3.65 data-statistical com.epmet From 7146a43dadc2f2394310cca7922e867c4aeb8d2c Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 11 Sep 2020 10:03:43 +0800 Subject: [PATCH 096/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 192ddff69b..f60427b7aa 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.22 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.23 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 3a09f706dd..0a1c5c3c63 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.22 + 0.3.23 com.epmet epmet-common-service From 63ff75ac8d43381b33e425e4877809e9d2f2e861 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Sep 2020 10:40:45 +0800 Subject: [PATCH 097/589] report+stas +1 --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 a32b93c70a..da6318e2c6 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.64 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.65 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index a145c36705..24157e8fab 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.64 + 0.3.65 data-report-server 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 fafea26ea8..99c9c5224b 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.65 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.66 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 b1633dcd18..dfb9159a0a 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.65 + 0.3.66 data-statistical com.epmet From d5ce6c40bd70d06f6b7c3056214c087aa8cf3e08 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 11 Sep 2020 10:55:17 +0800 Subject: [PATCH 098/589] =?UTF-8?q?data-report=20=20=20=E5=8D=87=E7=BA=A7?= 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 da6318e2c6..c40a433453 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.65 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.66 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 24157e8fab..fe7e2f9449 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.65 + 0.3.66 data-report-server From 995d0834c2896122631423a0134a215c3d0195e8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Sep 2020 10:55:58 +0800 Subject: [PATCH 099/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2?= 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 99c9c5224b..ea9570f9f7 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.66 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.67 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 dfb9159a0a..7727532a3d 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.66 + 0.3.67 data-statistical com.epmet From f02aa9c61812628c38586005657cc687bb503ed3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Sep 2020 13:50:38 +0800 Subject: [PATCH 100/589] =?UTF-8?q?=E5=A2=9E=E5=A4=A7=E5=A0=86=E5=86=85?= =?UTF-8?q?=E5=AD=98=E9=83=A8=E7=BD=B2?= 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 66c5e53bc3..fe3ea3ed38 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.67 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.68 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 7727532a3d..58730c03e9 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.67 + 0.3.68 data-statistical com.epmet From 49b95d992ab5f3ef50e2c77c55ba9f4628cf1c87 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Sep 2020 13:57:01 +0800 Subject: [PATCH 101/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 c40a433453..f4075d092f 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.66 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.67 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index fe7e2f9449..604d508446 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.66 + 0.3.67 data-report-server From 487df340eaa794c905eb3fc2fdfd8a9546b27152 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 11 Sep 2020 14:20:45 +0800 Subject: [PATCH 102/589] =?UTF-8?q?heart=20=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index c2188564d1..57b2dc6ac2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.54 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.55 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 298e8b79f3..53c1fb8376 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.54 + 0.0.55 com.epmet epmet-heart From 12eee521caea68d524ea7034b3e03cfd4cb1f8ae Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Sep 2020 15:19:52 +0800 Subject: [PATCH 103/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 fe3ea3ed38..4f2a11e1bf 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.68 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.69 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 688b700e45..28771f72e2 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.68 + 0.3.69 data-statistical com.epmet From 25c0b83b009393e7d9df615c03c129e7c6475fd8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Sep 2020 16:06:45 +0800 Subject: [PATCH 104/589] stats 70 --- .../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 4f2a11e1bf..4058fbec30 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.69 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.70 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 28771f72e2..885dd144fe 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.69 + 0.3.70 data-statistical com.epmet From 1d84554bdbfc1cdd113d470392c09992245b019d Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Sep 2020 16:21:56 +0800 Subject: [PATCH 105/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 4058fbec30..03759ce023 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.70 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.71 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 885dd144fe..c831606681 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.70 + 0.3.71 data-statistical com.epmet From 34fbe09ab59b8480d7d7ea14d49e4ce807352a00 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 11 Sep 2020 17:18:54 +0800 Subject: [PATCH 106/589] =?UTF-8?q?report=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/data-report/data-report-server/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 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 f4075d092f..86f6a65558 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.67 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.68 ports: - "8109:8109" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 300M \ No newline at end of file + memory: 300M diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 604d508446..a2f4944f2b 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.67 + 0.3.68 data-report-server @@ -306,4 +306,4 @@ - \ No newline at end of file + From 59f0656497e2e1fc6cce6d2a19aab447739a7f37 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 11 Sep 2020 18:28:12 +0800 Subject: [PATCH 107/589] =?UTF-8?q?statistical=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 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 03759ce023..06e31db077 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.71 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.72 ports: - "8108:8108" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index c831606681..7228d3b029 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.71 + 0.3.72 data-statistical com.epmet From e9a340e440a4494a5f4b87f7276c37eff2e4d63f Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 11 Sep 2020 18:29:55 +0800 Subject: [PATCH 108/589] =?UTF-8?q?report=E5=8D=87=E7=BA=A7?= 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 86f6a65558..90eea804bd 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.68 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.69 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index a2f4944f2b..f01a488a07 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.68 + 0.3.69 data-report-server From 5542664f909e7c68dc95a3d68be1eb878e78120a Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 12 Sep 2020 09:19:35 +0800 Subject: [PATCH 109/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2commonservice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index f60427b7aa..0aa719fce8 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.23 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.24 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 0a1c5c3c63..25f4cd05a9 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.23 + 0.3.24 com.epmet epmet-common-service From 19f4c135a0f951b6a89dc4cf4953cfe9d2c0eceb Mon Sep 17 00:00:00 2001 From: wxz Date: Sat, 12 Sep 2020 09:23:00 +0800 Subject: [PATCH 110/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=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/deploy/docker-compose-dev.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index 8458f47d2e..9c0b8f75c8 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.16 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.17 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 8c9899459b..c69013ccc4 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.16 + 0.3.17 com.epmet epmet-admin From cac4010b94422fd86a7ecaa961cfd3f51cd4a553 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 12 Sep 2020 10:36:13 +0800 Subject: [PATCH 111/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 4e33aeeeca..e7a02abb16 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.72 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.73 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 7228d3b029..dbce15efa7 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.72 + 0.3.73 data-statistical com.epmet From 8f96bc0b5677e3162e5e7c946e6d38df6e1351a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 12 Sep 2020 10:38:28 +0800 Subject: [PATCH 112/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 35dd0a3a89..ede9969276 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.69 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.70 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index f01a488a07..c6be727c18 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.69 + 0.3.70 data-report-server From 465d652cfbc12586ffa3ddde43a512269198be45 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Sat, 12 Sep 2020 15:24:50 +0800 Subject: [PATCH 113/589] =?UTF-8?q?statistical=20=E5=8D=87=E7=BA=A7?= 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 e7a02abb16..47ecab5801 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.73 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.74 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 b721256a30..ddc0791af0 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.73 + 0.3.74 data-statistical com.epmet From dd84d8d2b2e908fcae97b25d33abbf2722fcbab1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 12 Sep 2020 15:57:42 +0800 Subject: [PATCH 114/589] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=87=8D?= 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 47ecab5801..151b5cd4f2 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.74 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.75 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 ddc0791af0..0a94a58c75 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.74 + 0.3.75 data-statistical com.epmet From ac387f3ce5abf847e6d6c8e41af1978dec50e8cd Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Sat, 12 Sep 2020 16:06:20 +0800 Subject: [PATCH 115/589] =?UTF-8?q?statistical=20=E5=8D=87=E7=BA=A7?= 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 151b5cd4f2..55661552d0 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.75 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.76 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 0a94a58c75..6e4d008dfa 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.75 + 0.3.76 data-statistical com.epmet From 8383139a9311b0bc9da8779a67ab552c08b4fa30 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Sep 2020 09:07:36 +0800 Subject: [PATCH 116/589] =?UTF-8?q?user=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 802a17b838..819c9b291d 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.136 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.137 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 c5d824aa3a..4017d20b63 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.136 + 0.3.137 com.epmet epmet-user From 84274cc4b35a66f7a7c3c74c4d08399a7576aa12 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 14 Sep 2020 09:43:26 +0800 Subject: [PATCH 117/589] data-report + 1 -> 71 --- .../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 ede9969276..9e9778628d 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.70 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.71 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index c6be727c18..0e13571a9e 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.70 + 0.3.71 data-report-server From 4ee303f7bdec70a75444dacceee2cdd6537c96a2 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 14 Sep 2020 10:05:51 +0800 Subject: [PATCH 118/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 55661552d0..d998abe4e2 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.76 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.77 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 6e4d008dfa..87d1e4e7e9 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.76 + 0.3.77 data-statistical com.epmet From 69f3b206e7220b1c50ef63baff504d5fe6fc1b11 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 14 Sep 2020 10:26:34 +0800 Subject: [PATCH 119/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7statis?= 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 d998abe4e2..c8c12dce6b 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.77 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.78 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 87d1e4e7e9..79abc4b050 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.77 + 0.3.78 data-statistical com.epmet From ce31736b68817d2441ffbc57efefa38ce4af00bb Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 14 Sep 2020 10:36:24 +0800 Subject: [PATCH 120/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 c8c12dce6b..d44edb9bb0 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.78 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.79 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 79abc4b050..9f2ee1ce32 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.78 + 0.3.79 data-statistical com.epmet From 006e37613b757c17794e968fd0a2b838d243aebe Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 14 Sep 2020 13:55:35 +0800 Subject: [PATCH 121/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 5915edff99..8ea7810f1e 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.26 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.27 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index db5f4ee692..c189901e1b 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.26 + 0.3.27 com.epmet epmet-job From 3cee9dd521e77583f1159297eba97aa94128dea2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 14 Sep 2020 17:29:29 +0800 Subject: [PATCH 122/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7stais?= 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 d44edb9bb0..f5f473cd6f 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.79 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.80 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 9f2ee1ce32..6bd554ac39 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.79 + 0.3.80 data-statistical com.epmet From eb5428b478de685cb76a4a366c1778617ca17ff9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 14 Sep 2020 17:30:27 +0800 Subject: [PATCH 123/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7report?= 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 9e9778628d..326188c090 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.71 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.72 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 0e13571a9e..40e27cc5c6 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.71 + 0.3.72 data-report-server From a2636ce7853c1b373f7b2c64d24c250c122085df Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 14 Sep 2020 17:55:31 +0800 Subject: [PATCH 124/589] =?UTF-8?q?partymember=20=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 94ed8f2550..de2b4382d8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.59 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.60 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 912bcc1ab6..f88e2df5a7 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.59 + 0.3.60 com.epmet resi-partymember From 455ca0822368bf374d2f5995cae25091783a5ee1 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 15 Sep 2020 09:40:43 +0800 Subject: [PATCH 125/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 f5f473cd6f..05297640ab 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.80 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.81 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 6bd554ac39..7e72e8c2fe 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.80 + 0.3.81 data-statistical com.epmet From 4010a0a7ce5ada5d3b2cdf179d7e89703ca938a1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Sep 2020 11:20:45 +0800 Subject: [PATCH 126/589] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=B3=A8=E8=A7=A3?= 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 05297640ab..5afadfceb5 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.81 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.82 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 7e72e8c2fe..512a5f2b1b 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.81 + 0.3.82 data-statistical com.epmet From 056b25b8dbd14cdfb8d482b79b005e8146e883bc Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Sep 2020 12:16:26 +0800 Subject: [PATCH 127/589] =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E6=BA=90?= 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 5afadfceb5..62568009d2 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.82 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.83 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 512a5f2b1b..0413156bfb 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.82 + 0.3.83 data-statistical com.epmet From 76386c8bc13eaca4c22c7c3f2288ae9e6e9219a2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Sep 2020 13:23:33 +0800 Subject: [PATCH 128/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7stits?= 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 62568009d2..1bffcf94b2 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.83 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.84 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 0413156bfb..016cfe0480 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.83 + 0.3.84 data-statistical com.epmet From 259414a6d63c62ff1baba0631a5bb4017c673446 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Sep 2020 14:20:50 +0800 Subject: [PATCH 129/589] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E8=AF=A5?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=B3=A8=E8=A7=A3?= 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 1bffcf94b2..82c1236c32 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.84 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.85 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 016cfe0480..27af9b21d6 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.84 + 0.3.85 data-statistical com.epmet From ffc740bc63ea974054faa7b4a4559e0b4ff68bda Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Sep 2020 14:38:54 +0800 Subject: [PATCH 130/589] =?UTF-8?q?=E5=AD=94=E6=9D=91=E9=87=87=E9=9B=86api?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E5=B8=83130?= 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 82c1236c32..05a7ad4f8f 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.85 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.86 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 27af9b21d6..56fcc32fb6 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.85 + 0.3.86 data-statistical com.epmet From cd0f80a69ec86b2d7ec39fb1b71c416fe1b10129 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Sep 2020 15:09:31 +0800 Subject: [PATCH 131/589] =?UTF-8?q?=E5=AD=94=E6=9D=91=E9=87=87=E9=9B=86api?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E5=B8=83130?= 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 05a7ad4f8f..a0ae50605b 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.86 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.87 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 56fcc32fb6..5b415b4c48 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.86 + 0.3.87 data-statistical com.epmet From d3c275dc5fa8ba0d922fc6a68f5d00cb2ffe55aa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Sep 2020 16:02:18 +0800 Subject: [PATCH 132/589] =?UTF-8?q?=E5=AD=94=E6=9D=91=EF=BC=9Agroup/detail?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=20130=20fabu?= 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 a0ae50605b..a74c731906 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.87 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.88 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 5b415b4c48..b3c8ce86a0 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.87 + 0.3.88 data-statistical com.epmet From 71548a3fe22143a49b7c5c3597beef6326223a28 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Sep 2020 17:16:17 +0800 Subject: [PATCH 133/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= 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 a74c731906..f9df4d2528 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.88 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.89 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 b3c8ce86a0..f2a469d2ba 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.88 + 0.3.89 data-statistical com.epmet From 05a760d74aecbd716c0ea0f73209996144e5f643 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Sep 2020 17:41:36 +0800 Subject: [PATCH 134/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= 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 f9df4d2528..eb6d906ee4 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.89 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.90 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 f2a469d2ba..97aa77ab46 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.89 + 0.3.90 data-statistical com.epmet From 0084e755eb3a530a9841a6d8ab53760f3badf87b Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 16 Sep 2020 13:02:05 +0800 Subject: [PATCH 135/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2stits?= 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 eb6d906ee4..606eeb9a08 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.90 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.91 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 97aa77ab46..37d6b37ed3 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.90 + 0.3.91 data-statistical com.epmet From ad0675dc8acf3df720b49aedc5def0430072f30b Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 16 Sep 2020 13:06:09 +0800 Subject: [PATCH 136/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 326188c090..6d750b254d 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.72 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.73 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 40e27cc5c6..53b3077a5a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.72 + 0.3.73 data-report-server From e6e837b992fbd6412a49964aa8f4f4674f8ccc8d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 16 Sep 2020 15:55:10 +0800 Subject: [PATCH 137/589] =?UTF-8?q?=E5=AD=94=E6=9D=91=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E5=88=86=E6=A8=A1=E5=9D=97=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 666abe71cc..7512784bfe 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.36 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.37 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 0daf2cabda..efb5b0257b 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.36 + 0.3.37 com.epmet epmet-cloud 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 6d750b254d..8a694e3497 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.73 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.74 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 53b3077a5a..d01e1e8cb7 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.73 + 0.3.74 data-report-server From e0bc79068bc5ea950259d1197c3aad77fa017180 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 16 Sep 2020 16:26:55 +0800 Subject: [PATCH 138/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 8a694e3497..a7702aa0df 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.74 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.75 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index d01e1e8cb7..42c856b059 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.74 + 0.3.75 data-report-server From 79c8a7d276acd11c3b00bdf2dd100456952afa78 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 16 Sep 2020 18:18:30 +0800 Subject: [PATCH 139/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 a7702aa0df..44570ff7a0 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.75 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.76 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 42c856b059..90b5e6b4a0 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.75 + 0.3.76 data-report-server From aea3788c8cc2b5e01fe8bf34538af3a704fb226a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 17 Sep 2020 09:22:09 +0800 Subject: [PATCH 140/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 7512784bfe..2188bd0fb3 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.38 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index efb5b0257b..78fa471715 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.37 + 0.3.38 com.epmet epmet-cloud From 7b4e338460885f9d1065009c9bebfa51de494765 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 17 Sep 2020 09:55:27 +0800 Subject: [PATCH 141/589] xiufu --- .../com/epmet/feign/EpmetCommonServiceOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java index a3e26a5d80..caa9bd6301 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java @@ -19,8 +19,8 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 10:28 */ -//@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class) -@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class, url = "http://localhost:8103") +@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class) +//@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class, url = "http://localhost:8103") public interface EpmetCommonServiceOpenFeignClient { /** * @param formDTO From c2e14f5681125b5f51d0b8557f70f3ea71ae34e3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Sep 2020 09:56:25 +0800 Subject: [PATCH 142/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 44570ff7a0..c44ae7b4e4 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.76 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.77 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 90b5e6b4a0..24d34375bb 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.76 + 0.3.77 data-report-server From bb565e0df3d8a366d27dde7c602a05da8a768186 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 17 Sep 2020 09:56:50 +0800 Subject: [PATCH 143/589] xiufu --- .../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 606eeb9a08..53012a3b0e 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.91 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.92 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 37d6b37ed3..df77e96990 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.91 + 0.3.92 data-statistical com.epmet From 87fa379c57876317f699eda1443121c3c4777733 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Sep 2020 14:18:07 +0800 Subject: [PATCH 144/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2stits?= 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 53012a3b0e..e05e210838 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.92 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.93 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 df77e96990..8ae7e84d3b 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.92 + 0.3.93 data-statistical com.epmet From f341c0f3e7ca26a9236893e4a367873b49689978 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 17 Sep 2020 16:46:03 +0800 Subject: [PATCH 145/589] project +1 -> 49 --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index af752cdff0..35f554b4ef 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.48 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.49 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index a144cbb9da..7de1297635 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.48 + 0.3.49 gov-project com.epmet From f217e780078943a3e4780c2916d720c7587cf71d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 17 Sep 2020 17:24:11 +0800 Subject: [PATCH 146/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1=EF=BC=8Cjob?= =?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 --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 e05e210838..29a665417e 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.93 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.94 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 1d4a19e939..e66b5b0e2d 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.93 + 0.3.94 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 8ea7810f1e..affc6930f0 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.27 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.28 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index c189901e1b..fbf9a3a1fd 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.27 + 0.3.28 com.epmet epmet-job From 3153e1eb9f59c1e748eadf8f0d759b65ba66e602 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 17 Sep 2020 18:00:38 +0800 Subject: [PATCH 147/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/DataStatisticalOpenFeignClient.java | 12 ++++++++++-- .../impl/DataStatisticalOpenFeignClientFallBack.java | 9 +++++++-- .../deploy/docker-compose-dev.yml | 2 +- .../data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index c9ca758964..5abd41f58b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -172,14 +172,22 @@ public interface DataStatisticalOpenFeignClient { * @date 2020.06.29 09:27 **/ @PostMapping("/data/stats/statstopic/execute") - Result execTopicStatistical(@RequestParam(value = "date",required = false) String date); + Result execTopicStatistical(@RequestParam(value = "date", required = false) String date); /** - * @Description 统计党员 * @param customerIdAndDateIdFormDTO + * @Description 统计党员 * @author zxc * @date 2020/9/17 3:10 下午 */ @PostMapping("/data/stats/dim/statsparty") Result getPartyInfo(@RequestBody CustomerIdAndDateIdFormDTO customerIdAndDateIdFormDTO); + + /** + * 处理暂停的计算 + * + * @return + */ + @PostMapping("/data/stats/indexcalculate/process-pendding-cals") + Result processPenddingCalculate(); } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java index 629b2e6762..85a0737f0b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -169,11 +169,16 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp **/ @Override public Result execTopicStatistical(String date) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical",date); + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical", date); } @Override public Result getPartyInfo(CustomerIdAndDateIdFormDTO customerIdAndDateIdFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getPartyInfo",customerIdAndDateIdFormDTO); + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getPartyInfo", customerIdAndDateIdFormDTO); + } + + @Override + public Result processPenddingCalculate() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "processPenddingCalculate"); } } 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 29a665417e..7a4f40838f 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.94 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.95 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 e66b5b0e2d..1d27bc53b7 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.94 + 0.3.95 data-statistical com.epmet From c348fcb11adf3f247a11e648cf24d44b0fc425e4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Sep 2020 09:08:32 +0800 Subject: [PATCH 148/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 7a4f40838f..6e9c5a4bc5 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.95 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.96 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 3091f09be3..308849ec2f 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.95 + 0.3.96 data-statistical com.epmet From f452756635ebe83979eeae081cffe89239bf59e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Sep 2020 11:00:45 +0800 Subject: [PATCH 149/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 c44ae7b4e4..2b41d067b6 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.77 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.78 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 24d34375bb..622584fe3d 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.77 + 0.3.78 data-report-server From 59b2af42b307d4c5da0699a26ee6bfcc257ca4c1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 18 Sep 2020 11:10:32 +0800 Subject: [PATCH 150/589] dev_temp project + 1 -> 50 --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 35f554b4ef..d424658532 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.49 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.50 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 7de1297635..37a8b716c3 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.49 + 0.3.50 gov-project com.epmet From 5bcafa340d58197590a874534cbe80722b2ead39 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Sep 2020 13:35:36 +0800 Subject: [PATCH 151/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 2b41d067b6..005a7d3642 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.78 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.79 ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 622584fe3d..0bec2230a1 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.78 + 0.3.79 data-report-server From 8f8809c3578df138b1d1bd05952b693becd5082e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 18 Sep 2020 13:43:18 +0800 Subject: [PATCH 152/589] =?UTF-8?q?=E5=BC=80=E5=90=AFPC=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E9=99=86=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C=E3=80=81?= =?UTF-8?q?third=E5=BA=93code=5Fext=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=20=20=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-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 2183f15f1e..20fa871fff 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.71 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.72 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 75c45fcc0a..16f1b7c24b 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.71 + 0.3.72 com.epmet epmet-cloud diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index c35cda57a7..77a5237c76 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.141 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.142 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index f85185fb9b..e546a32b87 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.141 + 0.0.142 com.epmet From 719496aa48d7b151eb6f0c2fecfd8183789c2102 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 18 Sep 2020 14:35:54 +0800 Subject: [PATCH 153/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 3 ++- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 3 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 005a7d3642..0dc6da33b8 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,8 @@ 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.79 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.80 + ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 0bec2230a1..00ab588bf5 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.79 + 0.3.80 data-report-server From 43a7cb9f276cfefdd956aaeed3de0b15e80b6c77 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 21 Sep 2020 10:00:40 +0800 Subject: [PATCH 154/589] =?UTF-8?q?=E5=AD=94=E6=9D=91=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=8F=82=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=B0=83=E6=95=B4=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 0dc6da33b8..30cf282d59 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.80 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.81 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 00ab588bf5..ee26393675 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.80 + 0.3.81 data-report-server From 977729f49eb4a8fd0d4c0a73fc41dad7294f203e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 10:38:46 +0800 Subject: [PATCH 155/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=E5=92=8Cstatis?= 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 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 6e9c5a4bc5..dcb369d77d 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.96 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.97 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 308849ec2f..f1b052f1dc 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.96 + 0.3.97 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index affc6930f0..447fa06e1f 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.29 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index fbf9a3a1fd..01e91beca0 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.29 com.epmet epmet-job From 6c973b79a4f4dd31d7067e3fec552fa438e46973 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 12:25:47 +0800 Subject: [PATCH 156/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 dcb369d77d..79670b24d4 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.97 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.98 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 a8e43e330f..5af82c0a13 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.97 + 0.3.98 data-statistical com.epmet From 34811ab2d6f61c859e8fcf668a3b45e4d02d5498 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 13:13:55 +0800 Subject: [PATCH 157/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 79670b24d4..cb34cd1b6b 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.98 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.99 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 5af82c0a13..72e5c789e2 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.98 + 0.3.99 data-statistical com.epmet From a2cd6a57a6294c32bc60d20825c3776f4f60fae7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 13:45:03 +0800 Subject: [PATCH 158/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 cb34cd1b6b..1d1578dd1d 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.99 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.100 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 72e5c789e2..fa7fea4208 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.99 + 0.3.100 data-statistical com.epmet From 3ec387f9b4fc18b90d122668e570ca73ec582276 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 21 Sep 2020 14:10:25 +0800 Subject: [PATCH 159/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 566a9a94f1..ab6652398c 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.69 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.70 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 c83287ad7a..24810d7ff9 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.69 + 0.3.70 com.epmet oper-customize From 6a883b2afeba77cb63857d1d9c81cd08b4080bc6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 21 Sep 2020 17:06:36 +0800 Subject: [PATCH 160/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 1d1578dd1d..0597dd300b 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.100 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.101 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 fa7fea4208..2a2f28ed23 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.100 + 0.3.101 data-statistical com.epmet From 2139b4f99999c6dc299da6eaca37381d8933b757 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 17:51:59 +0800 Subject: [PATCH 161/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 0597dd300b..7a001fa5ff 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.101 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.102 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 2a2f28ed23..87c2e75e08 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.101 + 0.3.102 data-statistical com.epmet From 7cd451a248e897d3b59522564f02173ac5f62854 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 21 Sep 2020 18:08:59 +0800 Subject: [PATCH 162/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 7a001fa5ff..b14298e484 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.102 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.103 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 87c2e75e08..b2279c083b 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.102 + 0.3.103 data-statistical com.epmet From 95f6baae92b1d9fea3b7b96d8a616766bb931c8f Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 18:25:30 +0800 Subject: [PATCH 163/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 447fa06e1f..bcee530fe7 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.29 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.30 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 01e91beca0..c843f7f2f0 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.30 com.epmet epmet-job From ffcada4f2e52d03e393fd1184db912d0009bcad9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 21:37:28 +0800 Subject: [PATCH 164/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=20statis?= 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 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 b14298e484..ca77780535 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.103 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.104 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 b2279c083b..4e0eae1ee7 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.103 + 0.3.104 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index bcee530fe7..0d287fbc50 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.31 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index c843f7f2f0..413f285765 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet epmet-job From 3405d818642b15d106abefb4526a85122720520d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 22 Sep 2020 10:55:42 +0800 Subject: [PATCH 165/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 ca77780535..0dcb57ee97 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.104 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.105 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 4e0eae1ee7..b2a14d436e 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.104 + 0.3.105 data-statistical com.epmet From 770b1eeb0582a14ae6e3aa642053e6b5c12b2411 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 22 Sep 2020 11:15:51 +0800 Subject: [PATCH 166/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 0dcb57ee97..8f826116c5 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.105 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.106 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 b2a14d436e..5438a31c3e 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.105 + 0.3.106 data-statistical com.epmet From 6ab7c5240e3ce22370ff760a1661ff87d6859604 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 22 Sep 2020 12:14:24 +0800 Subject: [PATCH 167/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 8f826116c5..aa31c25f79 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.106 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.107 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 5438a31c3e..7fc77c8396 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.106 + 0.3.107 data-statistical com.epmet From bf010cdbb63deee410a70b76dbfc22ce6874b5c5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 22 Sep 2020 12:18:50 +0800 Subject: [PATCH 168/589] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BDext?= =?UTF-8?q?json=E4=B8=AD=E6=B7=BB=E5=8A=A0customerName=20=20130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 77a5237c76..6cbae8ac5c 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.142 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.143 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index e546a32b87..054dadc5d3 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.142 + 0.0.143 com.epmet From 0df3674fc2121a9a0a4387b9d72ad33ba4f96389 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 22 Sep 2020 16:35:56 +0800 Subject: [PATCH 169/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/DataStatisticalOpenFeignClient.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 852f7b7d02..46a4554d9b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -168,15 +168,6 @@ public interface DataStatisticalOpenFeignClient { @PostMapping("/data/stats/statsuser/execute") Result execUserStatistical(@RequestParam(value = "date", required = false) String date); - /** - * @Description 执行话题统计 - * @param - * @return - * @author wangc - * @date 2020.06.29 09:27 - **/ - @PostMapping("/data/stats/statstopic/execute") - Result execTopicStatistical(@RequestParam(value = "date", required = false) String date); /** * @param * @return From fece3d5ba71218e07f60734e4408a445bc925f0a Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 22 Sep 2020 16:37:25 +0800 Subject: [PATCH 170/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 aa31c25f79..1e29910485 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.107 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.108 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 7fc77c8396..5ee8666737 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.107 + 0.3.108 data-statistical com.epmet From 7dc7613e611a188a11018a8911241956b5640b4d Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 22 Sep 2020 17:07:20 +0800 Subject: [PATCH 171/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 0d287fbc50..df7a998827 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.31 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.32 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 413f285765..eafa92333b 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.31 + 0.3.32 com.epmet epmet-job From c2e9b13b9cd1355fd4d970720004d51669f59778 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 24 Sep 2020 09:09:33 +0800 Subject: [PATCH 172/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report=20statis?= 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 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 30cf282d59..3a943c04c2 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.81 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.82 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 ee26393675..5624cec102 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.81 + 0.3.82 data-report-server 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 1e29910485..334d18c156 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.108 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.109 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 5ee8666737..773ef7bebd 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.108 + 0.3.109 data-statistical com.epmet From 269d3f6b5d87d27e9fa7a7e1198fa4d04b8a9a20 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 24 Sep 2020 18:14:53 +0800 Subject: [PATCH 173/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 2188bd0fb3..3a297564bd 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.38 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.39 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index ed64b82243..c215547dd0 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.38 + 0.3.39 com.epmet epmet-cloud diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 60648911c0..fe719f0be6 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.24 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.25 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index c5f2f8bdab..3127614c1c 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.24 + 0.3.25 com.epmet epmet-common-service From d5180901091f0ab9c8e1857ea0d8ba439dde4503 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 25 Sep 2020 15:37:48 +0800 Subject: [PATCH 174/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 3a297564bd..7ea1b8c81e 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.39 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.40 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index c215547dd0..7612b40981 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.39 + 0.3.40 com.epmet epmet-cloud 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 3a943c04c2..e885bf21d8 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.82 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.83 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 4db52fbeeb..7fee793760 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-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.82 + 0.3.83 data-report-server 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 334d18c156..fa92d2e265 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.109 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.110 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 e9633c29aa..27ac590565 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.109 + 0.3.110 data-statistical com.epmet From 5e5ab4fde9334ecd2a9c22241d561c15c5d9cf6f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 25 Sep 2020 15:50:37 +0800 Subject: [PATCH 175/589] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=94=B9=E7=89=88=E7=BC=BA=E5=A4=B1=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?= 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 | 3 +-- 2 files changed, 2 insertions(+), 3 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 e885bf21d8..b236a2e4b0 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.83 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.84 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 7fee793760..1461f368b6 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -2,8 +2,7 @@ - - 0.3.83 + 0.3.84 data-report-server From 8ea8890116c953d94de6103ed46952987febf713 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sun, 27 Sep 2020 13:28:34 +0800 Subject: [PATCH 176/589] =?UTF-8?q?data-stats=E4=BF=AE=E6=94=B9=E5=8A=9E?= =?UTF-8?q?=E7=BB=93=E7=8E=87=E8=AE=A1=E7=AE=97=20=20=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7+1=3D111?= 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 fa92d2e265..bc7fc83c15 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.110 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.111 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 27ac590565..05442bdb50 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.110 + 0.3.111 data-statistical com.epmet From 5decd00242c76f414d097fff896de634de25ef82 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sun, 27 Sep 2020 14:36:11 +0800 Subject: [PATCH 177/589] =?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 --- .../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 b236a2e4b0..fdbfe8010f 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.84 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.85 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 1461f368b6..2f7f3998ee 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.84 + 0.3.85 data-report-server From 173e66dbf6e45d6ce9280195d861c3bc6db5e631 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sun, 27 Sep 2020 16:09:08 +0800 Subject: [PATCH 178/589] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8D=87=E7=BA=A7?= 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 fdbfe8010f..8e7f65975b 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.85 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.86 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 2f7f3998ee..35afcd87ed 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.85 + 0.3.86 data-report-server From 31168fd302956f56e17d4125eab77fc98ba2c1a7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 28 Sep 2020 10:41:41 +0800 Subject: [PATCH 179/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 bc7fc83c15..96e6003bb6 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.111 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.112 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 05442bdb50..dbb67e3442 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.111 + 0.3.112 data-statistical com.epmet From b5e0b814ded38edd87879dd7abf63f08797c144b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 28 Sep 2020 11:04:11 +0800 Subject: [PATCH 180/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 96e6003bb6..7e70bc6ec3 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.112 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.113 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 dbb67e3442..3cf07da71c 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.112 + 0.3.113 data-statistical com.epmet From 55d1b18c84a39bfec1c0bff835dce49188a36928 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 28 Sep 2020 11:05:09 +0800 Subject: [PATCH 181/589] =?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 --- .../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 8e7f65975b..10bbe3541b 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.86 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.87 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 35afcd87ed..19fd6ec944 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.86 + 0.3.87 data-report-server From 1db51acab93267f8c3ea6d4ea47a5110cf8e816a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Sep 2020 12:07:57 +0800 Subject: [PATCH 182/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 7ea1b8c81e..95f1146732 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.40 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.41 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 7612b40981..d60d050e62 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.40 + 0.3.41 com.epmet epmet-cloud From 401c5227b4431304a3457bb29229bcf4dcf91d4b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 28 Sep 2020 14:16:07 +0800 Subject: [PATCH 183/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 7e70bc6ec3..d08aadf7da 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.113 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.114 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 3cf07da71c..13eea0a0fc 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.113 + 0.3.114 data-statistical com.epmet From 121ce2244c4a0c87101c22067043aa2789ff019d Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Sep 2020 14:22:07 +0800 Subject: [PATCH 184/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 10bbe3541b..e243e438cc 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.87 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.88 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 19fd6ec944..6ff3569ab4 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.87 + 0.3.88 data-report-server From 087d50e27f5d45f3c8ade8a5ba3ab3e43318d9a7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 28 Sep 2020 14:41:10 +0800 Subject: [PATCH 185/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 d08aadf7da..335a1dea32 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.114 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.115 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 13eea0a0fc..0cd115da98 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.114 + 0.3.115 data-statistical com.epmet From 83a64f18d4b2b2af56c2a0165c5f5c4e9edee7f0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 28 Sep 2020 15:28:49 +0800 Subject: [PATCH 186/589] =?UTF-8?q?job=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index df7a998827..a7b6507168 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.32 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.33 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index eafa92333b..555697c9fe 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.32 + 0.3.33 com.epmet epmet-job From de8137816a827813445ba161e5d290118bc34400 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Sep 2020 10:41:30 +0800 Subject: [PATCH 187/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 335a1dea32..7fd5a1e986 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.115 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.116 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 0cd115da98..7bf8dcfca2 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.115 + 0.3.116 data-statistical com.epmet From 0a6c7f2b43bc2b0af09caf579c6b79cf5fcb5087 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 29 Sep 2020 10:58:36 +0800 Subject: [PATCH 188/589] =?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 --- .../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 e243e438cc..b7865650fd 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.88 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.89 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 6ff3569ab4..381c67e772 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.88 + 0.3.89 data-report-server From e1874c2e61fe461af5c417c139a4c1d8d7a8c335 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Sep 2020 11:11:54 +0800 Subject: [PATCH 189/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report=20statis?= 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 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 b7865650fd..c5c5292997 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.89 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.90 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 381c67e772..e15383df5f 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.89 + 0.3.90 data-report-server 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 7fd5a1e986..1141b12f02 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.116 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.117 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 7bf8dcfca2..791006d28b 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.116 + 0.3.117 data-statistical com.epmet From 546f68bb7971ef84e6df59aa825ac11302169ed5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Sep 2020 14:08:44 +0800 Subject: [PATCH 190/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 1141b12f02..230d167466 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.117 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.118 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 791006d28b..7735a4bd56 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.117 + 0.3.118 data-statistical com.epmet From 3b3acae66a1d933e861853fb33ac61ee1a0d122a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Sep 2020 14:43:25 +0800 Subject: [PATCH 191/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 230d167466..8057091718 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.118 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.119 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 7735a4bd56..c32ce8a95e 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.118 + 0.3.119 data-statistical com.epmet From 9c6e8e1d09c653dc672657da8c25d0c79464efaa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Sep 2020 15:12:39 +0800 Subject: [PATCH 192/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 8057091718..8bcaf51709 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.119 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.120 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 c32ce8a95e..319a801796 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.119 + 0.3.120 data-statistical com.epmet From e4e1ff890278303a7fb36f6763c36adbd1ddab7f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 29 Sep 2020 15:27:47 +0800 Subject: [PATCH 193/589] =?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 --- .../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 c5c5292997..8f2034f3ab 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.90 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.91 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 e15383df5f..41c2232cca 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.90 + 0.3.91 data-report-server From f4449dc4a2b9194759965cd85b07a8c88493dd24 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 29 Sep 2020 15:49:39 +0800 Subject: [PATCH 194/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 8bcaf51709..39058c915c 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.120 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.121 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 319a801796..d301f54b00 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.120 + 0.3.121 data-statistical com.epmet From 26d829a0053c7a0e9e7fa82190ad2719ebba00e4 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 29 Sep 2020 16:06:02 +0800 Subject: [PATCH 195/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 95f1146732..cebce29662 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.41 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.42 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d60d050e62..d5499ea398 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.41 + 0.3.42 com.epmet epmet-cloud From d0b5ce94c410a91829022b51fea35cfb1d0e148a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 29 Sep 2020 16:09:32 +0800 Subject: [PATCH 196/589] =?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 --- .../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 8f2034f3ab..70b166f5a9 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.91 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.92 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 41c2232cca..3da5ef4ff9 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.91 + 0.3.92 data-report-server From c97d08ac21c773442b2cbeb3a810696c1ef23944 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 29 Sep 2020 16:17:47 +0800 Subject: [PATCH 197/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 70b166f5a9..df4a3724b0 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.92 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.93 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 3da5ef4ff9..2562851cdd 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.92 + 0.3.93 data-report-server From 4a0c45c3ace51be1d24d47adb35c095f68e6b2bc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 29 Sep 2020 16:54:10 +0800 Subject: [PATCH 198/589] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=89=80=E6=9C=89=E7=9A=84=E6=89=8B=E6=8A=9B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= 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 df4a3724b0..668a5a7c03 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.93 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.94 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 2562851cdd..0f0d165734 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.93 + 0.3.94 data-report-server From cb10845da10c9091ccb48aa0b5dc34a3d770a4f9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 09:26:47 +0800 Subject: [PATCH 199/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 39058c915c..c6c044c84b 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.121 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.122 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 d301f54b00..8f12840225 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.121 + 0.3.122 data-statistical com.epmet From 187ad6431d17ba4854000e9a24b299160629df0a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 09:46:51 +0800 Subject: [PATCH 200/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 c6c044c84b..a4ab0a72fa 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.122 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.123 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 8f12840225..0746d0aa11 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.122 + 0.3.123 data-statistical com.epmet From 7166eba0ffed9b7108a42bc42c37f9ee7c325bd6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 30 Sep 2020 10:46:47 +0800 Subject: [PATCH 201/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 a4ab0a72fa..b747ba3660 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.123 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.124 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 0746d0aa11..869e173325 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.123 + 0.3.124 data-statistical com.epmet From e692051bd490060f4f72b696eb9f4f9304c37ffb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 30 Sep 2020 10:47:08 +0800 Subject: [PATCH 202/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 a4ab0a72fa..b747ba3660 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.123 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.124 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 0746d0aa11..869e173325 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.123 + 0.3.124 data-statistical com.epmet From b930a876a2a09c169d4abd7fa8e77699d126e334 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 10:55:45 +0800 Subject: [PATCH 203/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 668a5a7c03..a264991d2d 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.94 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.95 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 0f0d165734..354e1244df 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.94 + 0.3.95 data-report-server From 779b07a5e3975b7355beb0f36552a136515935c9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 30 Sep 2020 12:07:41 +0800 Subject: [PATCH 204/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 b747ba3660..3b2538ea58 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.124 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.126 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 869e173325..be426e2044 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.124 + 0.3.126 data-statistical com.epmet From f36df297c9529e561cc13357b4aa57b8282c9e93 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 30 Sep 2020 13:55:04 +0800 Subject: [PATCH 205/589] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= 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 3b2538ea58..735e2c3a04 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.126 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.127 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 be426e2044..856ee71e05 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.126 + 0.3.127 data-statistical com.epmet From ba28ffe9dfb1523276e0d66e34128b23bed2f5c2 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 30 Sep 2020 14:14:38 +0800 Subject: [PATCH 206/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 735e2c3a04..ba705bf3f9 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.127 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.128 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 856ee71e05..b2f1550559 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.127 + 0.3.128 data-statistical com.epmet From 37d2588ba47759b82c547e4f45dacb742452ab2a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 14:19:20 +0800 Subject: [PATCH 207/589] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenIndexDataMonthlyDao.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 3f7bec2b57..f7f35e0712 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -77,7 +77,14 @@ del_flag = '0' AND parent_id = #{agencyId} AND month_id = #{monthId,jdbcType=VARCHAR} - AND ORG_TYPE != 'department' + + + AND ORG_TYPE = #{orgType,jdbcType=VARCHAR} + + + AND ORG_TYPE != 'department' + + ORDER BY index_total ASC From 7a712ad4b991040aeca9b0373478045cc129ad44 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 14:21:46 +0800 Subject: [PATCH 208/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 a264991d2d..b256f9585a 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.95 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.96 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 354e1244df..2c9141586c 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.95 + 0.3.96 data-report-server From ae6f8f537154205f5ac8858b8276b8a4bf3cae6f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 30 Sep 2020 15:17:17 +0800 Subject: [PATCH 209/589] =?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 --- .../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 b256f9585a..6841eab940 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.96 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.97 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 2c9141586c..f58741cbb3 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.96 + 0.3.97 data-report-server From 9327769f41ba307bca853f57bc0559917f992e8f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 17:07:54 +0800 Subject: [PATCH 210/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 ba705bf3f9..6429d5c613 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.128 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.129 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 b2f1550559..bae197a121 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.128 + 0.3.129 data-statistical com.epmet From adb366c6dd8f08e4622f739962ca57702fb563e6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 17:31:28 +0800 Subject: [PATCH 211/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 6429d5c613..bd1baef2a5 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.129 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.130 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 bae197a121..0b7bff90c5 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.129 + 0.3.130 data-statistical com.epmet From 433dc5f116f15d5821b5922d7f8743a3a7796317 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 30 Sep 2020 17:45:16 +0800 Subject: [PATCH 212/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 bd1baef2a5..6f055db510 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.130 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.131 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 0b7bff90c5..44f1a745c4 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.130 + 0.3.131 data-statistical com.epmet From 11cba165ed9b5ef2619b7e7fbe6bccd7ece10e13 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 9 Oct 2020 09:19:30 +0800 Subject: [PATCH 213/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 160f77f13e..9d5699442f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.55 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.56 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 53c1fb8376..e6368638c9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.55 + 0.0.56 com.epmet epmet-heart From 99b64bee7c522143317031068ec8dee5a0b7d3c1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 9 Oct 2020 11:11:45 +0800 Subject: [PATCH 214/589] =?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 --- .../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 6841eab940..2cad6d33b0 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.97 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.98 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 f58741cbb3..08f42bb33c 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.97 + 0.3.98 data-report-server From 814af1c293eb3c2caaa2d16486ab353424908ab7 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 9 Oct 2020 11:18:57 +0800 Subject: [PATCH 215/589] =?UTF-8?q?data-statistical=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8A=A01=20=20=20=20132?= 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 6f055db510..a80c0ab901 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.131 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.132 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 44f1a745c4..c975a87363 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.131 + 0.3.132 data-statistical com.epmet From 488dde92ca4ffde1f8e06e307031c85e016befac Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Oct 2020 15:42:04 +0800 Subject: [PATCH 216/589] =?UTF-8?q?gateway,common-service,job,report,stati?= =?UTF-8?q?s=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-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index cebce29662..292df0a90d 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.42 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.43 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d5499ea398..84018ff064 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.42 + 0.3.43 com.epmet epmet-cloud 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 2cad6d33b0..46ccc87e87 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.98 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.99 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 08f42bb33c..8305746014 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.98 + 0.3.99 data-report-server 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 a80c0ab901..adb4af8783 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.132 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.133 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 c975a87363..def15bb934 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.132 + 0.3.133 data-statistical com.epmet diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index fe719f0be6..da8b6a8229 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.26 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 3127614c1c..42682b64db 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.25 + 0.3.26 com.epmet epmet-common-service diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index a7b6507168..29766d37ab 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.33 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.34 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 555697c9fe..231ee590c3 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.34 com.epmet epmet-job From 3aaaaec9aba8ab857916d0d6c24efa0976c26efc Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 9 Oct 2020 16:33:55 +0800 Subject: [PATCH 217/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 adb4af8783..c9a1dcab97 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.133 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.134 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 e3a2980759..ae7c2a61f4 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.133 + 0.3.134 data-statistical com.epmet From 201808a4f71f52251365a9e8f0491c22c21aa34d Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 9 Oct 2020 17:45:31 +0800 Subject: [PATCH 218/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 c9a1dcab97..8e6064c97f 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.134 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.135 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 ae7c2a61f4..80e9c9a95c 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.134 + 0.3.135 data-statistical com.epmet From 950bf8e59fb16e44e65cb61c8463e2138ca4f7e0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 10 Oct 2020 10:42:12 +0800 Subject: [PATCH 219/589] =?UTF-8?q?data-stats=20=E7=89=88=E6=9C=AC+1=20=20?= =?UTF-8?q?=20=20=3D>=20=20=20136?= 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 8e6064c97f..756630e802 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.135 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.136 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 80e9c9a95c..544d54cfcf 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.135 + 0.3.136 data-statistical com.epmet From c8a69167ff38ad97779f0f59fdc4e3862dfadb06 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 10 Oct 2020 13:43:41 +0800 Subject: [PATCH 220/589] =?UTF-8?q?data-stats=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7+1=20=20=20=20=3D>=20=20=20137?= 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 756630e802..f38c81b7f6 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.136 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.137 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 544d54cfcf..935c5aa201 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.136 + 0.3.137 data-statistical com.epmet From 891d575b8c9f5a16c1db2a726870b05f8cef9082 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 10 Oct 2020 13:46:26 +0800 Subject: [PATCH 221/589] =?UTF-8?q?data-report=E5=8D=87=E7=BA=A7?= 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 46ccc87e87..ad37c1d3ac 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.99 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.100 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 8305746014..226f0d1bde 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.99 + 0.3.100 data-report-server From ccf86a46afdb586b3fab1dc27c861fbb79bd6689 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 10 Oct 2020 13:58:20 +0800 Subject: [PATCH 222/589] =?UTF-8?q?resi-group=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 3fa7136a33..7f10c628b6 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.67 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.68 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 43552aa943..cdc3e9d9b9 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.67 + 0.3.68 com.epmet resi-group From 142f0f8dc604eda898b4ad2f6ab8a4eee8a3cfb0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 10 Oct 2020 15:02:04 +0800 Subject: [PATCH 223/589] =?UTF-8?q?data-stats=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7+1=20=3D>=20138?= 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 f38c81b7f6..5b937fad0a 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.137 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.138 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 935c5aa201..c335083609 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.137 + 0.3.138 data-statistical com.epmet From 9940f45650cdaaf43d83d9c39b28bce7a2952199 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 10 Oct 2020 15:40:32 +0800 Subject: [PATCH 224/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 5b937fad0a..6d1c95637a 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.138 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.139 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 c335083609..e1b28159f4 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.138 + 0.3.139 data-statistical com.epmet From 067912b38a7152a0bb99cebd68f5f3dedee984f4 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 10 Oct 2020 15:52:39 +0800 Subject: [PATCH 225/589] =?UTF-8?q?data-stats=20=E7=89=88=E6=9C=AC+1=20=20?= =?UTF-8?q?=20=3D>=20140?= 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 6d1c95637a..02f497822f 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.139 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.140 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 e1b28159f4..b5cd6daa2f 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.139 + 0.3.140 data-statistical com.epmet From 35b9284122f4f787615d2cb598af809880d5b75c Mon Sep 17 00:00:00 2001 From: wxz Date: Sat, 10 Oct 2020 16:26:01 +0800 Subject: [PATCH 226/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 819c9b291d..0bfb0974ae 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.137 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.138 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 4017d20b63..fa28cdebaf 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.137 + 0.3.138 com.epmet epmet-user From 6aa200ecb68df2531b4199df69e908bfc17dcfd2 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 10 Oct 2020 17:59:22 +0800 Subject: [PATCH 227/589] =?UTF-8?q?gateway=20=E7=89=88=E6=9C=AC+1=20=20=20?= =?UTF-8?q?=3D>=2044?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 292df0a90d..b0b4e6e3f3 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.43 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.44 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 84018ff064..f7a12e7132 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.43 + 0.3.44 com.epmet epmet-cloud From 895e5385452daedd0851d911764bfeefe3e9849b Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 10 Oct 2020 18:26:55 +0800 Subject: [PATCH 228/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 02f497822f..106f608195 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.140 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.141 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 b5cd6daa2f..24bdac80a4 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.140 + 0.3.141 data-statistical com.epmet From 2936b24f7cf3e2cc11741cf2f1796e806aa750fc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 09:24:14 +0800 Subject: [PATCH 229/589] =?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 --- .../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 ad37c1d3ac..a2f287c15d 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.100 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.101 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 226f0d1bde..888cc4ef71 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.100 + 0.3.101 data-report-server From cfcd1b7aeddaad0309e6a0874fc591c9fbd6a3d0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 09:51:03 +0800 Subject: [PATCH 230/589] =?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 --- .../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 a2f287c15d..2887edcc57 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.101 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.102 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 888cc4ef71..5580574403 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.101 + 0.3.102 data-report-server From 0c0ed4144bd74600f84fe56785661bfdebefaec6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 09:58:38 +0800 Subject: [PATCH 231/589] =?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 --- .../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 2887edcc57..4a8afff88e 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.102 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.103 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 5580574403..e24ee83cf1 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.102 + 0.3.103 data-report-server From 0ba728ad9fb8b0caea2bc51aeb2ea5f0a4ad3bd2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 10:10:21 +0800 Subject: [PATCH 232/589] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= 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 4a8afff88e..414e1ca4eb 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.103 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.104 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 e24ee83cf1..08c985db95 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.103 + 0.3.104 data-report-server From d802090f1bbf3200d33242f2eaa0bc21cfa0a464 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 12 Oct 2020 10:32:37 +0800 Subject: [PATCH 233/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 106f608195..3c06f4d48b 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.141 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.142 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 24bdac80a4..f2a002635c 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.141 + 0.3.142 data-statistical com.epmet From 8efd487b5a906095c883beb214fbcd8036f822a7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 10:42:32 +0800 Subject: [PATCH 234/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= 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 414e1ca4eb..f4f710474c 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.104 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.105 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 08c985db95..7040821348 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.104 + 0.3.105 data-report-server From 73fc09d0112a64b0e7f07f4fa2815530ebca302f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 13:52:01 +0800 Subject: [PATCH 235/589] =?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 --- .../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 f4f710474c..46ccd27359 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.105 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.106 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 7040821348..9dadadfa39 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.105 + 0.3.106 data-report-server From 6b6a5e0180d8f1e3af91a338fe313f6f51adca6a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 14:18:34 +0800 Subject: [PATCH 236/589] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= 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 46ccd27359..3b3b3135b4 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.106 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.107 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 9dadadfa39..45f9cfb39f 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.106 + 0.3.107 data-report-server From 9abe4911e6d3c8ab9e838da61ea9e85ee6c142bf Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 12 Oct 2020 18:25:30 +0800 Subject: [PATCH 237/589] data-stas +1 143 --- .../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 3c06f4d48b..501e1df1ca 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.142 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.143 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 f2a002635c..fe8e1b17e8 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.142 + 0.3.143 data-statistical com.epmet From acffc233ca88ffe290d0bc7530558d06853b3fd5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Oct 2020 08:58:24 +0800 Subject: [PATCH 238/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 501e1df1ca..5776fec958 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.143 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.144 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 fe8e1b17e8..8ac60ec738 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.143 + 0.3.144 data-statistical com.epmet From 99ed5160580837630accf9a9d97c8020c79d984e Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 13 Oct 2020 09:50:00 +0800 Subject: [PATCH 239/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 5776fec958..8fdf4ada42 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.144 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.145 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 8ac60ec738..8712ce81a3 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.144 + 0.3.145 data-statistical com.epmet From 923db9a3860449881bc1f4859085a074a833cac8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Oct 2020 10:24:01 +0800 Subject: [PATCH 240/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 8fdf4ada42..500bce7511 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.145 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.146 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 8712ce81a3..ecfe7df2d8 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.145 + 0.3.146 data-statistical com.epmet From 9e9cc5fcf05fe30afed3229c260f7a11cfd6c1d9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Oct 2020 10:46:39 +0800 Subject: [PATCH 241/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 500bce7511..a5516c99d4 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.146 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.147 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 ecfe7df2d8..1622263aa2 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.146 + 0.3.147 data-statistical com.epmet From ba9d48c300088d3bc120b2477239a3230c81c7c9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 13 Oct 2020 13:51:18 +0800 Subject: [PATCH 242/589] =?UTF-8?q?statistical=E5=8D=87=E7=BA=A7?= 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 a5516c99d4..104c7c7f62 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.147 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.148 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 1622263aa2..7b364dbe4d 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.147 + 0.3.148 data-statistical com.epmet From 7659af244015bdbcfdb8c5efd34c44fa0c5bb110 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 13 Oct 2020 16:08:46 +0800 Subject: [PATCH 243/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 104c7c7f62..b50b33cc06 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.148 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.149 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 7b364dbe4d..e0c420be14 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.148 + 0.3.149 data-statistical com.epmet From f72c2d9fe439a03c5f7fa32d3c441ad2aecb6810 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 13 Oct 2020 16:53:07 +0800 Subject: [PATCH 244/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 b50b33cc06..5bdb614c95 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.149 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.150 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 e0c420be14..d542278578 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.149 + 0.3.150 data-statistical com.epmet From 316bd46b5b50ea9034d8902dcb3a457b4116cd03 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 13 Oct 2020 16:58:45 +0800 Subject: [PATCH 245/589] =?UTF-8?q?statistical=E5=8D=87=E7=BA=A7?= 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 5bdb614c95..cdc324b405 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.150 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.151 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 d542278578..a75fb50f6b 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.150 + 0.3.151 data-statistical com.epmet From ac50e66489250e6fb96e8c5d4292bf2d6c699707 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 13 Oct 2020 17:02:49 +0800 Subject: [PATCH 246/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 cdc324b405..8eacf45ea2 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.151 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.152 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 a75fb50f6b..324b1d0c7c 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.151 + 0.3.152 data-statistical com.epmet From 03863708dfd0a68491bf4025dd4f5306174028af Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 13 Oct 2020 17:29:49 +0800 Subject: [PATCH 247/589] =?UTF-8?q?data-report=E5=8D=87=E7=BA=A7?= 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 3b3b3135b4..bdeb1e586b 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.107 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.108 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 45f9cfb39f..4f6c9efc80 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.107 + 0.3.108 data-report-server From ecc4d22fdd151e5d298ec6e5abc9d6a66b71185f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Oct 2020 17:43:35 +0800 Subject: [PATCH 248/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 8eacf45ea2..eafc3515c1 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.152 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.153 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 324b1d0c7c..fcd6c2c005 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.152 + 0.3.153 data-statistical com.epmet From c12b8fe8f4521e6bd27aebf80722ef6482cfcfea Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 14 Oct 2020 09:00:44 +0800 Subject: [PATCH 249/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 eafc3515c1..e3d227bfd1 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.153 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.154 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 fcd6c2c005..4cbc71b392 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.153 + 0.3.154 data-statistical com.epmet From eeef003643ec25c58250279e7ae8a9fc8ae3a0c0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 14 Oct 2020 10:12:11 +0800 Subject: [PATCH 250/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7-155?= 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 e3d227bfd1..b3ae39074f 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.154 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.155 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 4cbc71b392..567508cd56 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.154 + 0.3.155 data-statistical com.epmet From 2c912d0ccd27bc50ea0e44cc8629d0ff42b8dd42 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 14 Oct 2020 10:53:34 +0800 Subject: [PATCH 251/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 bdeb1e586b..add63a7495 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.108 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.109 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 4f6c9efc80..f9fb3a7284 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.108 + 0.3.109 data-report-server From 96105524e9fe291ac2be96e4ae5dba350465b9e1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 14 Oct 2020 11:13:06 +0800 Subject: [PATCH 252/589] =?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 --- .../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 add63a7495..cb04710b1b 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.109 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.110 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 f9fb3a7284..b8ff5c8dc6 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.109 + 0.3.110 data-report-server From 360d6f6e86dec706bc9f4dd91a4ab0484de82e2f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 14 Oct 2020 13:59:16 +0800 Subject: [PATCH 253/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 b3ae39074f..a267cb1b04 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.155 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.156 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 567508cd56..ea6b05f530 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.155 + 0.3.156 data-statistical com.epmet From 40c3c35e69a4fd76741f997697994ddb00021ce1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 14 Oct 2020 14:07:38 +0800 Subject: [PATCH 254/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report=EF=BC=8Cstatis?= 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 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 cb04710b1b..384ae76df2 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.110 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.111 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 b8ff5c8dc6..9177f7763f 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.110 + 0.3.111 data-report-server 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 a267cb1b04..1b9fe215a7 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.156 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.157 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 ea6b05f530..625d482b73 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.156 + 0.3.157 data-statistical com.epmet From 65caf109f3f812e86238144b3eeb6fa5dd5aec01 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 17:46:57 +0800 Subject: [PATCH 255/589] data-stats +1 -> 158 --- .../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 1b9fe215a7..f722e3ed24 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.157 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.158 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 625d482b73..c6466c1269 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.157 + 0.3.158 data-statistical com.epmet From ce23235c6e98f8f0c5274f409f04268dd5568e06 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 18:02:25 +0800 Subject: [PATCH 256/589] data-stats 159 --- .../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 f722e3ed24..0b15a9b329 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.158 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.159 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 c6466c1269..e06658cddc 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.158 + 0.3.159 data-statistical com.epmet From 89c322fcc773dd02bc70363f3e073f1e1eb9460e Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 18:22:30 +0800 Subject: [PATCH 257/589] data-stats 160 --- .../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 0b15a9b329..bd943a2f9b 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.159 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.160 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 e06658cddc..81235f1d25 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.159 + 0.3.160 data-statistical com.epmet From 1e7557b3d065df1dd88112fc26e2505663256fad Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 18:29:08 +0800 Subject: [PATCH 258/589] data-stats 161 --- .../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 bd943a2f9b..ba89a6985a 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.160 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.161 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 81235f1d25..2d1a5719ca 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.160 + 0.3.161 data-statistical com.epmet From 41e8f807d7e292ebc869ed06ef5017f3275d82e8 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 18:36:37 +0800 Subject: [PATCH 259/589] data-stats 162 --- .../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 ba89a6985a..8dc65653a0 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.161 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.162 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 2d1a5719ca..6578786319 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.161 + 0.3.162 data-statistical com.epmet From b162fb8ded8df3769f88d20b676ed54ecd738d7c Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 18:43:54 +0800 Subject: [PATCH 260/589] data-stats 163 --- .../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 8dc65653a0..2148fd2d2b 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.162 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.163 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 6578786319..9d501cda92 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.162 + 0.3.163 data-statistical com.epmet From dd81afecd9bc371eec42844cd7014a90d36ad544 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 18:51:39 +0800 Subject: [PATCH 261/589] data-stats 164 --- .../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 2148fd2d2b..d7c681a7ea 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.163 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.164 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 9d501cda92..ddbf2b9a55 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.163 + 0.3.164 data-statistical com.epmet From a8f7e88155717b51726dddc3e2874bd441736697 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 14 Oct 2020 19:12:22 +0800 Subject: [PATCH 262/589] data-stats 165 --- .../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 d7c681a7ea..131c69e89d 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.164 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.165 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 ddbf2b9a55..cf07d5497c 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.164 + 0.3.165 data-statistical com.epmet From f76805e8baee5ccd84a22f298e910a9b30b6b38d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 15 Oct 2020 09:39:56 +0800 Subject: [PATCH 263/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 131c69e89d..9c11c1affe 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.165 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.166 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 cf07d5497c..660805f837 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.165 + 0.3.166 data-statistical com.epmet From 4176bda91ef3e4f468ba184e31c0775366789b5f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Oct 2020 10:41:27 +0800 Subject: [PATCH 264/589] =?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 --- .../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 384ae76df2..fc3e55b8f9 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.111 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.112 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 9177f7763f..f1a34e9240 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.111 + 0.3.112 data-report-server From 53c92c7c14127243ba44adff05f08f1d5ea84569 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 15 Oct 2020 13:43:17 +0800 Subject: [PATCH 265/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 9c11c1affe..a7ab634a11 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.166 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.167 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 660805f837..16d6f4c575 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.166 + 0.3.167 data-statistical com.epmet From 95f6d67df12459cf03feba7a493e1fa4fc61e534 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Oct 2020 13:46:15 +0800 Subject: [PATCH 266/589] =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=A0=A1=E9=AA=8C?= 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 fc3e55b8f9..67fad0617f 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.112 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.113 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 f1a34e9240..7f6449b159 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.112 + 0.3.113 data-report-server From f6a3bedbf61e21fc4f59cb6958f1462db823ec52 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Oct 2020 14:23:17 +0800 Subject: [PATCH 267/589] =?UTF-8?q?=E5=90=8C=E7=BA=A7=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9C=88=E5=BA=A6ID=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= 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 67fad0617f..7296fe87ac 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.113 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.114 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 7f6449b159..10440d5c90 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.113 + 0.3.114 data-report-server From 636548a2a53785bb7516251523130424a18e4fef Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 15 Oct 2020 14:28:33 +0800 Subject: [PATCH 268/589] =?UTF-8?q?data-stats=20+1=20=20=20=20=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8A=9E=E7=BB=93?= =?UTF-8?q?=E7=8E=87=20=3D=20=E5=8A=9E=E7=BB=93=E6=95=B0/=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E5=91=A8=E6=9C=9F=E5=86=85=E8=A2=AB=E5=90=B9=E5=93=A8?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= 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 a7ab634a11..ff278f34db 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.167 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.168 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 16d6f4c575..0b9364a4ff 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.167 + 0.3.168 data-statistical com.epmet From 07211f38675858c9d24425c1c5ff0b694a74939f Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 16 Oct 2020 12:38:29 +0800 Subject: [PATCH 269/589] data-stats 169 --- .../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 ff278f34db..dfeb1b0348 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.168 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.169 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 0b9364a4ff..32e81c99a4 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.168 + 0.3.169 data-statistical com.epmet From f09a68a09d559253c0456fd341c5eaa06e5995c8 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 16 Oct 2020 17:00:53 +0800 Subject: [PATCH 270/589] data-stats 170 --- .../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 dfeb1b0348..b8b3408005 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.169 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.170 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 32e81c99a4..08b749dd2f 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.169 + 0.3.170 data-statistical com.epmet From 3c2dc8fd95094139135a256e5eda7c5fb3159e53 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 16 Oct 2020 17:17:22 +0800 Subject: [PATCH 271/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 b8b3408005..2e0c12deb7 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.170 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.171 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 08b749dd2f..a7cbf021aa 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.170 + 0.3.171 data-statistical com.epmet From 1813c2c1a21f22a8e91360afd24ff9571a60ccdd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Oct 2020 10:06:18 +0800 Subject: [PATCH 272/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 2e0c12deb7..fa0631fcc9 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.171 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.172 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 a7cbf021aa..2db6d90ee6 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.171 + 0.3.172 data-statistical com.epmet From 3787b6d231dfbf36dfcc450aa914d161ef61a6e2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Oct 2020 10:49:45 +0800 Subject: [PATCH 273/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 fa0631fcc9..658cddfbbf 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.172 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.173 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 2db6d90ee6..ecf7b08d8c 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.172 + 0.3.173 data-statistical com.epmet From adfa69824957e4aa10d1548a4c66a4a58f5a289f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 19 Oct 2020 12:10:30 +0800 Subject: [PATCH 274/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 658cddfbbf..07aedc1ee5 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.173 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.174 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 ecf7b08d8c..573654abd5 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.173 + 0.3.174 data-statistical com.epmet From 04761aed7c873ff9b2329334c32a344718ae2728 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Oct 2020 14:52:48 +0800 Subject: [PATCH 275/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 07aedc1ee5..effd9b6613 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.174 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.175 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 573654abd5..7e8c59cdc0 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.174 + 0.3.175 data-statistical com.epmet From d640036114bf01570814bbb426a47c237e651ee5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 19 Oct 2020 16:25:57 +0800 Subject: [PATCH 276/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 effd9b6613..e076202f8f 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.175 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.176 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 7e8c59cdc0..917ddcdc4c 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.175 + 0.3.176 data-statistical com.epmet From 2d41c5662a42ea54360ad48bcbfa57198e5c1dec Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Oct 2020 16:42:20 +0800 Subject: [PATCH 277/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 e076202f8f..b69c04faa9 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.176 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.177 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 917ddcdc4c..eccec1b928 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.176 + 0.3.177 data-statistical com.epmet From 95a9687bce29ce5a86c9fc5364b2b64c6480ef0b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 19 Oct 2020 17:08:41 +0800 Subject: [PATCH 278/589] =?UTF-8?q?statis=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 b69c04faa9..4b79607db4 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.177 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.178 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 eccec1b928..81a8c5be0a 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.177 + 0.3.178 data-statistical com.epmet From d904038dd669d48d6613e2082af2feb7e7d42cda Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 19 Oct 2020 17:33:36 +0800 Subject: [PATCH 279/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 4b79607db4..b7db14198c 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.178 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.179 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 81a8c5be0a..7f24aa5fc7 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.178 + 0.3.179 data-statistical com.epmet From 6562ce7a27785cc72c7eb2dc8ae100134cabbeba Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 19 Oct 2020 17:51:55 +0800 Subject: [PATCH 280/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 b7db14198c..707d5f8de4 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.179 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.180 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 7f24aa5fc7..88446c6d8d 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.179 + 0.3.180 data-statistical com.epmet From 5d0bec3088ddf88ecbb20f7dddcf4dcb6cc243da Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Oct 2020 09:10:20 +0800 Subject: [PATCH 281/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis?= 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 707d5f8de4..4a376be6d9 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.180 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.181 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 88446c6d8d..5ad1c227c4 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.180 + 0.3.181 data-statistical com.epmet From 1d9cf292456d084a8870ade206a89c4587a6ef09 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Oct 2020 09:35:14 +0800 Subject: [PATCH 282/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20182?= 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 4a376be6d9..3a1b82a612 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.181 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.182 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 5ad1c227c4..bdec23200f 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.181 + 0.3.182 data-statistical com.epmet From 7a96aef739717c736864659f7fdf4e8d28836a86 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Oct 2020 10:00:15 +0800 Subject: [PATCH 283/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20183?= 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 3a1b82a612..205e81513c 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.182 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.183 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 bdec23200f..9228245f25 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.182 + 0.3.183 data-statistical com.epmet From 3f4ac49309a2a1b91b3f06f26a7b2c0ef448996d Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 20 Oct 2020 15:06:34 +0800 Subject: [PATCH 284/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= 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 205e81513c..45ac27457d 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.183 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.184 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 9228245f25..5c4ffb46c9 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.183 + 0.3.184 data-statistical com.epmet From 8350ef5913dab0a618b034c66e647315efe00b3f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Oct 2020 18:03:21 +0800 Subject: [PATCH 285/589] =?UTF-8?q?=E5=BD=92=E4=B8=80=E5=8C=BA=E9=97=B4=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= 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 45ac27457d..5336d50780 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.184 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.185 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 5c4ffb46c9..6d7ce36719 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.184 + 0.3.185 data-statistical com.epmet From 9950a85b12fde758e89d098fe36054852310ef50 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 21 Oct 2020 10:22:27 +0800 Subject: [PATCH 286/589] =?UTF-8?q?statis=E3=80=81job=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 5336d50780..533e6d677a 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.185 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.186 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 6d7ce36719..7a94b0404e 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.185 + 0.3.186 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 29766d37ab..200452bd44 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.34 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.35 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 231ee590c3..d77285932a 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.34 + 0.3.35 com.epmet epmet-job From bc23ed149cae7305121b739a7bb74b8000ed0e7f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 21 Oct 2020 15:20:34 +0800 Subject: [PATCH 287/589] =?UTF-8?q?statis=E3=80=81job=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 533e6d677a..51cc5de923 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.186 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.187 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 7a94b0404e..b2897a67ff 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.186 + 0.3.187 data-statistical com.epmet From e1834ff0318c2c8862de62d5f16fb4664f3f9961 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 21 Oct 2020 15:21:36 +0800 Subject: [PATCH 288/589] =?UTF-8?q?statis=E3=80=81report=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 7296fe87ac..415d075518 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.114 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.115 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 0135c11d90..980cd089a5 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.114 + 0.3.115 data-report-server From 7c2080595a6de2802b4c21c3c63a2fd0c173ca9e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 21 Oct 2020 16:13:47 +0800 Subject: [PATCH 289/589] =?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 290/589] =?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 1b5b980446fbe245abe3da70b3ec5803092e18a2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 21 Oct 2020 16:34:20 +0800 Subject: [PATCH 291/589] =?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 --- .../gov-org/gov-org-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 70a6aceb54..de2c65b9a4 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.97 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.98 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 8ea95a22bc..7eb641eafb 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.97 + 0.3.98 com.epmet gov-org From f3bd0efcdaeb54941737ba60eb79dbef1ecc4d95 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 22 Oct 2020 11:04:31 +0800 Subject: [PATCH 292/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 702cdbd07e..f406b257e0 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 9cb09ee8e8e6d717c5a73137c19b40f120bd3418 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 22 Oct 2020 11:08:47 +0800 Subject: [PATCH 293/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 def823e4b2..3da0232d6b 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.116 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.117 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 f406b257e0..02bf2e9240 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.116 + 0.3.117 data-report-server From cbed355f6cce0dff0597354132cabba7cb95391c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 22 Oct 2020 13:50:58 +0800 Subject: [PATCH 294/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report=20118?= 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 3da0232d6b..5b95c762d4 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.117 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.118 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 02bf2e9240..d833a1473f 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.117 + 0.3.118 data-report-server From 68cf48a490f85e3601b2934c4916622ef801b2f0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 22 Oct 2020 14:05:09 +0800 Subject: [PATCH 295/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?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 --- .../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 77aa8fdaf5..e2c5d5e012 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.188 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.189 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 d0e5b00d4c..11aae6c319 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.188 + 0.3.189 data-statistical com.epmet From fc378bd1fa490099a03ced1ee3ab11ea58ceb7fb Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 22 Oct 2020 16:02:33 +0800 Subject: [PATCH 296/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20190?= 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 e2c5d5e012..68bd49564e 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.189 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.190 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 11aae6c319..6e733455bf 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.189 + 0.3.190 data-statistical com.epmet From 32bb21650423d60fe6252a40137f86052e98881e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 09:42:59 +0800 Subject: [PATCH 297/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 5b95c762d4..f7428425f9 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.118 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.119 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 d833a1473f..2188751311 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.118 + 0.3.119 data-report-server From 61a175c9f945f6bb92c775743c41792dd9f4105f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 09:52:21 +0800 Subject: [PATCH 298/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index da8b6a8229..720f60d745 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.26 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.27 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 42682b64db..e88c490864 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.26 + 0.3.27 com.epmet epmet-common-service From d529ed613111bf25c64ceb985976960914d9a599 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 23 Oct 2020 10:03:26 +0800 Subject: [PATCH 299/589] =?UTF-8?q?user=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 0bfb0974ae..bbcb9e2417 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.138 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.139 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 fa28cdebaf..d2a0cab2cb 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.138 + 0.3.139 com.epmet epmet-user From c24c9189efbb8fadf7ecfad14d3282504c680e71 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 11:05:23 +0800 Subject: [PATCH 300/589] =?UTF-8?q?report,project=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 f7428425f9..e12d13823f 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.119 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.120 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 2188751311..b88ee24263 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.119 + 0.3.120 data-report-server diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index d424658532..f6b9f0b394 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.50 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.51 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 37a8b716c3..1f6fab724e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.50 + 0.3.51 gov-project com.epmet From 94732b15961774af9c3d4357bf6827e31f8d4445 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 11:13:13 +0800 Subject: [PATCH 301/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 e12d13823f..37c0cd8758 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.120 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.121 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 b88ee24263..0d64e0472e 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.120 + 0.3.121 data-report-server From 061140eb378daf9279d8bc19dfb6d67790ebe728 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 23 Oct 2020 13:51:15 +0800 Subject: [PATCH 302/589] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=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-message-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index be9f9a74b2..fca864f866 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.29 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.30 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 394ad79511..2742c226fa 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.30 com.epmet epmet-message From a94a80731946332e739c60c0c294790b3da18ea7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 13:52:01 +0800 Subject: [PATCH 303/589] =?UTF-8?q?report,common-service=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 +- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 37c0cd8758..f1cf6f17b3 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.121 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.122 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 0d64e0472e..f8cc976926 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.121 + 0.3.122 data-report-server diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 720f60d745..216a711e9f 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.27 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.28 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index e88c490864..2990d3bd5f 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.27 + 0.3.28 com.epmet epmet-common-service From 3821adec241e4bfac1bca2975d9e9749ad42f630 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 23 Oct 2020 14:38:52 +0800 Subject: [PATCH 304/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index fca864f866..05c7e635e3 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.31 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 16ebfb8fbe..6a93633d7b 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet epmet-message From 549333b8d0af32d69aa8fa6d193c3b5bbb43bb4c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 14:50:38 +0800 Subject: [PATCH 305/589] =?UTF-8?q?report,project=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 f1cf6f17b3..6f450bdf24 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.122 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.123 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 f8cc976926..477d4e32f9 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.122 + 0.3.123 data-report-server diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index f6b9f0b394..90d1494ba9 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.51 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.52 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 1f6fab724e..93c1db8fe9 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.51 + 0.3.52 gov-project com.epmet From cc660013d83688ed07fae6b019a57652eb775d6b Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 23 Oct 2020 15:10:13 +0800 Subject: [PATCH 306/589] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index b0b4e6e3f3..27b22e5d4a 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.44 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.45 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index f7a12e7132..ad2a59616e 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.44 + 0.3.45 com.epmet epmet-cloud From 31d1fa36c694d8cede7f5a52f121e2e6b459f065 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 15:13:54 +0800 Subject: [PATCH 307/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 6f450bdf24..b6324af412 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.123 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.124 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 477d4e32f9..d6ef0be372 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.123 + 0.3.124 data-report-server From b37fbbc981e517de55f5ebf50bb8208ce18847fa Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Oct 2020 15:17:39 +0800 Subject: [PATCH 308/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20191?= 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 68bd49564e..d0390a09ca 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.190 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.191 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 6e733455bf..a60f7301bf 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.190 + 0.3.191 data-statistical com.epmet From 4fef90b323ce8f4a80f8e985d6cd74aaec90bb87 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Oct 2020 15:30:05 +0800 Subject: [PATCH 309/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20192?= 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 d0390a09ca..105306439a 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.191 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.192 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 a60f7301bf..e27d2ca57d 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.191 + 0.3.192 data-statistical com.epmet From 27b024e1090c79dfd6b9f70b50d11cffa58e6717 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 15:55:27 +0800 Subject: [PATCH 310/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 b6324af412..9225b605fb 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.124 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.125 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 d6ef0be372..505d30d4fe 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.124 + 0.3.125 data-report-server From 774fdd3e37ddd2537a681322b21cee9127106931 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Oct 2020 16:11:23 +0800 Subject: [PATCH 311/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis,report?= 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 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 9225b605fb..98c1c6e647 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.125 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.126 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 505d30d4fe..0f7b2f4961 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.125 + 0.3.126 data-report-server 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 105306439a..d6b67b77e9 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.192 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.193 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 e27d2ca57d..3dc0867856 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.192 + 0.3.193 data-statistical com.epmet From 86934c1e23c9fece106eac6afd9b7debf105d54f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 16:36:24 +0800 Subject: [PATCH 312/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 98c1c6e647..84745dcfc5 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.126 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.127 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 0f7b2f4961..35df4bc6ec 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.126 + 0.3.127 data-report-server From 7c920f2a88773be9d3160bfc78837ce32ded66c3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Oct 2020 17:08:00 +0800 Subject: [PATCH 313/589] =?UTF-8?q?report=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= 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 84745dcfc5..496d71e192 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.127 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.128 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 35df4bc6ec..10c4e2546c 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.127 + 0.3.128 data-report-server From 9e9c21f5343f9ad50a3199c38408ae3483121f42 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Oct 2020 17:31:08 +0800 Subject: [PATCH 314/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report=20129?= 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 496d71e192..adf0ee9966 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.128 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.129 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 10c4e2546c..87924c5094 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.128 + 0.3.129 data-report-server From 8e56e562106866300ad4137d03e2bd98b36b96c0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 26 Oct 2020 10:16:04 +0800 Subject: [PATCH 315/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 adf0ee9966..fbc1a8f3a9 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.129 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.130 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 87924c5094..d2f002d6b8 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.129 + 0.3.130 data-report-server From cf983f6696d3f4cae79e4c8aa6763ff0fada111e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 26 Oct 2020 10:21:44 +0800 Subject: [PATCH 316/589] =?UTF-8?q?report,project=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= 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 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 fbc1a8f3a9..efeaf0f03b 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.130 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.131 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 d2f002d6b8..d5bc32c76a 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.130 + 0.3.131 data-report-server diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 90d1494ba9..96ae4961d4 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.52 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.53 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 93c1db8fe9..539bee7a7c 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.52 + 0.3.53 gov-project com.epmet From 19ae3760b7c786fb918bc2df0aa55567fb2e4561 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 26 Oct 2020 10:58:26 +0800 Subject: [PATCH 317/589] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= 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 efeaf0f03b..8a9c643cd5 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.131 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.132 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 d5bc32c76a..6e410e26ad 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.131 + 0.3.132 data-report-server From a73eeee6a2c8af6757c81a95456fb2509c2df2fa Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 26 Oct 2020 11:00:56 +0800 Subject: [PATCH 318/589] =?UTF-8?q?oss=E6=B5=8B=E8=AF=95=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml index 2fa7b84b34..d99d59a73c 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-dev # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 From 752b5fa889b9f060b322a1c9bfabffbd29f07fbc Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 26 Oct 2020 11:08:34 +0800 Subject: [PATCH 319/589] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml | 2 +- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-activiti-server/deploy/docker-compose-dev.yml | 2 +- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml | 1 - .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-dev.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- .../oper-access-server/deploy/docker-compose-dev.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-dev.yml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-dev.yml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-dev.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- 33 files changed, 32 insertions(+), 33 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index f86422e850..408ecd1fa8 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.15 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:version_placeholder ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 0ee4421f6f..1239aa8ac7 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.69 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index ad7aa38516..45db293a98 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.35 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 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 8be97cd85a..a98722271e 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.36 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:version_placeholder ports: - "8109:8109" network_mode: host # 使用现有网络 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 f9a01abc70..818776c83a 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.48 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml index d2925901c9..e79e2ccfc3 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-activiti-server:0.3.0 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-activiti-server:version_placeholder ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index e575112640..691e0700f5 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.16 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index 7792a04b31..2b3437321d 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:0.0.6 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 53e5098667..c9324e7eaa 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.52 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index c9999c47d8..de0601f085 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 5ab5ecb83d..846f37b811 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml index d99d59a73c..eda91a8746 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml @@ -2,7 +2,6 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-dev -# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:version_placeholder ports: - "8083:8083" diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index f9c7734508..cc0bd873d0 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.40 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index c35cda57a7..535e927003 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.141 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 75fbb038c9..93bb414efe 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.40 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:version_placeholder ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index f9e02900e6..42030e9322 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:version_placeholder ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 1f112f1abb..f953f16888 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.52 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 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 3bc86de1dc..11c377e5dc 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.33 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:version_placeholder ports: - "8098:8098" network_mode: host # 使用现有网络 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 902ce5e8d0..abdd0d45e1 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.88 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:version_placeholder ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 1d61afd8af..2293705079 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.43 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:version_placeholder ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index b301615811..be773bc448 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.68 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml index c2fe2f3963..94f4886466 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.18 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:version_placeholder ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index ae71928e4e..603196b2b6 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.70 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:version_placeholder ports: - "8090:8090" network_mode: host # 使用现有网络 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 b0df052225..9d936ebb6b 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.47 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:version_placeholder ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 7a0d7418f8..dc0e3a442f 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.66 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:version_placeholder ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index 902a0e4bb6..a487c1147c 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:version_placeholder ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index b85358a70e..3e87863bb2 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.22 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml index e0cdb9b16c..2f8b97a10b 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.16 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 57e2434372..1ef428be1a 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.38 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:version_placeholder ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 680f45f751..9013f7458b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.56 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml index b92e25f3c6..99ab9465a8 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.7 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml index 7593b66a08..4e86ab5e89 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.24 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 0a8be8c147..50bed534ed 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.124 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:version_placeholder ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 14ed396fc936a44d6ff4f1aab1fac2ca4aec95b6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 26 Oct 2020 15:51:12 +0800 Subject: [PATCH 320/589] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/impl/ProjectServiceImpl.java | 44 ++++++------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 7ab37faca0..cdff4bf691 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java @@ -8,12 +8,6 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.DataSourceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.datareport.dao.project.ProjectDao; -import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService; -import com.epmet.dto.form.LoginUserDetailsFormDTO; -import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.project.ProjectDao; import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService; import com.epmet.datareport.service.project.ProjectService; @@ -21,20 +15,10 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.form.ProcessListFormDTO; import com.epmet.dto.form.SubAgencyFormDTO; -import com.epmet.dto.result.GridByStaffResultDTO; -import com.epmet.dto.form.ProcessListFormDTO; -import com.epmet.dto.result.LoginUserDetailsResultDTO; -import com.epmet.dto.result.SubAgencyResultDTO; -import com.epmet.dto.result.SubListResultDTO; -import com.epmet.dto.result.ProcessAndCurrentDeptResultDTO; -import com.epmet.dto.result.ProcesslistResultDTO; import com.epmet.dto.result.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.GovProjectOpenFeignClient; -import com.epmet.datareport.service.project.ProjectService; -import com.epmet.feign.GovProjectOpenFeignClient; -import com.epmet.module.project.service.ProjectService; import com.epmet.project.constant.ProjectConstant; import com.epmet.project.dto.FactAgencyProjectDailyDTO; import com.epmet.project.dto.form.DifficultyRankFormDTO; @@ -204,7 +188,7 @@ public class ProjectServiceImpl implements ProjectService { } /** - * @Description 项目详情 + * @Description 项目详情 * @Param processListFormDTO * @author zxc * @date 2020/10/23 10:33 上午 @@ -258,9 +242,9 @@ public class ProjectServiceImpl implements ProjectService { } /** + * @return * @Description 难点赌点-获取组织下拉框 * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614 - * @return * @author jiangyy * @date 2020.10.19 16:38 **/ @@ -270,7 +254,7 @@ public class ProjectServiceImpl implements ProjectService { //1、根据token获取本级agencyId、获取userId String agencyId = getLoginUserDetails(tokenDto); - String userId=getLoginUserUserId(tokenDto); + String userId = getLoginUserUserId(tokenDto); //2、获取本级组织机构 Result customerAgencyDTO = govOrgOpenFeignClient.getAgencyById(agencyId); @@ -282,11 +266,11 @@ public class ProjectServiceImpl implements ProjectService { //3、获取下一级组织机构\网格 - if( customerAgencyDTO.getData().getLevel() == "community" ){ + if (customerAgencyDTO.getData().getLevel() == "community") { //取下级网格 Result> gridListResult = govOrgOpenFeignClient.listGridsbystaffid(userId); List gridList = gridListResult.getData(); - for(int i=0;i SubAgencyResultDTO = govOrgOpenFeignClient.subAgencyList(form); List subAgencyList = SubAgencyResultDTO.getData().getAgencyList(); - for(int i=0;i(); + if (null == resultList) return new ArrayList<>(); return resultList; } /** - * @Description 难点赌点-耗时最长|涉及部门最多|处理次数 - * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614 * @param param * @return + * @Description 难点赌点-耗时最长|涉及部门最多|处理次数 + * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614 * @author jiangyy * @date 2020.10.19 16:38 **/ - @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) + @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) @Override public List getDifficultyRank(DifficultyRankFormDTO param) { List result = projectDao.difficultyRank(param); - for (int i = 0; i < result.size (); i ++){ - List imgUrlList ; - imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId()) ; + for (int i = 0; i < result.size(); i++) { + List imgUrlList; + imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId()); result.get(i).setImgUrlList(imgUrlList); } - if(null == result) return new ArrayList<>(); + if (null == result) return new ArrayList<>(); return result; } From 8d00b1362f8deab37cc893e85a73cd8fbab772ff Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 27 Oct 2020 10:54:56 +0800 Subject: [PATCH 321/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9compose-test.yml?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml | 2 +- epmet-auth/deploy/docker-compose-test.yml | 2 +- epmet-gateway/deploy/docker-compose-test.yml | 2 +- .../data-report-server/deploy/docker-compose-test.yml | 2 +- .../data-statistical-server/deploy/docker-compose-test.yml | 2 +- .../common-service-server/deploy/docker-compose-test.yml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-test.yml | 2 +- .../epmet-message-server/deploy/docker-compose-test.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml | 2 +- .../epmet-point-server/deploy/docker-compose-test.yml | 2 +- .../epmet-third-server/deploy/docker-compose-test.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-test.yml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-test.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-test.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-test.yml | 2 +- .../gov-project-server/deploy/docker-compose-test.yml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-test.yml | 2 +- .../oper-access-server/deploy/docker-compose-test.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml | 2 +- .../oper-customize-server/deploy/docker-compose-test.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-test.yml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-test.yml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-test.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-test.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-test.yml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-test.yml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml index 575e1267c8..29673cca9c 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.15 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:version_placeholder ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index e4aab166ec..521eea2a30 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/epmet-auth/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.68 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index b0b7024f33..5a88a1e499 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/epmet-gateway/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.30 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml index 8917a4f9e9..2b55a26867 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.36 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index 0f4d72c3e4..5beb53c90f 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.47 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml index c3ed2186f6..058b976195 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml index 90c7053d1f..922073b042 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-ext-server:0.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index e259e170a4..98e9560135 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.52 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index a245199249..b0ef2bf2f9 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.23 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml index 7630cefa81..ad84863301 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.27 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml index 3a7181f4a8..f4abefb2dd 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-test # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index a4cc8a4af1..c8224eba1a 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.40 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml index 13c5787cf7..2127189ea7 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.132 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml index b7e4bcfdf0..e28e5d30f0 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.38 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:version_placeholder ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml index e01844b7fb..29ad279725 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:version_placeholder ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml index 731ed393a6..aa986c7fa8 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.52 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml index 265d79c930..3f5da9911a 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:version_placeholder ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index d8a3a119a0..8e81106bf9 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:version_placeholder ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml index d7bf5d6939..d6c9360982 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.39 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:version_placeholder ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 85cace2d57..7ab0900635 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.67 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml index 0ef28f8ed5..286203506d 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.15 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:version_placeholder ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml index f0c305d782..80a237aefb 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.64 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:version_placeholder ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml index ff15600fc8..bff06f7016 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.25 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:version_placeholder ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml index 73a38f0279..c53fed3810 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.66 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:version_placeholder ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml index c4a3d796f0..c37a42bcfe 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.20 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:version_placeholder ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml index 6d675b03b8..8da80caf78 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml index 754c7d9398..a2da44bf77 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.16 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml index 2fa05668ea..9545a3feb3 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.38 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:version_placeholder ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index 8ca40ddf75..30f7977dae 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.56 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml index d37cc30473..6baa2c7be4 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-voice-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml index 37c53b9557..49ce30a8c1 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index eb18d181c1..d1d7ce6667 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.118 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:version_placeholder ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 46630de7beec3d9af3df21dedf87a6809b467b3d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 28 Oct 2020 09:05:42 +0800 Subject: [PATCH 322/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/BasicInfoResultDTO.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) rename {epmet-module/gov-org/gov-org-client => epmet-user/epmet-user-client}/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java (86%) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java similarity index 86% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java index 1796a3302f..2877fc47ed 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java @@ -4,20 +4,17 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.List; /** - * @author zhaoqifeng + * @author sun * @dscription - * @date 2020/5/22 16:52 */ -@NoArgsConstructor @Data public class BasicInfoResultDTO implements Serializable { private static final long serialVersionUID = 8987281818368677411L; /** - * 工作人员id,后台userId + * 工作人员id */ private String staffId; /** From 069fe58d1195d1146e84b822ada7b6a5d565c75d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 29 Oct 2020 13:35:42 +0800 Subject: [PATCH 323/589] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/WxmpMessageServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index b555815d86..e6544c60f2 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -149,7 +149,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { throw new WxSubscribeException("openId获取失败", "", ""); } - //获取accessToken + /*//获取accessToken String clientTypeRedis = null; if (WxmpMessageConstant.RESI.equals(msg.getClientType())) { clientTypeRedis = WxmpMessageConstant.RESI; @@ -167,6 +167,13 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { String accessToken = (String) authorizerRefreshToken.get(WxmpMessageConstant.AUTHORIZER_ACCESS_TOKEN); if (StringUtils.isBlank(accessToken)) { throw new WxSubscribeException("accessToken获取失败", "", openId); + }*/ + String accessToken = ""; + if("resi".equals(clientType)){ + accessToken = "38_DhE3GSxKwJnUmh8tWKvIgczp-P_hHK8mpRlPkAh0z5slTuuJHtzLUa35NyhjUI4v-8A_VnOKGkuTSsG8vnB8Cv3vmctzf7wxrwGnhJ2dgbzfZ-yy7PHP5fTrwBiwi-48RPpjorrC39YyamZsKKPgADDSSX"; + } + if("gov".equals(clientType)){ + accessToken = "38_9b_QK0ZsjJzTUn8pvXWBbSH2GYLZtobfJ2et1PVVEzDmBuU1pX6DZ9abHP1FDzakGxTNJboFgqR6bugTL2fqB1wIHgnlMcEzL48xo5J-s1IoDGgPZ-6LVcfigpTCOuJYFQrOcrcStcvfm1K0ETGgAMDIXK"; } //获取模板id From e3ec2c9ffbc61472ea0ce6ff0a364a18848ac0b7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 29 Oct 2020 14:05:54 +0800 Subject: [PATCH 324/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxmpMessageServiceImpl.java | 31 +++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index e6544c60f2..0143d4a5b4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -48,7 +48,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -149,7 +148,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { throw new WxSubscribeException("openId获取失败", "", ""); } - /*//获取accessToken + //获取accessToken String clientTypeRedis = null; if (WxmpMessageConstant.RESI.equals(msg.getClientType())) { clientTypeRedis = WxmpMessageConstant.RESI; @@ -167,13 +166,6 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { String accessToken = (String) authorizerRefreshToken.get(WxmpMessageConstant.AUTHORIZER_ACCESS_TOKEN); if (StringUtils.isBlank(accessToken)) { throw new WxSubscribeException("accessToken获取失败", "", openId); - }*/ - String accessToken = ""; - if("resi".equals(clientType)){ - accessToken = "38_DhE3GSxKwJnUmh8tWKvIgczp-P_hHK8mpRlPkAh0z5slTuuJHtzLUa35NyhjUI4v-8A_VnOKGkuTSsG8vnB8Cv3vmctzf7wxrwGnhJ2dgbzfZ-yy7PHP5fTrwBiwi-48RPpjorrC39YyamZsKKPgADDSSX"; - } - if("gov".equals(clientType)){ - accessToken = "38_9b_QK0ZsjJzTUn8pvXWBbSH2GYLZtobfJ2et1PVVEzDmBuU1pX6DZ9abHP1FDzakGxTNJboFgqR6bugTL2fqB1wIHgnlMcEzL48xo5J-s1IoDGgPZ-6LVcfigpTCOuJYFQrOcrcStcvfm1K0ETGgAMDIXK"; } //获取模板id @@ -360,15 +352,8 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { } List resultList = (List) mapToResult.getData(); return resultList; - /*List resultList = (List) mapToResult.getData(); - List list = new ArrayList<>(); - //必须转换 - for(Object f:resultList){ - JSONObject json = JSON.parseObject(f.toString()); - CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class); - list.add(ff); - } - return list;*/ + //List list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class); + //return list; } /** @@ -389,14 +374,8 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { logger.error("调用epmet_third服务获取客户小程序消息订阅模板数据失败"); throw new RenException(mapToResult.getCode()); } - List resultList = (List) mapToResult.getData(); - List list = new ArrayList<>(); - //必须转换 - for(Object f:resultList){ - JSONObject json = JSON.parseObject(f.toString()); - CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class); - list.add(ff); - } + List resultList = (List) mapToResult.getData(); + List list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class); return list; } From 3b6e1d829eff4e2120df68166e75532c1b6027fd Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 29 Oct 2020 14:11:20 +0800 Subject: [PATCH 325/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxmpMessageServiceImpl.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index 0143d4a5b4..b555815d86 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -48,6 +48,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -352,8 +353,15 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { } List resultList = (List) mapToResult.getData(); return resultList; - //List list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class); - //return list; + /*List resultList = (List) mapToResult.getData(); + List list = new ArrayList<>(); + //必须转换 + for(Object f:resultList){ + JSONObject json = JSON.parseObject(f.toString()); + CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class); + list.add(ff); + } + return list;*/ } /** @@ -374,8 +382,14 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { logger.error("调用epmet_third服务获取客户小程序消息订阅模板数据失败"); throw new RenException(mapToResult.getCode()); } - List resultList = (List) mapToResult.getData(); - List list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class); + List resultList = (List) mapToResult.getData(); + List list = new ArrayList<>(); + //必须转换 + for(Object f:resultList){ + JSONObject json = JSON.parseObject(f.toString()); + CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class); + list.add(ff); + } return list; } From 84fae44a1e52884c762fc796b5a8c65819cf18cc Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 3 Nov 2020 16:05:58 +0800 Subject: [PATCH 326/589] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91=E5=86=85=E5=AE=B9=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiGroupServiceImpl.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) 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 e1121d6c9d..f237d4ae7c 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 @@ -364,7 +364,13 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Mon, 16 Nov 2020 11:04:47 +0800 Subject: [PATCH 327/589] oss --- .../src/main/java/com/epmet/feign/OssFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java index d4c6cb170c..edbe7b90ca 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java @@ -45,7 +45,7 @@ public interface OssFeignClient { @PostMapping(value ="oss/file/uploadqrcode", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) Result uploadQrCode(@RequestPart(value = "file") MultipartFile file); - @PostMapping(value ="oss/file/uploadbytes", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value ="oss/file/uploadbytes") Result uploadBytes(@RequestBody UploadBytesFormDTO dto); From 810c6bba67a32bd39ef12cfedb81af1b79c150de Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 16 Nov 2020 11:11:45 +0800 Subject: [PATCH 328/589] oss --- .../src/main/java/com/epmet/feign/OssFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java index edbe7b90ca..39bafa013d 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java @@ -46,7 +46,7 @@ public interface OssFeignClient { Result uploadQrCode(@RequestPart(value = "file") MultipartFile file); @PostMapping(value ="oss/file/uploadbytes") - Result uploadBytes(@RequestBody UploadBytesFormDTO dto); + Result uploadBytes(UploadBytesFormDTO dto); @Configuration From 0eb2e6417e34922850d48186f06ae7f4cfda89c3 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 16 Nov 2020 11:26:51 +0800 Subject: [PATCH 329/589] oss --- .../src/main/java/com/epmet/feign/OssFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java index 39bafa013d..a2cee09765 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java @@ -45,8 +45,8 @@ public interface OssFeignClient { @PostMapping(value ="oss/file/uploadqrcode", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) Result uploadQrCode(@RequestPart(value = "file") MultipartFile file); - @PostMapping(value ="oss/file/uploadbytes") - Result uploadBytes(UploadBytesFormDTO dto); + @PostMapping(value ="oss/file/uploadbytes", consumes = MediaType.APPLICATION_JSON_VALUE) + Result uploadBytes(@RequestBody UploadBytesFormDTO dto); @Configuration From c196afc2cf230f0e799376d0f44992906ef75d22 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 17 Nov 2020 16:16:01 +0800 Subject: [PATCH 330/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) 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 5c7ea0a741..9bb215495e 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 @@ -162,8 +162,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { From 8979c301d01fdf6de573fe0e220b9dff2c649127 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 20 Nov 2020 11:01:13 +0800 Subject: [PATCH 331/589] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index c3523ba490..62a36931cd 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -139,7 +139,6 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("resi/group/topic/myparttopic") Result selectMyPartTopic(@RequestBody MyPartIssueFormDTO myPartIssueFormDTO); -} /** * @Description 待审核||已驳回 申请详情 @@ -149,4 +148,4 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("resi/group/groupissue/applicationdetail") Result applicationDetail(@RequestBody ApplicationDetailFormDTO applicationDetailFormDTO); - } +} From 1a788b6b31cbf6ee010565d38e030ed5e1357706 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 20 Nov 2020 15:31:20 +0800 Subject: [PATCH 332/589] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/feign/ResiGroupOpenFeignClient.java | 17 ----------------- .../ResiGroupOpenFeignClientFallback.java | 4 ---- .../com/epmet/modules/utils/ModuleConstant.java | 4 ---- .../epmet/feign/EpmetUserOpenFeignClient.java | 9 --------- .../EpmetUserOpenFeignClientFallback.java | 5 ----- 5 files changed, 39 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index be5b0c1b62..ae5a202988 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -115,23 +115,6 @@ public interface ResiGroupOpenFeignClient { @PostMapping("/resi/group/group/gov-audit-edit") Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param); - - /** - * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合 - * @author sun - */ - @PostMapping(value = "/resi/group/comment/topictoissuelist") - Result> topicToIssueList(MyPartProjectsFormDTO formDTO); - - /** - * @Description 查询话题所属小组名 - * @Param groupInfoFormDTO - * @author zxc - * @date 2020/11/11 1:36 下午 - */ - @PostMapping("resi/group/group/groupinfo") - Result> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO); - /** * @Description 个人中心-我参与过的话题 * @param param diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 701a291f08..ea2d09922b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -75,10 +75,6 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govAuditEdit", param); } - @Override - public Result> topicToIssueList(MyPartProjectsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicToIssueList", formDTO); - } @Override public Result> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectGroupInfo", groupInfoFormDTO); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index 7e634e016e..7fec6adb3f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -358,8 +358,4 @@ public interface ModuleConstant extends Constant { * 群邀请二维码跳转页面 */ String CODE_INVITE_PAGE = "pages/group/group/invitation/invitation"; - - String HIDDEN_TOPIC_REASON_PREFIX = "话题已屏蔽："; - - String CREATE_ISSUE_ERROR = "创建议题失败"; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 24ee23c8c2..5d24564ae9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -402,15 +402,6 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo") Result getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO); - /** - * @Description 根据角色key查询具有该key的所有角色列表 - * @return - * @author wxz - * @date 2020.11.17 16:20 - */ - @PostMapping("/epmetuser/govstaffrole/list-roles-by-rolekey/{role-key}") - Result> listRolesByRoleKey(@PathVariable("role-key") String roleKey); - /** * @Description 个人中心-我的建议列表 * @param dto diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index e980430918..ec8c7b4efc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -278,11 +278,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO); } - @Override - public Result> listRolesByRoleKey(String roleKey) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey); - } - @Override public Result> myAdviceList(MyAdviceListFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", dto); From 9c160e329073c017bff480d2319664a31fa0230a Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 20 Nov 2020 16:00:48 +0800 Subject: [PATCH 333/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/feign/ResiGroupOpenFeignClient.java | 50 ++----------------- .../ResiGroupOpenFeignClientFallback.java | 33 +----------- .../group/controller/ResiGroupController.java | 14 ------ .../group/service/ResiGroupService.java | 9 ---- .../service/impl/ResiGroupServiceImpl.java | 5 -- 5 files changed, 5 insertions(+), 106 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index ddc95f4925..cf7090528a 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -1,18 +1,11 @@ package com.epmet.resi.group.feign; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO; -import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; -import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; -import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO; -import org.springframework.cloud.openfeign.FeignClient; - import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; -import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO; +import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO; +import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; +import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO; import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO; import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO; @@ -23,38 +16,11 @@ import com.epmet.resi.group.dto.topic.result.MyCreateTopicsResultDTO; import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO; import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO; -import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; -import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO; -import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; -import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import org.springframework.cloud.openfeign.FeignClient; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -68,16 +34,6 @@ import java.util.List; //@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class,url = "localhost:8095") public interface ResiGroupOpenFeignClient { - /** - * @Description 创建群组二维码 - * @param dto - * @return com.epmet.commons.tools.utils.Result - * @Author liushaowen - * @Date 2020/11/13 16:33 - */ - @PostMapping(value = "/resi/group/resigroupcode/creategroupcode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result createGroupCode(@RequestBody CreateGroupCodeFormDTO dto); - /** * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合 * @author sun diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 438e49b3f7..bb711ad29d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -3,24 +3,10 @@ package com.epmet.resi.group.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.resi.group.dto.group.form.CommonGridAndPageFormDTO; -import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; -import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO; +import com.epmet.resi.group.dto.group.form.*; +import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO; import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO; -import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO; import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO; import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO; @@ -28,10 +14,6 @@ import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO; import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO; import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; @@ -47,17 +29,6 @@ import java.util.List; */ @Component public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClient { - /** - * @param dto - * @return com.epmet.commons.tools.utils.Result - * @Description 创建群组二维码 - * @Author liushaowen - * @Date 2020/11/13 16:33 - */ - @Override - public Result createGroupCode(CreateGroupCodeFormDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "createGroupCode", dto); - } @Override public Result> topicToIssueList(MyPartProjectsFormDTO formDTO) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 714b2fee5f..4d772e0c90 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -426,20 +426,6 @@ public class ResiGroupController { return new Result(); } - - /** - * @param formDTO - * @author yinzuomei - * @description 组长开启/关闭入群审核 - * @Date 2020/11/17 14:18 - **/ - @PostMapping("editauditswitch") - public Result editAuditSwitch(@RequestBody EditAuditSwitchFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO,EditAuditSwitchFormDTO.AddUserShowGroup.class); - resiGroupService.editAuditSwitch(formDTO); - return new Result(); - } - /** * @Description 查询话题所属小组名 * @Param groupInfoFormDTO diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 9ce03e5ee3..e064e35424 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -327,15 +327,6 @@ public interface ResiGroupService extends BaseService { */ void auditEdit(GroupEditionAuditFormDTO param); - /** - * @return void - * @param formDTO - * @author yinzuomei - * @description 组长开启/关闭入群审核 - * @Date 2020/11/17 14:18 - **/ - void editAuditSwitch(EditAuditSwitchFormDTO formDTO); - /** * @Description 查询话题所属小组名 * @Param groupInfoFormDTO 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 b74efa6bb7..d9cd61d880 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 @@ -164,11 +164,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Mon, 30 Nov 2020 11:13:18 +0800 Subject: [PATCH 334/589] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E6=B5=8B=E8=AF=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-lb-test/Dockerfile | 11 +++ epmet-lb-test/deploy/docker-compose-dev.yml | 18 +++++ epmet-lb-test/pom.xml | 47 +++++++++++++ .../com/epmet/lbtest/LoadBalancerApp.java | 11 +++ .../epmet/lbtest/controller/LbController.java | 19 ++++++ .../src/main/resources/bootstrap.yml | 68 +++++++++++++++++++ pom.xml | 1 + 7 files changed, 175 insertions(+) create mode 100644 epmet-lb-test/Dockerfile create mode 100644 epmet-lb-test/deploy/docker-compose-dev.yml create mode 100644 epmet-lb-test/pom.xml create mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java create mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java create mode 100644 epmet-lb-test/src/main/resources/bootstrap.yml diff --git a/epmet-lb-test/Dockerfile b/epmet-lb-test/Dockerfile new file mode 100644 index 0000000000..6477355119 --- /dev/null +++ b/epmet-lb-test/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./lb-test.jar + +EXPOSE 9999 + +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-lb-test/deploy/docker-compose-dev.yml b/epmet-lb-test/deploy/docker-compose-dev.yml new file mode 100644 index 0000000000..0e6ef9657b --- /dev/null +++ b/epmet-lb-test/deploy/docker-compose-dev.yml @@ -0,0 +1,18 @@ +version: "3.7" +services: + lb-test-server: + container_name: lb-test-server-dev + image: 192.168.1.130:10080/epmet-cloud-dev/lb-test-server:version_placeholder + ports: + - "9999:9999" + network_mode: host # 不会创建新的网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./lb-test.jar" + restart: "unless-stopped" + deploy: + resources: + limits: + cpus: '0.1' + memory: 300M \ No newline at end of file diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml new file mode 100644 index 0000000000..ff64643728 --- /dev/null +++ b/epmet-lb-test/pom.xml @@ -0,0 +1,47 @@ + + + + epmet-cloud + com.epmet + 2.0.0 + + 4.0.0 + + epmet-lb-test + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + io.github.openfeign + feign-httpclient + 10.3.0 + + + \ No newline at end of file diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java new file mode 100644 index 0000000000..d447a63a15 --- /dev/null +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java @@ -0,0 +1,11 @@ +package com.epmet.lbtest; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class LoadBalancerApp { + public static void main(String[] args) { + SpringApplication.run(LoadBalancerApp.class, args); + } +} diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java new file mode 100644 index 0000000000..9ad9c71c45 --- /dev/null +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java @@ -0,0 +1,19 @@ +package com.epmet.lbtest.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("lb") +public class LbController { + + @GetMapping("test") + public String test(HttpServletRequest request) { + String localAddr = request.getServerName(); + return localAddr; + } + +} diff --git a/epmet-lb-test/src/main/resources/bootstrap.yml b/epmet-lb-test/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..bbb6e3b01b --- /dev/null +++ b/epmet-lb-test/src/main/resources/bootstrap.yml @@ -0,0 +1,68 @@ +server: + port: 9999 + servlet: + context-path: /lbtest + +spring: + main: + allow-bean-definition-overriding: true + application: + name: lb-test + #环境 dev|test|prod + profiles: + active: local + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + cloud: + nacos: + discovery: + server-addr: 192.168.1.130:8848 + #nacos的命名空间ID，默认是public + namespace: 6ceab336-d004-4acf-89c6-e121d06f4988 + #不把自己注册到注册中心的地址 + register-enabled: false + ip: "" + config: + enabled: false + server-addr: 192.168.1.130:8848 + namespace: "" + group: "" + file-extension: yaml + #指定共享配置，且支持动态刷新 + +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 + +#feign 日志需要该配置 +logging: + level: + com.epmet: debug \ No newline at end of file diff --git a/pom.xml b/pom.xml index dcbdbc44dc..3678db379d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ epmet-module epmet-user epmet-openapi + epmet-lb-test From f717009441ef243d12ba5ff1ce8f1c90637f97d2 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 13:31:03 +0800 Subject: [PATCH 335/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9compose=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-lb-test/deploy/docker-compose-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-lb-test/deploy/docker-compose-dev.yml b/epmet-lb-test/deploy/docker-compose-dev.yml index 0e6ef9657b..28056ebc15 100644 --- a/epmet-lb-test/deploy/docker-compose-dev.yml +++ b/epmet-lb-test/deploy/docker-compose-dev.yml @@ -1,8 +1,8 @@ version: "3.7" services: - lb-test-server: - container_name: lb-test-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/lb-test-server:version_placeholder + epmet-lb-test: + container_name: epmet-lb-test-dev + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-lb-test:version_placeholder ports: - "9999:9999" network_mode: host # 不会创建新的网络 From 0d1b605f8bba31427b335c3ebb970fbdc40ad28f Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 13:35:16 +0800 Subject: [PATCH 336/589] =?UTF-8?q?lb-test=E4=BF=AE=E6=94=B9Dockerfile?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-lb-test/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-lb-test/Dockerfile b/epmet-lb-test/Dockerfile index 6477355119..9ce4250290 100644 --- a/epmet-lb-test/Dockerfile +++ b/epmet-lb-test/Dockerfile @@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8" RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' > /etc/timezone -COPY ./target/*.jar ./lb-test.jar +COPY ./target/*.jar ./epmet-lb-test.jar EXPOSE 9999 From c0dbbe8dcb368878207144a760ea8a36635cb4ee Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 13:36:47 +0800 Subject: [PATCH 337/589] - --- epmet-lb-test/deploy/docker-compose-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-lb-test/deploy/docker-compose-dev.yml b/epmet-lb-test/deploy/docker-compose-dev.yml index 28056ebc15..c8195d6794 100644 --- a/epmet-lb-test/deploy/docker-compose-dev.yml +++ b/epmet-lb-test/deploy/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./lb-test.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-lb-test.jar" restart: "unless-stopped" deploy: resources: From ee92ec245fdd90a84483cde3f75ffabef52c27f2 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 13:44:02 +0800 Subject: [PATCH 338/589] - --- epmet-lb-test/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml index ff64643728..02b1f6e8ee 100644 --- a/epmet-lb-test/pom.xml +++ b/epmet-lb-test/pom.xml @@ -44,4 +44,14 @@ 10.3.0 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file From d6c6db07d59daca603f4a8545953c09fa4932ce8 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 13:49:15 +0800 Subject: [PATCH 339/589] - --- epmet-lb-test/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-lb-test/src/main/resources/bootstrap.yml b/epmet-lb-test/src/main/resources/bootstrap.yml index bbb6e3b01b..2335b723ff 100644 --- a/epmet-lb-test/src/main/resources/bootstrap.yml +++ b/epmet-lb-test/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: #nacos的命名空间ID，默认是public namespace: 6ceab336-d004-4acf-89c6-e121d06f4988 #不把自己注册到注册中心的地址 - register-enabled: false + register-enabled: true ip: "" config: enabled: false From 59721157dca930a295e35d0df2e166c996a96683 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 14:45:22 +0800 Subject: [PATCH 340/589] =?UTF-8?q?wxz=E6=B5=8B=E8=AF=95=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-lb-test/Dockerfile | 2 +- epmet-lb-test/pom.xml | 5 + .../com/epmet/lbtest/LoadBalancerApp.java | 2 + .../epmet/lbtest/controller/LbController.java | 12 ++ .../lbtest/feign/TestCallFeignClient.java | 12 ++ .../feign/TestCallFeignClientFallback.java | 11 ++ .../src/main/resources/bootstrap.yml | 6 + .../src/main/resources/logback-spring.xml | 169 ++++++++++++++++++ 8 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java create mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java create mode 100644 epmet-lb-test/src/main/resources/logback-spring.xml diff --git a/epmet-lb-test/Dockerfile b/epmet-lb-test/Dockerfile index 9ce4250290..bef7728a03 100644 --- a/epmet-lb-test/Dockerfile +++ b/epmet-lb-test/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-lb-test.jar EXPOSE 9999 -ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml index 02b1f6e8ee..8e6b30b65b 100644 --- a/epmet-lb-test/pom.xml +++ b/epmet-lb-test/pom.xml @@ -43,6 +43,11 @@ feign-httpclient 10.3.0 + + com.epmet + epmet-commons-tools + 2.0.0 + diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java index d447a63a15..57dabcea3a 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java @@ -2,7 +2,9 @@ package com.epmet.lbtest; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +@EnableFeignClients @SpringBootApplication public class LoadBalancerApp { public static void main(String[] args) { diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java index 9ad9c71c45..5af5549dfb 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java @@ -1,5 +1,7 @@ package com.epmet.lbtest.controller; +import com.epmet.lbtest.feign.TestCallFeignClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -10,10 +12,20 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("lb") public class LbController { + @Autowired + private TestCallFeignClient testCallFeignClient; + @GetMapping("test") public String test(HttpServletRequest request) { String localAddr = request.getServerName(); return localAddr; } + @GetMapping("test-cal") + public String testCall() { + String result = testCallFeignClient.test(); + System.out.println("调用结果:" + result); + return result; + } + } diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java new file mode 100644 index 0000000000..4ce7336045 --- /dev/null +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java @@ -0,0 +1,12 @@ +package com.epmet.lbtest.feign; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.servlet.http.HttpServletRequest; + +@FeignClient(name = "lb-test", fallback = TestCallFeignClientFallback.class) +public interface TestCallFeignClient { + @GetMapping("/lbtest/lb/test") + String test(); +} diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java new file mode 100644 index 0000000000..3decf23b19 --- /dev/null +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java @@ -0,0 +1,11 @@ +package com.epmet.lbtest.feign; + +import org.springframework.stereotype.Component; + +@Component +public class TestCallFeignClientFallback implements TestCallFeignClient { + @Override + public String test() { + return "请求出错"; + } +} diff --git a/epmet-lb-test/src/main/resources/bootstrap.yml b/epmet-lb-test/src/main/resources/bootstrap.yml index 2335b723ff..79377cd03a 100644 --- a/epmet-lb-test/src/main/resources/bootstrap.yml +++ b/epmet-lb-test/src/main/resources/bootstrap.yml @@ -14,6 +14,12 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + redis: + database: 0 + host: 192.168.1.130 + port: 6379 + password: 123456 + timeout: 30s cloud: nacos: discovery: diff --git a/epmet-lb-test/src/main/resources/logback-spring.xml b/epmet-lb-test/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..856dc844c8 --- /dev/null +++ b/epmet-lb-test/src/main/resources/logback-spring.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + ${appname} + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + ${webHook} + ${secret} + ${appname} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a6a1a8c001cd252832b2508887adf1f8508f950d Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 16:24:06 +0800 Subject: [PATCH 341/589] =?UTF-8?q?wxz=E6=B5=8B=E8=AF=95=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-lb-test/pom.xml | 6 +++++- .../epmet/lbtest/controller/LbController.java | 19 +++++++++---------- .../lbtest/feign/TestCallFeignClient.java | 2 -- ...logback-spring.xml => logback-spring-.xml} | 0 4 files changed, 14 insertions(+), 13 deletions(-) rename epmet-lb-test/src/main/resources/{logback-spring.xml => logback-spring-.xml} (100%) diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml index 8e6b30b65b..8266cdb279 100644 --- a/epmet-lb-test/pom.xml +++ b/epmet-lb-test/pom.xml @@ -44,10 +44,14 @@ 10.3.0 + org.springframework.cloud + spring-cloud-starter-openfeign + + diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java index 5af5549dfb..2065228c57 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java @@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; @RestController @RequestMapping("lb") @@ -16,16 +18,13 @@ public class LbController { private TestCallFeignClient testCallFeignClient; @GetMapping("test") - public String test(HttpServletRequest request) { - String localAddr = request.getServerName(); + public String test() { + String localAddr = null; + try { + localAddr = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } return localAddr; } - - @GetMapping("test-cal") - public String testCall() { - String result = testCallFeignClient.test(); - System.out.println("调用结果:" + result); - return result; - } - } diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java index 4ce7336045..32c7e50873 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java @@ -3,8 +3,6 @@ package com.epmet.lbtest.feign; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -import javax.servlet.http.HttpServletRequest; - @FeignClient(name = "lb-test", fallback = TestCallFeignClientFallback.class) public interface TestCallFeignClient { @GetMapping("/lbtest/lb/test") diff --git a/epmet-lb-test/src/main/resources/logback-spring.xml b/epmet-lb-test/src/main/resources/logback-spring-.xml similarity index 100% rename from epmet-lb-test/src/main/resources/logback-spring.xml rename to epmet-lb-test/src/main/resources/logback-spring-.xml From 0014fa06bb2ac80f3a60d866a467d01e659969a2 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 16:37:28 +0800 Subject: [PATCH 342/589] =?UTF-8?q?wxz=E6=B5=8B=E8=AF=95=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/lbtest/controller/LbController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java index 2065228c57..a812b2c026 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java @@ -2,11 +2,13 @@ package com.epmet.lbtest.controller; import com.epmet.lbtest.feign.TestCallFeignClient; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.commons.util.InetUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.net.Inet4Address; import java.net.InetAddress; import java.net.UnknownHostException; @@ -14,17 +16,14 @@ import java.net.UnknownHostException; @RequestMapping("lb") public class LbController { + @Autowired + private InetUtils inetUtils; + @Autowired private TestCallFeignClient testCallFeignClient; @GetMapping("test") public String test() { - String localAddr = null; - try { - localAddr = InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { - e.printStackTrace(); - } - return localAddr; + return inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); } } From a4caa066c4f1ea18346d808526703d386a69a2d4 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 30 Nov 2020 22:53:12 +0800 Subject: [PATCH 343/589] =?UTF-8?q?wxz=E7=9A=84=E8=B4=9F=E8=BD=BD=E5=9D=87?= =?UTF-8?q?=E8=A1=A1=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/lbtest/LoadBalancerApp.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java index 57dabcea3a..54b62267ed 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java @@ -2,8 +2,10 @@ package com.epmet.lbtest; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +@EnableDiscoveryClient @EnableFeignClients @SpringBootApplication public class LoadBalancerApp { From 30f23056b27dcc7bc65a3738be748e993cdd8dd1 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 09:41:30 +0800 Subject: [PATCH 344/589] =?UTF-8?q?=E5=88=A0=E9=99=A4epmet-lb-test?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-lb-test/Dockerfile | 11 -- epmet-lb-test/deploy/docker-compose-dev.yml | 18 -- epmet-lb-test/pom.xml | 66 ------- .../com/epmet/lbtest/LoadBalancerApp.java | 15 -- .../epmet/lbtest/controller/LbController.java | 29 --- .../lbtest/feign/TestCallFeignClient.java | 10 -- .../feign/TestCallFeignClientFallback.java | 11 -- .../src/main/resources/bootstrap.yml | 74 -------- .../src/main/resources/logback-spring-.xml | 169 ------------------ 9 files changed, 403 deletions(-) delete mode 100644 epmet-lb-test/Dockerfile delete mode 100644 epmet-lb-test/deploy/docker-compose-dev.yml delete mode 100644 epmet-lb-test/pom.xml delete mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java delete mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java delete mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java delete mode 100644 epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java delete mode 100644 epmet-lb-test/src/main/resources/bootstrap.yml delete mode 100644 epmet-lb-test/src/main/resources/logback-spring-.xml diff --git a/epmet-lb-test/Dockerfile b/epmet-lb-test/Dockerfile deleted file mode 100644 index bef7728a03..0000000000 --- a/epmet-lb-test/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM java:8 - -RUN export LANG="zh_CN.UTF-8" -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' > /etc/timezone - -COPY ./target/*.jar ./epmet-lb-test.jar - -EXPOSE 9999 - -ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-lb-test/deploy/docker-compose-dev.yml b/epmet-lb-test/deploy/docker-compose-dev.yml deleted file mode 100644 index c8195d6794..0000000000 --- a/epmet-lb-test/deploy/docker-compose-dev.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3.7" -services: - epmet-lb-test: - container_name: epmet-lb-test-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-lb-test:version_placeholder - ports: - - "9999:9999" - network_mode: host # 不会创建新的网络 - volumes: - - "/opt/epmet-cloud-logs/dev:/logs" - environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-lb-test.jar" - restart: "unless-stopped" - deploy: - resources: - limits: - cpus: '0.1' - memory: 300M \ No newline at end of file diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml deleted file mode 100644 index 8266cdb279..0000000000 --- a/epmet-lb-test/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - epmet-cloud - com.epmet - 2.0.0 - - 4.0.0 - - epmet-lb-test - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework - spring-context-support - - - org.springframework.boot - spring-boot-starter-actuator - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - io.github.openfeign - feign-httpclient - 10.3.0 - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java deleted file mode 100644 index 54b62267ed..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.epmet.lbtest; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -@EnableDiscoveryClient -@EnableFeignClients -@SpringBootApplication -public class LoadBalancerApp { - public static void main(String[] args) { - SpringApplication.run(LoadBalancerApp.class, args); - } -} diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java deleted file mode 100644 index a812b2c026..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.epmet.lbtest.controller; - -import com.epmet.lbtest.feign.TestCallFeignClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.commons.util.InetUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.UnknownHostException; - -@RestController -@RequestMapping("lb") -public class LbController { - - @Autowired - private InetUtils inetUtils; - - @Autowired - private TestCallFeignClient testCallFeignClient; - - @GetMapping("test") - public String test() { - return inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); - } -} diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java deleted file mode 100644 index 32c7e50873..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.epmet.lbtest.feign; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -@FeignClient(name = "lb-test", fallback = TestCallFeignClientFallback.class) -public interface TestCallFeignClient { - @GetMapping("/lbtest/lb/test") - String test(); -} diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java deleted file mode 100644 index 3decf23b19..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.epmet.lbtest.feign; - -import org.springframework.stereotype.Component; - -@Component -public class TestCallFeignClientFallback implements TestCallFeignClient { - @Override - public String test() { - return "请求出错"; - } -} diff --git a/epmet-lb-test/src/main/resources/bootstrap.yml b/epmet-lb-test/src/main/resources/bootstrap.yml deleted file mode 100644 index 79377cd03a..0000000000 --- a/epmet-lb-test/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,74 +0,0 @@ -server: - port: 9999 - servlet: - context-path: /lbtest - -spring: - main: - allow-bean-definition-overriding: true - application: - name: lb-test - #环境 dev|test|prod - profiles: - active: local - jackson: - time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss - redis: - database: 0 - host: 192.168.1.130 - port: 6379 - password: 123456 - timeout: 30s - cloud: - nacos: - discovery: - server-addr: 192.168.1.130:8848 - #nacos的命名空间ID，默认是public - namespace: 6ceab336-d004-4acf-89c6-e121d06f4988 - #不把自己注册到注册中心的地址 - register-enabled: true - ip: "" - config: - enabled: false - server-addr: 192.168.1.130:8848 - namespace: "" - group: "" - file-extension: yaml - #指定共享配置，且支持动态刷新 - -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - health: - show-details: ALWAYS - -feign: - hystrix: - enabled: true - client: - config: - default: - loggerLevel: BASIC - httpclient: - enabled: true - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 60000 #缺省为1000 - -ribbon: - ReadTimeout: 300000 - ConnectTimeout: 300000 - -#feign 日志需要该配置 -logging: - level: - com.epmet: debug \ No newline at end of file diff --git a/epmet-lb-test/src/main/resources/logback-spring-.xml b/epmet-lb-test/src/main/resources/logback-spring-.xml deleted file mode 100644 index 856dc844c8..0000000000 --- a/epmet-lb-test/src/main/resources/logback-spring-.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - ${appname} - - - - - - - - - debug - - - ${CONSOLE_LOG_PATTERN} - - UTF-8 - - - - - - - - ${log.path}/debug.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/debug-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - debug - ACCEPT - DENY - - - - - - - ${log.path}/info.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/info-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - info - ACCEPT - DENY - - - - - - - ${log.path}/warn.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/warn-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - warn - ACCEPT - DENY - - - - - - - ${log.path}/error.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/error-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - ERROR - ACCEPT - DENY - ${webHook} - ${secret} - ${appname} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 7b389608100ce31a8e373358c982ab8b88d13460 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 10:14:48 +0800 Subject: [PATCH 345/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LbController.java | 21 +++++++++++++++++++ pom.xml | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java new file mode 100644 index 0000000000..c261428139 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java @@ -0,0 +1,21 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.commons.util.InetUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class LbController { + + @Autowired + private InetUtils inetUtils; + + @PostMapping("get-host") + public Result getHost() { + String ipAddress = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + return new Result().ok(ipAddress); + } + +} diff --git a/pom.xml b/pom.xml index 3678db379d..dcbdbc44dc 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,6 @@ epmet-module epmet-user epmet-openapi - epmet-lb-test From d3fbc3f334436f68a4c4b056c56c1d6aa3b3746a Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 10:36:05 +0800 Subject: [PATCH 346/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gov-access-lb/gov-access-lb-client/pom.xml | 27 + .../java/com/epmet/dto/GovLanguageDTO.java | 61 ++ .../main/java/com/epmet/dto/GovMenuDTO.java | 124 ++++ .../java/com/epmet/dto/GovResourceDTO.java | 102 +++ .../main/java/com/epmet/dto/GovRoleDTO.java | 93 +++ .../java/com/epmet/dto/GovRoleMenuDTO.java | 82 +++ .../java/com/epmet/dto/GovRoleUserDTO.java | 82 +++ .../java/com/epmet/dto/OperationScopeDTO.java | 86 +++ .../java/com/epmet/dto/RoleOperationDTO.java | 82 +++ .../main/java/com/epmet/dto/RoleScopeDTO.java | 86 +++ .../form/AccessConfigAdd4RoletFormDTO.java | 17 + .../AccessConfigOpeDefaultScopesFormDTO.java | 26 + .../dto/form/AccessConfigOpesFormDTO.java | 16 + .../dto/form/AccessConfigOptionsFormDTO.java | 16 + .../AccessConfigRoleDefaultOpesFormDTO.java | 18 + .../dto/form/AccessConfigSaveConfigDTO.java | 18 + .../epmet/dto/form/AccessSettingFormDTO.java | 12 + .../epmet/dto/form/GetSQLFilterFormDTO.java | 29 + .../form/HasSpecifiedPermissionFormDTO.java | 22 + .../form/InitDefaultOperationsFormDTO.java | 20 + .../epmet/dto/form/ListOpePermsFormDTO.java | 18 + .../epmet/dto/form/OperationScopeFormDTO.java | 18 + .../epmet/dto/form/StaffPermCacheFormDTO.java | 59 ++ ...AccessConfigOpeDefaultScopesResultDTO.java | 16 + .../dto/result/AccessConfigOpesResultDTO.java | 13 + .../result/AccessConfigOptionsResultDTO.java | 10 + .../result/AccessConfigScopeResultDTO.java | 15 + .../dto/result/AccessSettingResultDTO.java | 58 ++ .../dto/result/LoginUserDetailsResultDTO.java | 59 ++ .../com/epmet/dto/result/MenuResourceDTO.java | 29 + .../OperationScopeDefaultResultDTO.java | 20 + .../dto/result/RoleOpeScopeResultDTO.java | 36 ++ .../result/RoleOperationDefaultResultDTO.java | 60 ++ .../dto/result/RoleOperationResultDTO.java | 87 +++ .../java/com/epmet/enums/MenuFlagEnum.java | 36 ++ .../java/com/epmet/enums/MenuTypeEnum.java | 36 ++ .../java/com/epmet/enums/RegionLeafEnum.java | 29 + .../java/com/epmet/enums/RegionLevelEnum.java | 30 + .../java/com/epmet/enums/UserStatusEnum.java | 30 + .../com/epmet/feign/GovAccessFeignClient.java | 35 + .../GovAccessFeignClientFallBack.java | 35 + gov-access-lb/gov-access-lb-server/Dockerfile | 11 + .../deploy/docker-compose-dev.yml | 18 + .../deploy/docker-compose-prod.yml | 18 + .../deploy/docker-compose-test.yml | 18 + gov-access-lb/gov-access-lb-server/pom.xml | 137 ++++ .../com/epmet/GovAccessLbApplication.java | 20 + .../com/epmet/aspect/RequestLogAspect.java | 40 ++ .../epmet/bean/OpeScopeFilterResultBean.java | 15 + .../com/epmet/config/DatabaseProperties.java | 15 + .../com/epmet/config/DbMigrationConfig.java | 29 + .../com/epmet/config/ModuleConfigImpl.java | 26 + .../epmet/config/PermissionInitializer.java | 69 ++ .../constant/OperationScopeConstant.java | 53 ++ .../controller/AccessConfigController.java | 138 ++++ .../epmet/controller/AccessController.java | 60 ++ .../com/epmet/controller/DemoController.java | 64 ++ .../controller/GovLanguageController.java | 85 +++ .../epmet/controller/GovMenuController.java | 156 +++++ .../controller/GovResourceController.java | 84 +++ .../epmet/controller/GovRoleController.java | 104 +++ .../controller/GovRoleMenuController.java | 85 +++ .../controller/GovRoleUserController.java | 132 ++++ .../com/epmet/controller/RoleController.java | 41 ++ .../com/epmet/controller/TestController.java | 25 + .../java/com/epmet/dao/GovLanguageDao.java | 28 + .../main/java/com/epmet/dao/GovMenuDao.java | 52 ++ .../java/com/epmet/dao/GovResourceDao.java | 48 ++ .../main/java/com/epmet/dao/GovRoleDao.java | 24 + .../java/com/epmet/dao/GovRoleMenuDao.java | 49 ++ .../java/com/epmet/dao/GovRoleUserDao.java | 57 ++ .../main/java/com/epmet/dao/OperationDao.java | 38 ++ .../java/com/epmet/dao/OperationScopeDao.java | 57 ++ .../epmet/dao/OperationScopeDefaultDao.java | 64 ++ .../java/com/epmet/dao/RoleOperationDao.java | 47 ++ .../epmet/dao/RoleOperationDefaultDao.java | 57 ++ .../main/java/com/epmet/dao/RoleScopeDao.java | 85 +++ .../com/epmet/entity/GovLanguageEntity.java | 49 ++ .../java/com/epmet/entity/GovMenuEntity.java | 69 ++ .../com/epmet/entity/GovResourceEntity.java | 53 ++ .../java/com/epmet/entity/GovRoleEntity.java | 44 ++ .../com/epmet/entity/GovRoleMenuEntity.java | 36 ++ .../com/epmet/entity/GovRoleUserEntity.java | 37 ++ .../com/epmet/entity/OperationEntity.java | 56 ++ .../entity/OperationScopeDefaultEntity.java | 53 ++ .../epmet/entity/OperationScopeEntity.java | 55 ++ .../entity/RoleOperationDefaultEntity.java | 42 ++ .../com/epmet/entity/RoleOperationEntity.java | 51 ++ .../com/epmet/entity/RoleScopeEntity.java | 56 ++ .../com/epmet/excel/RoleOperationExcel.java | 62 ++ .../com/epmet/feign/EpmetUserFeignClient.java | 77 +++ .../com/epmet/feign/GovOrgFeignClient.java | 34 + .../EpmetUserFeignClientFallback.java | 49 ++ .../fallback/GovOrgFeignClientFallBack.java | 31 + .../com/epmet/redis/GovLanguageRedis.java | 47 ++ .../java/com/epmet/redis/GovMenuRedis.java | 74 +++ .../com/epmet/redis/GovResourceRedis.java | 50 ++ .../com/epmet/redis/GovRoleMenuRedis.java | 47 ++ .../java/com/epmet/redis/GovRoleRedis.java | 47 ++ .../com/epmet/redis/GovRoleUserRedis.java | 47 ++ .../com/epmet/redis/RoleOpeScopeRedis.java | 74 +++ .../epmet/service/AccessConfigService.java | 30 + .../java/com/epmet/service/AccessService.java | 44 ++ .../com/epmet/service/GovLanguageService.java | 105 +++ .../com/epmet/service/GovMenuService.java | 144 +++++ .../com/epmet/service/GovResourceService.java | 110 ++++ .../com/epmet/service/GovRoleMenuService.java | 125 ++++ .../com/epmet/service/GovRoleService.java | 95 +++ .../com/epmet/service/GovRoleUserService.java | 133 ++++ .../epmet/service/OperationScopeService.java | 95 +++ .../com/epmet/service/OperationService.java | 14 + .../epmet/service/RoleOperationService.java | 106 ++++ .../com/epmet/service/RoleScopeService.java | 95 +++ .../java/com/epmet/service/TestService.java | 7 + .../service/impl/AccessConfigServiceImpl.java | 264 ++++++++ .../epmet/service/impl/AccessServiceImpl.java | 597 ++++++++++++++++++ .../service/impl/GovLanguageServiceImpl.java | 121 ++++ .../service/impl/GovMenuServiceImpl.java | 247 ++++++++ .../service/impl/GovResourceServiceImpl.java | 143 +++++ .../service/impl/GovRoleMenuServiceImpl.java | 150 +++++ .../service/impl/GovRoleServiceImpl.java | 118 ++++ .../service/impl/GovRoleUserServiceImpl.java | 156 +++++ .../impl/OperationScopeServiceImpl.java | 101 +++ .../service/impl/OperationServiceImpl.java | 35 + .../impl/RoleOperationServiceImpl.java | 218 +++++++ .../service/impl/RoleScopeServiceImpl.java | 100 +++ .../epmet/service/impl/TestServiceImpl.java | 16 + .../src/main/resources/bootstrap.yml | 125 ++++ .../resources/db/migration/V0.0.1__init.sql | 1 + .../resources/db/migration/V0.0.2__add.sql | 91 +++ .../src/main/resources/logback-spring.xml | 164 +++++ .../main/resources/mapper/GovLanguageDao.xml | 21 + .../src/main/resources/mapper/GovMenuDao.xml | 42 ++ .../main/resources/mapper/GovResourceDao.xml | 25 + .../src/main/resources/mapper/GovRoleDao.xml | 6 + .../main/resources/mapper/GovRoleMenuDao.xml | 25 + .../main/resources/mapper/GovRoleUserDao.xml | 32 + .../main/resources/mapper/OperationDao.xml | 32 + .../resources/mapper/OperationScopeDao.xml | 76 +++ .../mapper/OperationScopeDefaultDao.xml | 77 +++ .../resources/mapper/RoleOperationDao.xml | 69 ++ .../mapper/RoleOperationDefaultDao.xml | 53 ++ .../main/resources/mapper/RoleScopeDao.xml | 75 +++ gov-access-lb/pom.xml | 21 + 144 files changed, 9341 insertions(+) create mode 100644 gov-access-lb/gov-access-lb-client/pom.xml create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java create mode 100755 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java create mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java create mode 100644 gov-access-lb/gov-access-lb-server/Dockerfile create mode 100644 gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml create mode 100644 gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml create mode 100644 gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml create mode 100644 gov-access-lb/gov-access-lb-server/pom.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java create mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java create mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java create mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java create mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml create mode 100755 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml create mode 100755 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml create mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml create mode 100644 gov-access-lb/pom.xml diff --git a/gov-access-lb/gov-access-lb-client/pom.xml b/gov-access-lb/gov-access-lb-client/pom.xml new file mode 100644 index 0000000000..1861f2e625 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/pom.xml @@ -0,0 +1,27 @@ + + + + gov-access-lb + com.epmet + 2.0.0 + + 4.0.0 + + gov-access-lb-client + + + + com.epmet + epmet-commons-tools + 2.0.0 + + + io.swagger + swagger-annotations + 1.5.20 + compile + + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java new file mode 100644 index 0000000000..ed7f5924db --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java @@ -0,0 +1,61 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 国际化 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovLanguageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 表名 + */ + private String tableName; + + /** + * 表主键 + */ + private String tableId; + + /** + * 字段名 + */ + private String fieldName; + + /** + * 字段值 + */ + private String fieldValue; + + /** + * 语言 + */ + private String language; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java new file mode 100644 index 0000000000..fb130e9c65 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java @@ -0,0 +1,124 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import com.epmet.commons.tools.utils.TreeStringNode; +import com.epmet.dto.result.MenuResourceDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 菜单管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovMenuDTO extends TreeStringNode implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 上级ID，一级菜单为0 + */ + private String pid; + + /** + * 菜单名称 + */ + private String name; + + /** + * 菜单URL + */ + private String url; + + /** + * 类型 0：菜单 1：按钮 + */ + private Integer type; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 权限标识，如：sys:menu:save + */ + private String permissions; + + /** + * 排序 + */ + private Integer sort; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 菜单资源 + */ + private List resourceList; + + /** + * 上级菜单名称 + */ + private String parentName; + + /** + * 是否显示，1：显示 0不显示 + */ + private Integer showFlag; +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java new file mode 100644 index 0000000000..59a9576598 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java @@ -0,0 +1,102 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovResourceDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 资源编码，如菜单ID + */ + private String resourceCode; + + /** + * 资源名称 + */ + private String resourceName; + + /** + * 资源URL + */ + private String resourceUrl; + + /** + * 请求方式（如：GET、POST、PUT、DELETE） + */ + private String resourceMethod; + + /** + * 菜单标识 0：非菜单资源 1：菜单资源 + */ + private Integer menuFlag; + + /** + * 认证等级 0：权限认证 1：登录认证 2：无需认证 + */ + private Integer authLevel; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java new file mode 100644 index 0000000000..efe6643df6 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java @@ -0,0 +1,93 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 角色名称 + */ + private String name; + + /** + * 备注 + */ + private String remark; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 菜单ID列表 + */ + private List menuIdList; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java new file mode 100644 index 0000000000..eacde30cf3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java @@ -0,0 +1,82 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色菜单关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleMenuDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 菜单ID + */ + private String menuId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java new file mode 100644 index 0000000000..d3881edeb2 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java @@ -0,0 +1,82 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色用户关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleUserDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 用户ID + */ + private String userId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java new file mode 100644 index 0000000000..35885d7f8c --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 权限范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Data +public class OperationScopeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 范围key + */ + private String scopeKey; + + /** + * 范围名称 + */ + private String scopeName; + + /** + * 范围序号 + */ + private String scopeIndex; + + /** + * 是否删除，0：未删除，1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建者id + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新者id + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java new file mode 100644 index 0000000000..bda4931386 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java @@ -0,0 +1,82 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Data +public class RoleOperationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + + /** + * 是否删除，0：未删除，1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建者id + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新者id + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java new file mode 100644 index 0000000000..17f8866215 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 角色能操作哪些范围 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Data +public class RoleScopeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + + /** + * 范围Key + */ + private String scopeKey; + + /** + * 是否删除，0：未删除，1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建者id + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新者id + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java new file mode 100644 index 0000000000..85b9e9d68d --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +@Data +public class AccessConfigAdd4RoletFormDTO { + @NotBlank(message = "角色Key不能为空") + private String roleKey; + + @NotBlank(message = "操作Key不能为空") + private String operationKey; + + private List scopeKeys; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java new file mode 100644 index 0000000000..86dad3a7a3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 权限配置-操作默认范围form dto + */ +@Data +public class AccessConfigOpeDefaultScopesFormDTO { + + public interface ListOpeDefaultScopesGroup {} + public interface SaveOpeDefaultScopesGroup {} + + @NotBlank(message = "角色Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class }) + private String roleKey; + + @NotBlank(message = "操作Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class }) + private String operationKey; + + private List scopeKeys; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java new file mode 100644 index 0000000000..8a84ddf960 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.form; + +import com.epmet.dto.result.AccessConfigOpesResultDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +@Data +public class AccessConfigOpesFormDTO { + + @NotBlank(message = "角色ID不能为空") + private String roleId; + private List opes; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java new file mode 100644 index 0000000000..b96e438e0b --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class AccessConfigOptionsFormDTO { + + @NotBlank(message = "角色ID不能为空") + private String roleId; + + @NotBlank(message = "操作的Key不能为空") + private String operationKey; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java new file mode 100644 index 0000000000..cb6f196403 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * 角色默认操作权限列表from DTO + */ +@Data +public class AccessConfigRoleDefaultOpesFormDTO { + + @NotBlank(message = "角色Key不能为空") + private String roleKey; + + private List operationKeys; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java new file mode 100644 index 0000000000..6a918b5bb2 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Set; + +@Data +public class AccessConfigSaveConfigDTO { + + @NotBlank(message = "角色ID不能为空") + private String roleId; + @NotBlank(message = "操作Key不能为空") + private String operationKey; + private Set scopeKeys; + private Set settingKeys; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java new file mode 100644 index 0000000000..ecd5e6b99f --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java @@ -0,0 +1,12 @@ +package com.epmet.dto.form; + +import lombok.Data; + +/** + * 查询拥有的权限的DTO，非后台配置用 + */ +@Data +public class AccessSettingFormDTO { + private String roleId; + private String operationKey; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java new file mode 100644 index 0000000000..4901eca2bb --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Set; + +@Data +public class GetSQLFilterFormDTO { + + @NotBlank + private String operationKey; + + @NotBlank + private String userId; + + @NotBlank + private String app; + + @NotBlank + private String client; + + private String tableAlias; + + private Set gridIds; + + private Set departmentIds; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java new file mode 100644 index 0000000000..4dabc98dd0 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class HasSpecifiedPermissionFormDTO { + + @NotBlank + private String operationKey; + + @NotBlank + private String userId; + + @NotBlank + private String app; + + @NotBlank + private String client; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java new file mode 100644 index 0000000000..d7b487ad67 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.util.List; + +@Data +public class InitDefaultOperationsFormDTO { + + private List roles; + + @Data + public static class InitDefaultOpesRoleDTO { + public InitDefaultOpesRoleDTO() { + } + + private String roleId; + private String roleKey; + } +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java new file mode 100644 index 0000000000..a7b1b2a7df --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class ListOpePermsFormDTO { + + @NotBlank(message = "用户ID不能为空") + private String staffId; + @NotBlank(message = "当前单位不能为空") + private String currAgencyId; + + private String currGridId; + + private String currDeptId; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java new file mode 100644 index 0000000000..af992b7d51 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class OperationScopeFormDTO { + + public interface ListOperationScopeGroup {} + + @NotBlank(message = "角色ID不能为空", groups = {ListOperationScopeGroup.class}) + private String roleId; + + @NotBlank(message = "操作的key不能为空", groups = {ListOperationScopeGroup.class}) + private String operationKey; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java new file mode 100644 index 0000000000..a35af017c9 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java @@ -0,0 +1,59 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Set; + +@Data +public class StaffPermCacheFormDTO { + + /** + * 更新权限缓存分组 + */ + public interface UpdatePermissionCache {} + + /** + * 查询当前权限列表 + */ + public interface GetStaffCurrPermissions {} + + /** + * 工作人员 id + */ + @NotBlank(message = "工作人员ID不能为空", groups = {UpdatePermissionCache.class, GetStaffCurrPermissions.class}) + private String staffId; + + /** + * 登录头信息app + */ + @NotBlank(message = "登录头信息app不能为空", groups = {UpdatePermissionCache.class, GetStaffCurrPermissions.class}) + private String app; + + /** + * 登录头信息client + */ + @NotBlank(message = "登录头信息client不能为空", groups = {UpdatePermissionCache.class, GetStaffCurrPermissions.class}) + private String client; + + /** + * 组织ID路径 + */ + private String orgIdPath; + + /** + * 权限列表 + */ + private Set permissions; + + /** + * 角色列表 + */ + private Set roleIdList; + + /** + * 当前所在网格id + */ + private String gridId; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java new file mode 100644 index 0000000000..53023bd459 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * 权限配置-操作的默认范围result dto + */ +@Data +public class AccessConfigOpeDefaultScopesResultDTO { + private String scopeKey; + private String scopeName; + private String scopeIndex; + private String operationKey; + private String roleKey; + private Boolean assigned; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java new file mode 100644 index 0000000000..bf24f851d2 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.result; + +import lombok.Data; + +@Data +public class AccessConfigOpesResultDTO { + + private String operationKey; + private String operationName; + private String brief; + private Boolean assigned; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java new file mode 100644 index 0000000000..4959a3af40 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java @@ -0,0 +1,10 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.util.List; + +@Data +public class AccessConfigOptionsResultDTO { + private List scopeOptions; +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java new file mode 100644 index 0000000000..e1eb02e9fb --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.result; + +import lombok.Data; + +@Data +public class AccessConfigScopeResultDTO { + + private String scopeKey; + private String scopeName; + private String scopeIndex; + private String operationKey; + private String roleId; + private Boolean assigned; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java new file mode 100644 index 0000000000..d00d440e63 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java @@ -0,0 +1,58 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +/** + * 权限配置 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-29 + */ +@Data +public class AccessSettingResultDTO { + + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + + /** + * 配置KEY + */ + private String settingKey; + + /** + * 配置值 + */ + private String settingValue; + + /** + * 配置名称 + */ + private String settingName; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java new file mode 100644 index 0000000000..2a14ada3fd --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java @@ -0,0 +1,59 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.security.dto.GovTokenDto; +import lombok.Data; + +import java.util.List; +import java.util.Set; + +@Data +public class LoginUserDetailsResultDTO { + + /** + * 政府端:gov、居民端:resi、运营端:oper + */ + private String app; + + /** + * PC端:web、微信小程序:wxmp + */ + private String client; + + /** + * 用户ID + */ + private String userId; + + /** + * 角色列表 + */ + //private Set roleIdList; + private List roleList; + + /** + * 部门id列表 + */ + private Set deptIdList; + + /** + * 当前登录的组织id(顶级) + */ + private String agencyId; + + /** + * 组织ID + */ + private String orgIdPath; + + /** + * 网格ID列表 + */ + private Set gridIdList; + + /** + * 当前工作人员进入的客户id + */ + private String customerId; + + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java new file mode 100644 index 0000000000..86df7d55ca --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dto.result; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 菜单资源 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@ApiModel(value = "菜单资源") +public class MenuResourceDTO { + @ApiModelProperty(value = "资源URL") + private String resourceUrl; + @ApiModelProperty(value = "请求方式（如：GET、POST、PUT、DELETE）") + private String resourceMethod; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java new file mode 100644 index 0000000000..4c1f593712 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +@Data +public class OperationScopeDefaultResultDTO { + + private String roleKey; + + /** + * 操作key + */ + private String operationKey; + + /** + * 范围key + */ + private String scopeKey; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java new file mode 100644 index 0000000000..d950f7dc85 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.result; + +import lombok.Data; + +@Data +public class RoleOpeScopeResultDTO { + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + + /** + * 范围key + */ + private String scopeKey; + + /** + * 范围名称 + */ + private String scopeName; + + /** + * 范围序号 + */ + private String scopeIndex; + + private String series; + private Integer sort; + +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java new file mode 100755 index 0000000000..6961dad6ca --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java @@ -0,0 +1,60 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import java.io.Serializable; +import lombok.Data; + + +/** + * 角色默认的可操作功能列表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-21 + */ +@Data +public class RoleOperationDefaultResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 角色KEY + */ + private String roleKey; + + /** + * 操作key + */ + private String operationKey; + + /** + * 操作名称 + */ + private String operationName; + + /** + * 是否已经具有该操作权限 + */ + private Boolean assigned; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java new file mode 100644 index 0000000000..dc7fc1559e --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java @@ -0,0 +1,87 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Data +public class RoleOperationResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + + /** + * 操作名称 + */ + private String operationName; + + /** + * 是否删除，0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建者id + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新者id + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java new file mode 100644 index 0000000000..2a880a728a --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 菜单资源标识 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public enum MenuFlagEnum { + /** + * 菜单资源 + */ + YES(1), + /** + * 非菜单资源 + */ + NO(0); + + private int value; + + MenuFlagEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java new file mode 100644 index 0000000000..7132fa2ce3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 菜单类型枚举 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public enum MenuTypeEnum { + /** + * 菜单 + */ + MENU(0), + /** + * 按钮 + */ + BUTTON(1); + + private int value; + + MenuTypeEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java new file mode 100644 index 0000000000..36300e201f --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 叶子节点枚举 + * + * @author Mark sunlightcs@gmail.com + */ +public enum RegionLeafEnum { + YES(1), + NO(0); + + private int value; + + RegionLeafEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java new file mode 100644 index 0000000000..b29c456897 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 行政区域 级别枚举 + * + * @author Mark sunlightcs@gmail.com + */ +public enum RegionLevelEnum { + ONE(1), + TWO(2), + THREE(3); + + private int value; + + RegionLevelEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java new file mode 100644 index 0000000000..dbc043f529 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 用户状态 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public enum UserStatusEnum { + DISABLE(0), + ENABLED(1); + + private int value; + + UserStatusEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java new file mode 100644 index 0000000000..1af72f3d72 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -0,0 +1,35 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.InitDefaultOperationsFormDTO; +import com.epmet.dto.form.ListOpePermsFormDTO; +import com.epmet.feign.fallback.GovAccessFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.Set; + +//@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "http://localhost:8099") +@FeignClient(name = "lb-server", fallback = GovAccessFeignClientFallBack.class) +public interface GovAccessFeignClient { + + /** + * 批量为角色ID初始化操作权限列表 + * @param formDTO + * @return + */ + @PostMapping("/gov/access/role/initdefaultoperationsforroles") + Result initDefaultOperationsForRoles(@RequestBody InitDefaultOperationsFormDTO formDTO); + + /** + * 列出觉得的功能权限列表 + * @return + */ + @PostMapping("/gov/access/access/listoperationpermissions") + Result> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO); + + @PostMapping("/lb/get-host") + Result getHost(); +} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java new file mode 100644 index 0000000000..4dab49c910 --- /dev/null +++ b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -0,0 +1,35 @@ +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.form.InitDefaultOperationsFormDTO; +import com.epmet.dto.form.ListOpePermsFormDTO; +import com.epmet.feign.GovAccessFeignClient; +import org.springframework.stereotype.Component; + +import java.util.Set; + +/** + * @Description + * @Author sun + */ +@Component +public class GovAccessFeignClientFallBack implements GovAccessFeignClient { + + + @Override + public Result initDefaultOperationsForRoles(InitDefaultOperationsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "initDefaultOperationsForRoles", formDTO); + } + + @Override + public Result> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO); + } + + @Override + public Result getHost() { + return ModuleUtils.feignConError("lb-server", "getHost", null); + } +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/Dockerfile b/gov-access-lb/gov-access-lb-server/Dockerfile new file mode 100644 index 0000000000..a2e8d5d488 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./gov-access-lb.jar + +EXPOSE 9999 + +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml new file mode 100644 index 0000000000..58de243d08 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml @@ -0,0 +1,18 @@ +version: "3.7" +services: + gov-access-lb-server: + container_name: gov-access-lb-server-dev + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-lb-server:version_placeholder + ports: + - "9999:9999" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-access-lb.jar" + restart: "unless-stopped" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml new file mode 100644 index 0000000000..ababaa4a99 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml @@ -0,0 +1,18 @@ +version: "3.7" +services: + gov-access-server: + container_name: gov-access-server-prod + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.39 + ports: + - "8099:8099" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/prod:/logs" + environment: + RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-access.jar" + restart: "unless-stopped" + deploy: + resources: + limits: + cpus: '0.1' + memory: 600M \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml new file mode 100644 index 0000000000..e28e5d30f0 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml @@ -0,0 +1,18 @@ +version: "3.7" +services: + gov-access-server: + container_name: gov-access-server-test + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:version_placeholder + ports: + - "8099:8099" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/test:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-access.jar" + restart: "unless-stopped" + deploy: + resources: + limits: + cpus: '0.1' + memory: 400M \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/pom.xml b/gov-access-lb/gov-access-lb-server/pom.xml new file mode 100644 index 0000000000..b5e2005cc3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/pom.xml @@ -0,0 +1,137 @@ + + + 0.3.41 + + gov-access-lb + com.epmet + 2.0.0 + + 4.0.0 + + gov-access-lb-server + jar + + + + com.epmet + gov-access-client + 2.0.0 + + + com.epmet + gov-org-client + 2.0.0 + compile + + + com.epmet + epmet-user-client + 2.0.0 + compile + + + com.epmet + epmet-commons-tools + 2.0.0 + + + com.epmet + epmet-commons-mybatis + 2.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + io.github.openfeign + feign-httpclient + 10.3.0 + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + ${project.basedir}/src/main/java + + + true + ${basedir}/src/main/resources + + + + + + + dev + + true + + + 9999 + dev + + + + + + epmet_gov_access_user + EpmEt-db-UsEr + + 0 + 192.168.1.130 + 6379 + 123456 + + true + 192.168.1.130:8848 + 6ceab336-d004-4acf-89c6-e121d06f4988 + + + false + + + + false + + + + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java new file mode 100644 index 0000000000..9a3714756e --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java @@ -0,0 +1,20 @@ +package com.epmet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +//@EnableConfigurationProperties(value = {DatabaseProperties.class}) +public class GovAccessLbApplication { + public static void main(String[] args) { + SpringApplication.run(GovAccessLbApplication.class, args); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java new file mode 100644 index 0000000000..49581cf63c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java @@ -0,0 +1,40 @@ +package com.epmet.aspect; + +import com.epmet.commons.tools.aspect.BaseRequestLogAspect; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 日志/异常处理切面实现，调用父类方法完成日志记录和异常处理。 + */ +@Aspect +@Component +@Order(0) +public class RequestLogAspect extends BaseRequestLogAspect { + + @Override + @Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ") + public Object proceed(ProceedingJoinPoint point) throws Throwable { + return super.proceed(point, getRequest()); + } + + /** + * 获取Request对象 + * + * @return + */ + private HttpServletRequest getRequest() { + RequestAttributes ra = RequestContextHolder.getRequestAttributes(); + ServletRequestAttributes sra = (ServletRequestAttributes) ra; + return sra.getRequest(); + } + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java new file mode 100644 index 0000000000..fbe1b38052 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java @@ -0,0 +1,15 @@ +package com.epmet.bean; + +import lombok.Data; + +import java.util.HashSet; +import java.util.Set; + +@Data +public class OpeScopeFilterResultBean { + + private HashSet orgLevelScopes; + private Set switchScopes; + private boolean allScopes; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java new file mode 100644 index 0000000000..e9282216d8 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java @@ -0,0 +1,15 @@ +//package com.epmet.config; +// +//import lombok.Data; +//import org.springframework.boot.context.properties.ConfigurationProperties; +// +//@ConfigurationProperties(prefix = "spring.datasource.druid") +//@Data +//public class DatabaseProperties { +// +// private String driverClassName; +// private String url; +// private String username; +// private String password; +// +//} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java new file mode 100644 index 0000000000..b9fcdfb160 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java @@ -0,0 +1,29 @@ +//package com.epmet.config; +// +//import org.flywaydb.core.Flyway; +//import org.springframework.beans.factory.annotation.Autowired; +// +//import javax.annotation.PostConstruct; +// +///** +// * 数据库迁移配置 +// */ +//@Configuration +//public class DbMigrationConfig { +// +// @Autowired +// private DatabaseProperties databaseProperties; +// +// @PostConstruct +// public void migrate() { +// Flyway flyway = Flyway.configure().dataSource( +// databaseProperties.getUrl(), +// databaseProperties.getUsername(), +// databaseProperties.getPassword()) +// .baselineOnMigrate(true) +// .load(); +// +// flyway.migrate(); +// } +// +//} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..128f1060ef --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.config.ModuleConfig; +import org.springframework.stereotype.Service; + +/** + * 模块配置信息-新闻公告模块 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Service +public class ModuleConfigImpl implements ModuleConfig { + @Override + public String getName() { + return "govaccess"; + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java new file mode 100644 index 0000000000..5196bd2c8c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java @@ -0,0 +1,69 @@ +package com.epmet.config; + +import com.epmet.commons.tools.enums.RequirePermissionEnum; +import com.epmet.entity.OperationEntity; +import com.epmet.service.OperationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.CollectionUtils; + +import javax.annotation.PostConstruct; +import java.util.*; + +@Configuration +public class PermissionInitializer { + + @Autowired + private OperationService operationService; + + /** + * 初始化操作权限 + */ + @PostConstruct + public void initOpePermissions() { + final Map existsOpesMap = new HashMap<>(); + List allExistsOpeEntities = operationService.listAllOperations(); + allExistsOpeEntities.stream().forEach(ope -> existsOpesMap.put(ope.getOperationKey(), ope)); + + ArrayList operations2Create = new ArrayList<>(); + ArrayList operations2Update = new ArrayList<>(); + + // 1.收集需要添加的 + List permEnums = Arrays.asList(RequirePermissionEnum.values()); + for (RequirePermissionEnum perm : permEnums) { + String key = perm.getKey(); + if (!existsOpesMap.containsKey(key)) { + OperationEntity operationEntity = new OperationEntity(); + operationEntity.setOperationKey(key); + operationEntity.setBrief(perm.getBrief()); + operationEntity.setOperationName(perm.getName()); + operations2Create.add(operationEntity); + } + } + + //2.收集需要修改的 + for (RequirePermissionEnum perm : permEnums) { + String key = perm.getKey(); + String name = perm.getName(); + String brief = perm.getBrief(); + if (existsOpesMap.containsKey(key)) { + OperationEntity ope = existsOpesMap.get(key); + if (!name.equals(ope.getOperationName()) || !brief.equals(ope.getBrief())) { + // name或者brief发生过变化的，需要更新 + ope.setBrief(brief); + ope.setOperationName(name); + operations2Update.add(ope); + } + } + } + + //3.批量添加和修改 + if (!CollectionUtils.isEmpty(operations2Create)) { + operationService.createBatch(operations2Create); + } + + if (!CollectionUtils.isEmpty(operations2Update)) { + operationService.updateBatch(operations2Update); + } + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java new file mode 100644 index 0000000000..f4aba15fbc --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java @@ -0,0 +1,53 @@ +package com.epmet.constant; + +/** + * 操作范围系列常量 + */ +public class OperationScopeConstant { + + /** + * ===================系列=================== + */ + public static final String SERIES_ORG_LEVEL = "org_level"; + public static final String SERIES_SWITCH = "switch"; + public static final String SERIES_ALL = "all"; + + /** + * ===================范围=================== + */ + // 无任何范围限制 + public static final String SCOPE_ALL = "all"; + + // 覆盖机构下的所有范围 + public static final String SCOPE_ORG_ALL = "org_all"; + + //"同级组织的下级" + public static final String SCOPE_ORG_EQUAL_SUB = "org_equal_sub"; + //"同级组织及下级" + public static final String SCOPE_ORG_EQUAL_AND_SUB = "org_equal_and_sub"; + // 同级组织的上级 + public static final String SCOPE_ORG_EQUAL_SUP = "org_equal_sup"; + // 同级组织及上级 + public static final String SCOPE_ORG_EQUAL_AND_SUP = "org_equal_and_sup"; + //"同级组织" + public static final String SCOPE_ORG_EQUAL = "org_equal"; + + //"本组织的下级" + public static final String SCOPE_ORG_CURR_SUB = "org_curr_sub"; + //"本组织及下级" + public static final String SCOPE_ORG_CURR_AND_SUB = "org_curr_and_sub"; + //"本组织" + public static final String SCOPE_ORG_CURR = "org_curr"; + + //"本组织的上级" + public static final String SCOPE_ORG_CURR_SUP = "org_curr_sup"; + //"本组织及上级" + public static final String SCOPE_ORG_CURR_AND_SUP = "org_curr_and_sup"; + + //我创建的 + public static final String SCOPE_I_CREATED = "i_created"; + //网格内 + public static final String SCOPE_IN_GRID = "in_grid"; + // 部门内 + public static final String SCOPE_IN_DEPARTMENT = "in_department"; +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java new file mode 100644 index 0000000000..76a7886947 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java @@ -0,0 +1,138 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.*; +import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; +import com.epmet.dto.result.AccessConfigOpesResultDTO; +import com.epmet.dto.result.AccessConfigOptionsResultDTO; +import com.epmet.dto.result.RoleOperationDefaultResultDTO; +import com.epmet.service.AccessConfigService; +import oracle.jdbc.proxy.annotation.Post; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotBlank; +import java.util.List; +import java.util.Set; + +@RestController +@RequestMapping("config") +public class AccessConfigController { + + @Autowired + private AccessConfigService accessConfigService; + + /** + * 根据roleKey查询角色默认操作列表(包括assigned字段，标识该角色是否已经具有该操作权限) + * @param roleKey + * @return + */ + @PostMapping("roledefaultops/{roleKey}") + public Result listRoleDefaultOps(@PathVariable("roleKey") String roleKey) { + List defaultOps = accessConfigService.listRoleDefaultOpsByRoleKey(roleKey); + return new Result().ok(defaultOps); + } + + /** + * 根据角色ID列出角色的操作列表(及该操作的scope范围) + * @param roleId + * @return + */ + @PostMapping("roleopes/{roleId}") + public Result listRoleOperations(@PathVariable("roleId") String roleId) { + List opes = accessConfigService.listOpesByRole(roleId); + return new Result().ok(opes); + } + + /** + * 保存角色的操作权限列表 + * @return + */ + @PostMapping("saveroleopes") + public Result saveRoleOpes(@RequestBody AccessConfigOpesFormDTO formDTO) { + accessConfigService.saveRoleOpes(formDTO.getRoleId(), formDTO.getOpes()); + return new Result(); + } + + /** + * 查询可配置项列表 + * @return + */ + @PostMapping("configoptions") + public Result listConfigOptions(@RequestBody AccessConfigOptionsFormDTO accessConfigFormDTO) { + ValidatorUtils.validateEntity(accessConfigFormDTO); + AccessConfigOptionsResultDTO options = accessConfigService.listScopeOptionsForAccessConfig(accessConfigFormDTO.getRoleId(), accessConfigFormDTO.getOperationKey()); + return new Result().ok(options); + } + + /** + * 保存设置 + * @param config + * @return + */ + @PostMapping("saveconfig") + public Result saveSettings(@RequestBody AccessConfigSaveConfigDTO config) { + ValidatorUtils.validateEntity(config); + String roleId = config.getRoleId(); + String operationKey = config.getOperationKey(); + Set scopeKeys = config.getScopeKeys(); + accessConfigService.saveConfig(roleId, operationKey, scopeKeys); + return new Result(); + } + + /** + * 保存角色默认操作权限列表 + * @param form + * @return + */ + @PostMapping("roledefaultopes/save") + public Result saveRoleDefaultOperations(@RequestBody AccessConfigRoleDefaultOpesFormDTO form) { + ValidatorUtils.validateEntity(form); + accessConfigService.saveRoleDefaultOperations(form.getRoleKey(), form.getOperationKeys()); + return new Result(); + } + + /** + * 查询操作的默认范围列表 + * @param form + * @return + */ + @PostMapping("opedefaultscopes/list") + public Result listOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) { + ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.ListOpeDefaultScopesGroup.class); + List scopes = accessConfigService.listOpeDefaultScopes4Role(form.getRoleKey(), form.getOperationKey()); + return new Result().ok(scopes); + } + + /** + * 保存操作的默认范围配置 + * @param form + * @return + */ + @PostMapping("opedefaultscopes/save") + public Result saveOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) { + ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.SaveOpeDefaultScopesGroup.class); + accessConfigService.saveOpeDefaultScopes(form.getRoleKey(), form.getOperationKey(), form.getScopeKeys()); + return new Result(); + } + + /** + * @Description 给角色添加操作权限和操作范围 + * @return + * @author wxz + * @date 2020.11.17 17:41 + */ + @PostMapping("add-ope-and-scopes-4role") + public Result addOpeAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) { + ValidatorUtils.validateEntity(form); + String roleKey = form.getRoleKey(); + String operationKey = form.getOperationKey(); + List scopeKeys = form.getScopeKeys(); + + accessConfigService.addOpeAndScopes4Role(roleKey, operationKey, scopeKeys); + return new Result(); + } + + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java new file mode 100644 index 0000000000..dad8f7e095 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java @@ -0,0 +1,60 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.*; +import com.epmet.service.AccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Set; + +/** + * 权限相关Api + * @Author wxz + * @Description + * @Date 2020/4/23 17:54 + **/ +@RestController +@RequestMapping("access") +public class AccessController { + + @Autowired + private AccessService accessService; + + /** + * 用户是否具有指定功能权限 + * @return + */ + @PostMapping("hasspecifiedpermission") + public Result hasSpecifiedPermission(@RequestBody HasSpecifiedPermissionFormDTO form) { + ValidatorUtils.validateEntity(form); + Boolean hasPermission = accessService.hasPermission(form.getOperationKey(), form.getUserId(), form.getApp(), form.getClient()); + return new Result().ok(hasPermission); + } + + /** + * 列出功能权限列表 + * @return + */ + @PostMapping("listoperationpermissions") + public Result> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO) { + ValidatorUtils.validateEntity(listOpePermsFormDTO); + String currAgencyId = listOpePermsFormDTO.getCurrAgencyId(); + String staffId = listOpePermsFormDTO.getStaffId(); + Set operationPermissions = accessService.listOperationPermissions(staffId, currAgencyId); + return new Result>().ok(operationPermissions); + } + + /** + * 查询sql过滤片段 + * @param form + * @return + */ + @PostMapping("getSqlFilterSegment") + public Result getSqlFilterSegment(@RequestBody GetSQLFilterFormDTO form) { + ValidatorUtils.validateEntity(form); + String sqlFilterSegment = accessService.getSqlFilterSegment(form); + return new Result().ok(sqlFilterSegment); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java new file mode 100644 index 0000000000..357ea2c9af --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java @@ -0,0 +1,64 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.constraints.NotBlank; + +@RestController +@RequestMapping("demo") +public class DemoController { + + @PostMapping("adduser") + public Result addUser(@RequestBody UserFormDTO form) { + ValidatorUtils.validateEntity(form, UserFormDTO.AddUserShowGroup.class, UserFormDTO.AddUserInternalGroup.class); + System.out.println(form); + return new Result(); + } + +} + +@Data +class UserFormDTO { + //>>>>>>>>>>>>>>>>>校验分组开始>>>>>>>>>>>>>>>>>>>>> + /** + * 添加用户操作的内部异常分组 + * 出现错误会提示给前端7000错误码，返回信息为：服务器开小差... + */ + public interface AddUserInternalGroup {} + + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup {} + + // <<<<<<<<<<<<<<<<<<<校验分组结束<<<<<<<<<<<<<<<<<<<<<<<< + + /** + * 该字段在查询用户和添加用户的时候都要校验，所以在groups中会添加2个分组，校验器会优先校验继承了CustomerClientShowGroup + * 的分组 + * 1.该分组校验出错，直接将信息返回客户端，(多个字段有错误，多个字段的错误信息 + * 拼接起来，逗号分隔,详见ValidatorUtils#validadtorEntity()方法) + * 2.该分组校验成功，则继续往下，校验内部错误，若出现内部错误，则返回7000,服务器开小差... + */ + @NotBlank(message = "请输入姓名信息", groups = { AddUserInternalGroup.class, AddUserShowGroup.class }) + private String name; + + /** + * 用户别名，只在内部传输，因此它所属的分组不能继承CustomerClientShowGroup + */ + @NotBlank(message = "用户别名不能为空", groups = { AddUserInternalGroup.class }) + private String alias; + + @NotBlank(message = "请输入地址信息", groups = { AddUserShowGroup.class }) + private String address; + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java new file mode 100644 index 0000000000..85e8bce73d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java @@ -0,0 +1,85 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.GovLanguageDTO; +import com.epmet.service.GovLanguageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 国际化 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@RestController +@RequestMapping("operlanguage") +public class GovLanguageController { + + @Autowired + private GovLanguageService govLanguageService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = govLanguageService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GovLanguageDTO data = govLanguageService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GovLanguageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + govLanguageService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GovLanguageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + govLanguageService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + govLanguageService.delete(ids); + return new Result(); + } + + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java new file mode 100644 index 0000000000..d3a67c889f --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -0,0 +1,156 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.ErrorCode; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.result.MenuResourceDTO; +import com.epmet.service.GovMenuService; +import com.epmet.service.GovResourceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * + * 菜单管理 + * + * @author zhaoqifeng + * @date 2020/3/17 16:35 + */ +@RestController +@RequestMapping("menu") +public class GovMenuController { + + @Autowired + private GovMenuService govMenuService; + + @Autowired + private GovResourceService govResourceService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = govMenuService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GovMenuDTO data = govMenuService.get(id); + + //菜单资源列表 + List resourceList = govResourceService.getMenuResourceList(id); + + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + govMenuService.save(dto,tokenDto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + govMenuService.update(dto,tokenDto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + govMenuService.delete(ids); + return new Result(); + } + + @DeleteMapping("{id}") + public Result delete(@PathVariable("id") String id, @LoginUser TokenDto tokenDto){ + //效验数据 + AssertUtils.isNull(id, "id"); + + //判断是否有子菜单或按钮 + List list = govMenuService.getListPid(id); + if(list.size() > 0){ + return new Result().error(ErrorCode.SUB_MENU_EXIST); + } + + govMenuService.delete(id, tokenDto); + + return new Result(); + } + + + /** + * 获取菜单列表 + * @param type 类型 + * @return Result> + */ + @GetMapping("list") + public Result> list(Integer type){ + List list = govMenuService.getMenuList(type); + + return new Result>().ok(list); + } + + /** + * 导航 + * @param tokenDto token + * @return List + */ + @GetMapping("nav") + public Result> nav(@LoginUser TokenDto tokenDto){ + List list = govMenuService.getUserMenuNavList(tokenDto); + return new Result>().ok(list); + } + + /** + * 权限标识 + * @param tokenDto token + * @return Set + */ + @GetMapping("permissions") + public Result> permissions(@LoginUser TokenDto tokenDto){ + Set set = govMenuService.getUserPermissions(tokenDto); + return new Result>().ok(set); + } + + /** + * 角色菜单权限 + * @param tokenDto token + * @return + */ + @GetMapping("select") + public Result> select(@LoginUser TokenDto tokenDto){ + List list = govMenuService.getUserMenuList(tokenDto, null); + + return new Result>().ok(list); + } + + /** + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 运营端用户退出系统，清空菜单和操作权限 + * @Date 2020/5/21 18:07 + **/ + @GetMapping("cleargovuseraccess") + public Result clearGovUserAccess(@LoginUser TokenDto tokenDto) { + govMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); + return new Result(); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java new file mode 100644 index 0000000000..72193db454 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java @@ -0,0 +1,84 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.GovResourceDTO; +import com.epmet.service.GovResourceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@RestController +@RequestMapping("govresource") +public class GovResourceController { + + @Autowired + private GovResourceService govResourceService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = govResourceService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GovResourceDTO data = govResourceService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GovResourceDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + govResourceService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GovResourceDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + govResourceService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + govResourceService.delete(ids); + return new Result(); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java new file mode 100644 index 0000000000..7a1ded893c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.GovRoleDTO; +import com.epmet.service.GovRoleMenuService; +import com.epmet.service.GovRoleService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@RestController +@RequestMapping("govrole") +public class GovRoleController { + + @Autowired + private GovRoleService govRoleService; + @Autowired + private GovRoleMenuService govRoleMenuService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = govRoleService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GovRoleDTO data = govRoleService.get(id); + + //查询角色对应的菜单 + List menuIdList = govRoleMenuService.getMenuIdList(id); + data.setMenuIdList(menuIdList); + + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GovRoleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + govRoleService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GovRoleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + govRoleService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + govRoleService.delete(ids); + return new Result(); + } + + + @GetMapping("list") + @ApiOperation("列表") + public Result> list(){ + List data = govRoleService.list(new HashMap<>(1)); + + return new Result>().ok(data); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java new file mode 100644 index 0000000000..8b8a7d8aed --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java @@ -0,0 +1,85 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.GovRoleMenuDTO; +import com.epmet.service.GovRoleMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 角色菜单关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@RestController +@RequestMapping("govrolemenu") +public class GovRoleMenuController { + + @Autowired + private GovRoleMenuService govRoleMenuService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = govRoleMenuService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GovRoleMenuDTO data = govRoleMenuService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GovRoleMenuDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + govRoleMenuService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GovRoleMenuDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + govRoleMenuService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + govRoleMenuService.delete(ids); + return new Result(); + } + + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java new file mode 100644 index 0000000000..fcd5733a4d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java @@ -0,0 +1,132 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.GovRoleUserDTO; +import com.epmet.service.GovRoleUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + + +/** + * 角色用户关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@RestController +@RequestMapping("govroleuser") +public class GovRoleUserController { + + @Autowired + private GovRoleUserService govRoleUserService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = govRoleUserService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GovRoleUserDTO data = govRoleUserService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GovRoleUserDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + govRoleUserService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GovRoleUserDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + govRoleUserService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + govRoleUserService.delete(ids); + return new Result(); + } + + + /** + * 获取权限id列表 + * @param id 用户id + * @return List + * @author zhaoqifeng + */ + @GetMapping("getRoleIdList/{id}") + public Result>getRoleIdList(@PathVariable("id") String id) { + List list = govRoleUserService.getRoleIdList(id); + return new Result>().ok(list); + } + + /** + * 保存更新权限 + * @param userId 用户id + * @param roleIdList 权限列表 + * @author zhaoqifeng + */ + @PostMapping("saveOrUpdateRole") + public Result saveOrUpdate(@RequestParam("userId") String userId, @RequestBody List roleIdList) { + govRoleUserService.saveOrUpdate(userId, roleIdList); + return new Result(); + } + + /** + * 根据用户id，删除角色用户关系 + * @param id 用户id + * @return Result + */ + @PostMapping("deleteByUserId") + public Result deleteByUserId(String id) { + govRoleUserService.deleteByUserId(id); + return new Result(); + } + + /** + * 根据用户ids，删除角色用户关系 + * @param ids 用户ids + * @return Result + */ + @PostMapping("deleteByUserIds") + public Result deleteByUserIds(@RequestBody String[] ids) { + govRoleUserService.deleteByUserIds(ids); + return new Result(); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java new file mode 100644 index 0000000000..5b7c01e23e --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java @@ -0,0 +1,41 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.InitDefaultOperationsFormDTO; +import com.epmet.dto.result.RoleOperationResultDTO; +import com.epmet.service.RoleOperationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("role") +public class RoleController { + + @Autowired + private RoleOperationService roleOperationService; + + /** + * 查询角色对应的操作列表 + * @param roleId + * @return + */ + @PostMapping("operations/{roleId}") + public Result> listOperationsByRoleId(@PathVariable("roleId") String roleId) { + List roleOperationResultDTOS = roleOperationService.listOperationsByRoleId(roleId); + return new Result>().ok(roleOperationResultDTOS); + } + + /** + * 批量为角色ID初始化操作权限列表 + * @param formDTO + * @return + */ + @PostMapping("initdefaultoperationsforroles") + public Result initDefaultOperationsForRoles(@RequestBody InitDefaultOperationsFormDTO formDTO) { + List roles = formDTO.getRoles(); + roleOperationService.initDefaultOperationsForRoles(roles); + return new Result(); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java new file mode 100644 index 0000000000..b8ab2dbda6 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java @@ -0,0 +1,25 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.ExternalRequestAuth; +import com.epmet.service.TestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("test") +public class TestController { + + @Autowired + private TestService testService; + + @ExternalRequestAuth + @GetMapping("test") + public void test() { + System.out.println("TestController -> test()"); + testService.test(); + } + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java new file mode 100644 index 0000000000..acd505c019 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.GovLanguageEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 国际化 + * + * @author Mark sunlightcs@gmail.com + */ +@Mapper +public interface GovLanguageDao extends BaseDao { + + GovLanguageEntity getLanguage(GovLanguageEntity entity); + + void updateLanguage(GovLanguageEntity entity); + + void insertOperLanguageEntity(GovLanguageEntity entity); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java new file mode 100644 index 0000000000..1e36bff758 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.GovMenuEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 菜单管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Mapper +public interface GovMenuDao extends BaseDao { + + GovMenuEntity getById(@Param("id") String id, @Param("language") String language); + + /** + * 查询所有菜单列表 + * + * @param type 菜单类型 + * @param language 语言 + */ + List getMenuList(@Param("type") Integer type, @Param("language") String language); + + /** + * 查询用户菜单列表 + * + * @param userId 用户ＩＤ + * @param type 菜单类型 + * @param language 语言 + */ + List getUserMenuList(@Param("userId") String userId, @Param("type") Integer type, @Param("language") String language); + + + /** + * 根据父菜单，查询子菜单 + * @param pid 父菜单ID + */ + List getListPid(String pid); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java new file mode 100644 index 0000000000..4970d56e9c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.GovResourceEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 资源管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Mapper +public interface GovResourceDao extends BaseDao { + /** + * 根据资源编码，删除对应的资源 + * @param code 资源编码 + */ + void deleteByCode(String code); + + /** + * 获取资源列表 + * @param menuId 菜单ID + */ + List getMenuResourceList(String menuId); + + /** + * 获取所有资源列表 + */ + List getResourceList(); + + /** + * 获取用户资源列表 + * @param userId 用户ID + */ + List getUserResourceList(@Param("userId") String userId); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java new file mode 100644 index 0000000000..768fc42792 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.GovRoleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 角色管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Mapper +public interface GovRoleDao extends BaseDao { + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java new file mode 100644 index 0000000000..dc0559acb3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.GovRoleMenuEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 角色菜单关系 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Mapper +public interface GovRoleMenuDao extends BaseDao { + + /** + * 根据角色ID，获取菜单ID列表 + */ + List getMenuIdList(String roleId); + + /** + * 根据角色id，删除角色菜单关系 + * @param roleId 角色id + */ + void deleteByRoleId(String roleId); + + /** + * 根据菜单id，删除角色菜单关系 + * @param menuId 菜单id + */ + void deleteByMenuId(String menuId); + + + /** + * 根据角色ids，删除角色菜单关系 + * @param roleIds 角色ids + */ + void deleteByRoleIds(String[] roleIds); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java new file mode 100644 index 0000000000..bf400e0584 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java @@ -0,0 +1,57 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.GovRoleUserEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 角色用户关系 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Mapper +public interface GovRoleUserDao extends BaseDao { + + /** + * 根据角色ids，删除角色用户关系 + * @param roleIds 角色ids + */ + void deleteByRoleIds(String[] roleIds); + + /** + * 根据用户ids，删除角色用户关系 + * @param userIds 用户ids + */ + void deleteByUserIds(String[] userIds); + + /** + * 根据角色id，删除角色用户关系 + * @param roleId 角色id + */ + void deleteByRoleId(String roleId); + + /** + * 根据用户id，删除角色用户关系 + * @param userId 用户id + */ + void deleteByUserId(String userId); + + /** + * 角色ID列表 + * @param userId 用户ID + * + * @return + */ + List getRoleIdList(String userId); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java new file mode 100644 index 0000000000..6b34908dde --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java @@ -0,0 +1,38 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.OperationEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 操作类型表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-30 + */ +@Mapper +public interface OperationDao extends BaseDao { + + List listAllOperationEntities(); + + List listAllValidOperationEntities(); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java new file mode 100644 index 0000000000..98a455f052 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java @@ -0,0 +1,57 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.RoleOpeScopeResultDTO; +import com.epmet.entity.OperationScopeEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.context.annotation.Scope; + +import java.util.List; +import java.util.Set; + +/** + * 权限范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Mapper +public interface OperationScopeDao extends BaseDao { + + /** + * 查询角色的操作key对应操作范围列表 + * @param roleId 角色id + * @param operationKey 操作key + * @return + */ + Set listOperationScopesByRoleId(@Param("roleId") String roleId, + @Param("operationKey") String operationKey); + + /** + * 查询角色所有operation及其范围 + * @param roleId + */ + List listAllRoleOperationScopesByRoleId(String roleId); + + String getDefaultScopeKeyForOperation(@Param("operationKey") String operationKey); + + String getScopeIndexByScopeKey(@Param("scopeKey") String scopeKey); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java new file mode 100755 index 0000000000..2c9a049e83 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java @@ -0,0 +1,64 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; +import com.epmet.dto.result.OperationScopeDefaultResultDTO; +import com.epmet.entity.OperationScopeDefaultEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 默认操作范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-17 + */ +@Mapper +public interface OperationScopeDefaultDao extends BaseDao { + List listAllValid(); + + /** + * 根据角色key和操作key查询默认操作权限列表 + * @param roleKey + * @return + */ + List listDefaultOpeScopes(@Param("roleKey") String roleKey); + + /** + * 查询操作的默认范围 + * @param roleKey + * @param operationKey + * @return + */ + List listOpeDefaultScopes4Config( + @Param("roleKey") String roleKey, + @Param("operationKey") String operationKey); + + List listOpeDefaultScopesByRoleAndOpeKey( + @Param("roleKey") String roleKey, + @Param("operationKey") String operationKey); + + int delete( + @Param("roleKey") String roleKey, + @Param("operationKey") String operationKey, + @Param("scopeKey") String scopeKey); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java new file mode 100644 index 0000000000..46a159e3b6 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.AccessConfigOpesResultDTO; +import com.epmet.dto.result.RoleOperationResultDTO; +import com.epmet.entity.RoleOperationEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Mapper +public interface RoleOperationDao extends BaseDao { + + List listOperationsByRoleId(@Param("roleId") String roleId); + + List listOpesForAccessConfig(@Param("roleId") String roleId); + + void deleteRoleOpe(@Param("roleId") String roleId, @Param("opeKey") String opeKey); + + RoleOperationEntity getRoleOpe(@Param("roleId") String roleId, @Param("opeKey") String opeKey); + + int enableRoleOpe(@Param("roleId") String roleId, @Param("opeKey") String opeKey); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java new file mode 100755 index 0000000000..19ccbf901e --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java @@ -0,0 +1,57 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; +import com.epmet.dto.result.RoleOperationDefaultResultDTO; +import com.epmet.entity.RoleOperationDefaultEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; + +/** + * 角色默认的可操作功能列表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-21 + */ +@Mapper +public interface RoleOperationDefaultDao extends BaseDao { + + /** + * 查询可用 + * @return + */ + List listAllValid(); + + /** + * 查询某个roleKey的所有默认操作权限 + * @param roleKey + * @return + */ + List listByRoleKey(@Param("roleKey") String roleKey); + + List listRoleDefaultOpsByRoleKey(@Param("roleKey") String roleKey); + + int deleteByRoleKeyAndOpeKey( + @Param("roleKey") String roleKey, + @Param("operationKey") String operationKey); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java new file mode 100644 index 0000000000..3199a78e3d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java @@ -0,0 +1,85 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.AccessConfigScopeResultDTO; +import com.epmet.entity.RoleScopeEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Set; + +/** + * 角色能操作哪些范围 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Mapper +public interface RoleScopeDao extends BaseDao { + + /** + * 权限配置：列出可选项 + * @param roleId + * @param operationKey + * @return + */ + List listScopeOptionsForAccessConfig(@Param("roleId") String roleId, @Param("operationKey") String operationKey); + + /** + * + * @param roleId + * @param operationKey + * @return + */ + List listScopeEntities(@Param("roleId") String roleId, @Param("operationKey") String operationKey); + + /** + * 使用roleId+OperationKey+ScopeKey删除 + * @param roleId + * @param operationKey + * @param scopeKeys2Remove + * @return + */ + int deleteByRoleIdAndOpeKey(@Param("roleId") String roleId, + @Param("operationKey") String operationKey, + @Param("scopeKeys2Remove") Set scopeKeys2Remove); + + /** + * 启用 + * @param roleId + * @param operationKey + * @param scopeKey + * @return + */ + int enableByRoleIdAndOpeKey(@Param("roleId") String roleId, + @Param("operationKey") String operationKey, + @Param("scopeKey") String scopeKey); + + /** + * 使用RoleId + operationKey + scopeKey + * @param roleId + * @param operationKey + * @param scopeKey + */ + RoleScopeEntity getByRoleIdAndOpeKey(@Param("roleId") String roleId, + @Param("operationKey") String operationKey, + @Param("scopeKey") String scopeKey); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java new file mode 100644 index 0000000000..ee84f846d9 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 国际化 + * + * @author Mark sunlightcs@gmail.com + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("gov_language") +public class GovLanguageEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 表名 + */ + private String tableName; + /** + * 表主键 + */ + private String tableId; + /** + * 字段名 + */ + private String fieldName; + /** + * 字段值 + */ + private String fieldValue; + /** + * 语言 + */ + private String language; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java new file mode 100644 index 0000000000..fcb8a5fa38 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 菜单管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("gov_menu") +public class GovMenuEntity extends BaseEpmetEntity { + private static final long serialVersionUID = 1L; + + /** + * 上级ID，一级菜单为0 + */ + private String pid; + /** + * 菜单名称 + */ + @TableField(exist = false) + private String name; + /** + * 菜单URL + */ + private String url; + /** + * 类型 0：菜单 1：按钮 + */ + private Integer type; + /** + * 菜单图标 + */ + private String icon; + /** + * 权限标识，如：sys:menu:save + */ + private String permissions; + /** + * 排序 + */ + private Integer sort; + /** + * 上级菜单名称 + */ + @TableField(exist = false) + private String parentName; + + /** + * 是否显示，1：显示 0不显示 + */ + private Integer showFlag; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java new file mode 100644 index 0000000000..1d5d716c22 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java @@ -0,0 +1,53 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 资源管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("gov_resource") +public class GovResourceEntity extends BaseEpmetEntity { + private static final long serialVersionUID = 1L; + + /** + * 资源编码，如菜单ID + */ + private String resourceCode; + /** + * 资源名称 + */ + private String resourceName; + /** + * 资源URL + */ + private String resourceUrl; + /** + * 请求方式（如：GET、POST、PUT、DELETE） + */ + private String resourceMethod; + /** + * 菜单标识 0：非菜单资源 1：菜单资源 + */ + private Integer menuFlag; + /** + * 认证等级 0：权限认证 1：登录认证 2：无需认证 + */ + private Integer authLevel; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java new file mode 100644 index 0000000000..4bc4575836 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 角色管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("gov_role") +public class GovRoleEntity extends BaseEpmetEntity { + private static final long serialVersionUID = 1L; + + /** + * 角色名称 + */ + private String name; + /** + * 备注 + */ + private String remark; + /** + * 部门ID + */ + @TableField(fill = FieldFill.INSERT) + private Long deptId; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java new file mode 100644 index 0000000000..6ea4d1f2a5 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 角色菜单关系 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("gov_role_menu") +public class GovRoleMenuEntity extends BaseEpmetEntity { + private static final long serialVersionUID = 1L; + /** + * 角色ID + */ + private String roleId; + /** + * 菜单ID + */ + private String menuId; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java new file mode 100644 index 0000000000..599ca7f3e2 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 角色用户关系 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("gov_role_user") +public class GovRoleUserEntity extends BaseEpmetEntity { + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + private String roleId; + /** + * 用户ID + */ + private String userId; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java new file mode 100644 index 0000000000..e599d8c28f --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java @@ -0,0 +1,56 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 操作类型表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("operation") +public class OperationEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String operationKey; + + /** + * + */ + private String operationName; + + /** + * 操作简介 + */ + private String brief; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java new file mode 100755 index 0000000000..6ec89eb12b --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java @@ -0,0 +1,53 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 默认操作范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("operation_scope_default") +public class OperationScopeDefaultEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + private String roleKey; + + /** + * 操作key + */ + private String operationKey; + + /** + * 范围key + */ + private String scopeKey; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java new file mode 100644 index 0000000000..2c7223d97d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java @@ -0,0 +1,55 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 权限范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("operation_scope") +public class OperationScopeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 范围key + */ + private String scopeKey; + + /** + * 范围名称 + */ + private String scopeName; + + private String scopeIndex; + private String series; + private Integer sort; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java new file mode 100755 index 0000000000..8ea82b13b9 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java @@ -0,0 +1,42 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("role_operation_default") +public class RoleOperationDefaultEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 角色KEY + */ + private String roleKey; + + /** + * 操作key + */ + private String operationKey; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java new file mode 100644 index 0000000000..96f70de1be --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java @@ -0,0 +1,51 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("role_operation") +public class RoleOperationEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java new file mode 100644 index 0000000000..2c3c6f21dc --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java @@ -0,0 +1,56 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 角色能操作哪些范围 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("role_scope") +public class RoleScopeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + private String roleId; + + /** + * 操作key + */ + private String operationKey; + + /** + * 范围Key + */ + private String scopeKey; + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java new file mode 100644 index 0000000000..4b0c4ee373 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java @@ -0,0 +1,62 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Data +public class RoleOperationExcel { + + @Excel(name = "") + private String id; + + @Excel(name = "角色ID") + private String roleId; + + @Excel(name = "操作key") + private String operationKey; + + @Excel(name = "是否删除，0：未删除，1：已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建者id") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新者id") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java new file mode 100644 index 0000000000..d88b8358a3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -0,0 +1,77 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.GovStaffRoleDTO; +import com.epmet.dto.OperUserDTO; +import com.epmet.dto.form.LatestGridFormDTO; +import com.epmet.dto.form.StaffGridVisitedFormDTO; +import com.epmet.dto.form.StaffRoleFormDTO; +import com.epmet.dto.result.CustomerGridByUserIdResultDTO; +import com.epmet.dto.result.LatestCustomerResultDTO; +import com.epmet.feign.fallback.EpmetUserFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + + +/** + * @Description + * @Author sun + */ +//, url = "localhost:8087" +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class) +public interface EpmetUserFeignClient { + /** + * 获取最近一次登录的客户信息 + * + * @param userId + * @return + */ + @GetMapping("/epmetuser/staffagencyvisited/getlatestcustomer/{userId}") + Result getLatestCustomer(@PathVariable("userId") String userId); + + /** + * @Description 查询工作人员上次登录的网格 + * @Param customerId ; staffId + * @return Result + * @Author wangc + * @Date 2020.04.23 10:44 + **/ + @PostMapping(value = "/epmetuser/staffgridvisited/getstafflatestgrid") + Result getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO); + + /** + * @param staffGridVisitedFormDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存网格访问记录 + * @Date 2020/4/23 13:27 + **/ + @PostMapping(value = "/epmetuser/staffgridvisited/savestaffgridvisitedrecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveStaffGridVisitedRecord(@RequestBody StaffGridVisitedFormDTO staffGridVisitedFormDTO); + /** + * 查询工作人员的角色 + * @return + */ + @PostMapping("/epmetuser/staffrole/staffroles") + Result> getRolesOfStaff(StaffRoleFormDTO staffRoleFormDTO); + + /** + * + * 根据id查询运营人员详情 + * + * @param operUserId oper_user表主键 + * @return com.epmet.commons.tools.utils.Result> + * @author zhaoqifeng + * @date 2020/3/19 09:28 + **/ + @GetMapping("/operuser/queryOperUserDtoById/{operUserId}") + Result info(@PathVariable("operUserId") String operUserId); +} + diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..c9f2e3eada --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,34 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Description + * @Author sun + */ +//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092") +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { + + /** + * 根据Id查询agency + * @param agencyId + * @return + */ + @PostMapping("/gov/org/agency/agencybyid/{agencyId}") + Result getAgencyById(@PathVariable("agencyId") String agencyId); + + /** + * 根据staffId查询所属的组织机构 + * @param staffId + * @return + */ + @PostMapping("/gov/org/agency/agencybystaff/{staffId}") + Result getAgencyByStaff(@PathVariable("staffId") String staffId); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java new file mode 100644 index 0000000000..cd39c87452 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java @@ -0,0 +1,49 @@ +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.GovStaffRoleDTO; +import com.epmet.dto.OperUserDTO; +import com.epmet.dto.form.LatestGridFormDTO; +import com.epmet.dto.form.StaffGridVisitedFormDTO; +import com.epmet.dto.form.StaffRoleFormDTO; +import com.epmet.dto.result.CustomerGridByUserIdResultDTO; +import com.epmet.dto.result.LatestCustomerResultDTO; +import com.epmet.feign.EpmetUserFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Description + * @Author sun + */ +@Component +public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { + + @Override + public Result getLatestCustomer(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestCustomer", userId); + } + + @Override + public Result> getRolesOfStaff(StaffRoleFormDTO staffRoleFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRolesOfStaff"); + } + + @Override + public Result info(String operUserId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "info", operUserId); + } + + @Override + public Result getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffLatestGrid",latestGridFormDTO); + } + @Override + public Result saveStaffGridVisitedRecord(StaffGridVisitedFormDTO staffGridVisitedFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffGridVisitedRecord", staffGridVisitedFormDTO); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..f418de95e0 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,31 @@ +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.CustomerAgencyDTO; +import com.epmet.dto.form.LatestGridFormDTO; +import com.epmet.dto.result.CustomerGridByUserIdResultDTO; +import com.epmet.dto.result.LatestCustomerResultDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Description + * @Author sun + */ +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + @Override + public Result getAgencyById(String agencyId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyById", agencyId); + } + + @Override + public Result getAgencyByStaff(String staffId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaff", staffId); + } +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java new file mode 100644 index 0000000000..8f9595582b --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 国际化 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Component +public class GovLanguageRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java new file mode 100644 index 0000000000..361d6c3014 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java @@ -0,0 +1,74 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.HttpContextUtils; +import com.epmet.dto.GovMenuDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Set; + +/** + * 菜单管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Component +public class GovMenuRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(String userId, String app, String client) { + redisUtils.deleteByPattern(RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage())); + redisUtils.delete(RedisKeys.getUserPermissionsKey(userId, app, client)); + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + + public void setUserMenuNavList(String userId, String app, String client, List menuList){ + String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage()); + redisUtils.set(key, menuList); + } + + public List getUserMenuNavList(String userId, String app, String client){ + String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage()); + return (List)redisUtils.get(key); + } + + public void setUserPermissions(String userId, String app, String client, Set permsSet){ + String key = RedisKeys.getUserPermissionsKey(userId, app, client); + redisUtils.set(key, permsSet); + } + + public Set getUserPermissions(String userId, String app, String client){ + String key = RedisKeys.getUserPermissionsKey(userId, app, client); + return (Set)redisUtils.get(key); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java new file mode 100644 index 0000000000..e21bd5095c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java @@ -0,0 +1,50 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Component +public class GovResourceRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete() { + String key = RedisKeys.getSysResourceKey(); + + redisUtils.delete(key); + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java new file mode 100644 index 0000000000..c778d22c7d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 角色菜单关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Component +public class GovRoleMenuRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java new file mode 100644 index 0000000000..3e87e447dd --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Component +public class GovRoleRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java new file mode 100644 index 0000000000..7a7aad6c8c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 角色用户关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Component +public class GovRoleUserRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java new file mode 100644 index 0000000000..af82f0f8b5 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java @@ -0,0 +1,74 @@ +package com.epmet.redis; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.dto.result.RoleOpeScopeResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Set; + +/** + * 角色的操作权限对应的操作范围Redis + */ +@Component +public class RoleOpeScopeRedis { + + @Autowired + private RedisUtils redisUtils; + + /** + * 缓存角色操作范围 + * @param roleId + * @param opeKey + * @param scopes + */ + public void setRoleOpeScopes(String roleId, String opeKey, Set scopes) { + String roleOpeScopesKey = RedisKeys.getRoleOpeScopesKey(roleId, opeKey); + redisUtils.set(roleOpeScopesKey, scopes); + } + + /** + * 缓存角色所有的操作范围 + * @param roleId + * @param scopes + */ + public void setRoleAllOpeScopes(String roleId, List scopes) { + String roleAllOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId); + redisUtils.setString(roleAllOpeScopesKey, JSON.toJSONString(scopes)); + } + + /** + * 查询角色操作范围 + * @param roleId + * @param opeKey + * @return + */ + public Set getRoleOpeScopes(String roleId, String opeKey) { + String roleOpeScopesKey = RedisKeys.getRoleOpeScopesKey(roleId, opeKey); + return (Set)redisUtils.get(roleOpeScopesKey); + } + + /** + * 查询角色所有操作范围 + * @param roleId + * @return + */ + public List getRoleAllOpeScopes(String roleId) { + String roleOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId); + String stringValue = redisUtils.getString(roleOpeScopesKey); + return JSON.parseObject(stringValue, new TypeReference>(){}); + } + + /** + * 删除缓存 + * @param roleId + */ + public void delRoleAllOpeScopes(String roleId) { + redisUtils.delete(RedisKeys.getRoleAllOpeScopesKey(roleId)); + } + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java new file mode 100644 index 0000000000..508f3ad45f --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java @@ -0,0 +1,30 @@ +package com.epmet.service; + +import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO; +import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; +import com.epmet.dto.result.AccessConfigOpesResultDTO; +import com.epmet.dto.result.AccessConfigOptionsResultDTO; +import com.epmet.dto.result.RoleOperationDefaultResultDTO; + +import java.util.List; +import java.util.Set; + +public interface AccessConfigService { + List listOpesByRole(String roleId); + + void saveRoleOpes(String roleId, List opes); + + AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey); + + void saveConfig(String roleId, String operationKey, Set scopeKeys); + + List listRoleDefaultOpsByRoleKey(String roleKey); + + void saveRoleDefaultOperations(String roleKey, List operationKeys); + + List listOpeDefaultScopes4Role(String roleKey, String operationKey); + + void saveOpeDefaultScopes(String roleKey, String operationKey, List scopeKeys); + + void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java new file mode 100644 index 0000000000..7b365fa21b --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java @@ -0,0 +1,44 @@ +package com.epmet.service; + +import com.epmet.dto.form.GetSQLFilterFormDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; +import com.epmet.dto.result.RoleOpeScopeResultDTO; + +import java.util.List; +import java.util.Set; + +public interface AccessService { + + /** + * 查询登陆用户登陆信息 + * @return + */ + LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId); + + /** + * 查询角色所有operation及其范围(缓存) + * @param roleId + * @return + */ + List listAllRoleOperationScopesByRoleId(String roleId); + + /** + * 角色 + * @param operationKey + * @param userId + * @return + */ + Boolean hasPermission(String operationKey, String userId, String app, String client); + + /** + * 生成sql过滤脚本 + * @param form + */ + String getSqlFilterSegment(GetSQLFilterFormDTO form); + + /** + * 列出角色的功能权限 + * @return + */ + Set listOperationPermissions(String staffId, String currAgencyId); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java new file mode 100644 index 0000000000..1f4a5e65e3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java @@ -0,0 +1,105 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.GovLanguageDTO; +import com.epmet.entity.GovLanguageEntity; + +import java.util.List; +import java.util.Map; + +/** + * 国际化 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +public interface GovLanguageService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GovLanguageDTO + * @author generator + * @date 2020-03-18 + */ + GovLanguageDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(GovLanguageDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(GovLanguageDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + + /** + * 保存或更新 + * @param tableName 表名 + * @param tableId 表主键 + * @param fieldName 字段名 + * @param fieldValue 字段值 + * @param language 语言 + */ + void saveOrUpdate(String tableName, String tableId, String fieldName, String fieldValue, String language); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java new file mode 100644 index 0000000000..b5c0cf12a3 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java @@ -0,0 +1,144 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.GovMenuDTO; +import com.epmet.entity.GovMenuEntity; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * 菜单管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +public interface GovMenuService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GovMenuDTO + * @author generator + * @date 2020-03-18 + */ + GovMenuDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(GovMenuDTO dto, TokenDto tokenDto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(GovMenuDTO dto, TokenDto tokenDto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + + /** + * 删除 + * + * @param id id + * @author generator + * @date 2020-03-18 + */ + void delete(String id, TokenDto tokenDto); + + /** + * 用户菜单列表 + * + * @param tokenDto 用户信息 + * @param type 菜单类型 + * @return java.util.List + */ + List getUserMenuList(TokenDto tokenDto, Integer type); + + /** + * 菜单列表 + * + * @param type 菜单类型 + */ + List getMenuList(Integer type); + + /** + * 用户菜单导航 + * @param tokenDto 用户信息 + * @return java.util.List + */ + List getUserMenuNavList(TokenDto tokenDto); + + /** + * 获取用户权限标识 + * @param tokenDto 用户信息 + * @return java.util.Set + */ + Set getUserPermissions(TokenDto tokenDto); + + /** + * 根据父菜单，查询子菜单 + * @param pid 父菜单ID + */ + List getListPid(String pid); + + void clearOperUserAccess(String app, String client, String userId); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java new file mode 100644 index 0000000000..8b6b8f5e6d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java @@ -0,0 +1,110 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.GovResourceDTO; +import com.epmet.dto.result.MenuResourceDTO; +import com.epmet.entity.GovResourceEntity; + +import java.util.List; +import java.util.Map; + +/** + * 资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +public interface GovResourceService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GovResourceDTO + * @author generator + * @date 2020-03-18 + */ + GovResourceDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(GovResourceDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(GovResourceDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + + /** + * 保存菜单资源 + * @param menuId 菜单ID + * @param menuName 菜单名称 + * @param resourceList 资源列表 + */ + void saveMenuResource(String menuId, String menuName, List resourceList); + + /** + * 获取菜单资源列表 + * @param menuId 菜单ID + */ + List getMenuResourceList(String menuId); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java new file mode 100644 index 0000000000..7b0d2af34a --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java @@ -0,0 +1,125 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.GovRoleMenuDTO; +import com.epmet.entity.GovRoleMenuEntity; + +import java.util.List; +import java.util.Map; + +/** + * 角色菜单关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +public interface GovRoleMenuService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GovRoleMenuDTO + * @author generator + * @date 2020-03-18 + */ + GovRoleMenuDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(GovRoleMenuDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(GovRoleMenuDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + + /** + * 根据角色ID，获取菜单ID列表 + */ + List getMenuIdList(String roleId); + + /** + * 保存或修改 + * @param roleId 角色ID + * @param menuIdList 菜单ID列表 + */ + void saveOrUpdate(String roleId, List menuIdList); + + /** + * 根据角色id，删除角色菜单关系 + * @param roleId 角色id + */ + void deleteByRoleId(String roleId); + + /** + * 根据角色ids，删除角色菜单关系 + * @param roleIds + */ + void deleteByRoleIds(String[] roleIds); + + /** + * 根据菜单id，删除角色菜单关系 + * @param menuId 菜单id + */ + void deleteByMenuId(String menuId); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java new file mode 100644 index 0000000000..4fbf7e0f58 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.GovRoleDTO; +import com.epmet.entity.GovRoleEntity; + +import java.util.List; +import java.util.Map; + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +public interface GovRoleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GovRoleDTO + * @author generator + * @date 2020-03-18 + */ + GovRoleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(GovRoleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(GovRoleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java new file mode 100644 index 0000000000..ff67c7d239 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java @@ -0,0 +1,133 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.GovRoleUserDTO; +import com.epmet.entity.GovRoleUserEntity; + +import java.util.List; +import java.util.Map; + +/** + * 角色用户关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +public interface GovRoleUserService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GovRoleUserDTO + * @author generator + * @date 2020-03-18 + */ + GovRoleUserDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void save(GovRoleUserDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-18 + */ + void update(GovRoleUserDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-18 + */ + void delete(String[] ids); + + /** + * 保存或修改 + * @param userId 用户ID + * @param roleIdList 角色ID列表 + */ + void saveOrUpdate(String userId, List roleIdList); + + /** + * 根据角色id，删除角色用户关系 + * @param roleId 角色id + */ + void deleteByRoleId(String roleId); + + /** + * 根据用户id，删除角色用户关系 + * @param userId 用户id + */ + void deleteByUserId(String userId); + + /** + * 角色ID列表 + * @param userId 用户ID + * @return List + */ + List getRoleIdList(String userId); + + /** + * 根据角色ids，删除角色用户关系 + * @param roleIds 角色ids + */ + void deleteByRoleIds(String[] roleIds); + + /** + * 根据用户ids，删除角色用户关系 + * @param userIds 用户ids + */ + void deleteByUserIds(String[] userIds); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java new file mode 100644 index 0000000000..cb24b913c0 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.OperationScopeDTO; +import com.epmet.entity.OperationScopeEntity; + +import java.util.List; +import java.util.Map; + +/** + * 权限范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +public interface OperationScopeService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-04-24 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-04-24 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return OperationScopeDTO + * @author generator + * @date 2020-04-24 + */ + OperationScopeDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-24 + */ + void save(OperationScopeDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-24 + */ + void update(OperationScopeDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-04-24 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java new file mode 100644 index 0000000000..edfaa41473 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java @@ -0,0 +1,14 @@ +package com.epmet.service; + +import com.epmet.entity.OperationEntity; + +import java.util.ArrayList; +import java.util.List; + +public interface OperationService { + + List listAllOperations(); + + void createBatch(ArrayList operations2Create); + void updateBatch(ArrayList operations2Update); +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java new file mode 100644 index 0000000000..109cdf7a51 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java @@ -0,0 +1,106 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.RoleOperationDTO; +import com.epmet.dto.form.InitDefaultOperationsFormDTO; +import com.epmet.dto.result.RoleOperationResultDTO; +import com.epmet.entity.RoleOperationEntity; + +import java.util.List; +import java.util.Map; + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +public interface RoleOperationService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-04-22 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-04-22 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return RoleOperationDTO + * @author generator + * @date 2020-04-22 + */ + RoleOperationDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-22 + */ + void save(RoleOperationDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-22 + */ + void update(RoleOperationDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-04-22 + */ + void delete(String[] ids); + + /** + * 查询角色对应的操作列表 + * @param roleId + * @return + */ + List listOperationsByRoleId(String roleId); + + void initDefaultOperationsForRoles(List roles); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java new file mode 100644 index 0000000000..34cdd6e07f --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.RoleScopeDTO; +import com.epmet.entity.RoleScopeEntity; + +import java.util.List; +import java.util.Map; + +/** + * 角色能操作哪些范围 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +public interface RoleScopeService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-04-24 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-04-24 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return RoleScopeDTO + * @author generator + * @date 2020-04-24 + */ + RoleScopeDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-24 + */ + void save(RoleScopeDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-04-24 + */ + void update(RoleScopeDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-04-24 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java new file mode 100644 index 0000000000..587690221c --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java @@ -0,0 +1,7 @@ +package com.epmet.service; + +public interface TestService { + + void test(); + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java new file mode 100644 index 0000000000..06f391eada --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java @@ -0,0 +1,264 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.*; +import com.epmet.dto.result.*; +import com.epmet.entity.OperationScopeDefaultEntity; +import com.epmet.entity.RoleOperationDefaultEntity; +import com.epmet.entity.RoleOperationEntity; +import com.epmet.entity.RoleScopeEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.redis.RoleOpeScopeRedis; +import com.epmet.service.AccessConfigService; +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; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +public class AccessConfigServiceImpl implements AccessConfigService { + + protected static final Logger logger = LoggerFactory.getLogger(AccessConfigServiceImpl.class); + + @Autowired + private RoleOpeScopeRedis roleOpeScopeRedis; + + @Autowired + private RoleOperationDao roleOperationDao; + + @Autowired + private RoleOperationDefaultDao roleOperationDefaultDao; + + @Autowired + private RoleScopeDao roleScopeDao; + + @Autowired + private OperationScopeDefaultDao operationScopeDefaultDao; + + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + @Override + public List listOpesByRole(String roleId) { + return roleOperationDao.listOpesForAccessConfig(roleId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveRoleOpes(String roleId, List opes) { + List operationsDB = roleOperationDao.listOperationsByRoleId(roleId); + Set opeKeysDB = operationsDB.stream().map(opeDB -> opeDB.getOperationKey()).collect(Collectors.toSet()); + Set opeKeysForm = opes.stream().map(opeForm -> opeForm.getOperationKey()).collect(Collectors.toSet()); + + for (String s : opeKeysDB) { + if (!opeKeysForm.contains(s)) { + // 说明这个已经被取消 + roleOperationDao.deleteRoleOpe(roleId, s); + } + } + + for (String s : opeKeysForm) { + if (!opeKeysDB.contains(s)) { + // 说明这个是新勾选的 + if (roleOperationDao.getRoleOpe(roleId, s) != null) { + if (roleOperationDao.enableRoleOpe(roleId, s) == 0) { + logger.error("权限配置:启用权限失败，roleId:{}", roleId); + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } + continue; + } + + RoleOperationEntity newRoleOpe = new RoleOperationEntity(); + newRoleOpe.setRoleId(roleId); + newRoleOpe.setOperationKey(s); + roleOperationDao.insert(newRoleOpe); + } + } + + // 失效Redis缓存 + roleOpeScopeRedis.delRoleAllOpeScopes(roleId); + } + + @Override + public AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey) { + List scopeOptions = roleScopeDao.listScopeOptionsForAccessConfig(roleId, operationKey); + //List settingOptions = accessSettingDao.listSettingOptionsForAccessConfig(roleId, operationKey); + AccessConfigOptionsResultDTO options = new AccessConfigOptionsResultDTO(); + options.setScopeOptions(scopeOptions); + //options.setSettingOptions(settingOptions); + return options; + } + + @Override + @Transactional + public void saveConfig(String roleId, String operationKey, Set scopeKeys) { + List scopesDB = roleScopeDao.listScopeEntities(roleId, operationKey); + // 数据库中已有的scopeKey列表 + Set scopeKeysDB = scopesDB.stream().map(scope -> scope.getScopeKey()).collect(Collectors.toSet()); + + Set scopeKeys2Add = scopeKeys.stream().filter(scopeKey -> !scopeKeysDB.contains(scopeKey)).collect(Collectors.toSet()); + Set scopeKeys2Remove = scopeKeysDB.stream().filter(scopeKeyDB -> !scopeKeys.contains(scopeKeyDB)).collect(Collectors.toSet()); + + // 添加/重新启用 + if (!CollectionUtils.isEmpty(scopeKeys2Add)) { + scopeKeys2Add.forEach(scopeKey -> { + RoleScopeEntity rsDB = roleScopeDao.getByRoleIdAndOpeKey(roleId, operationKey, scopeKey); + if (rsDB != null) { + roleScopeDao.enableByRoleIdAndOpeKey(roleId, operationKey, scopeKey); + } else { + RoleScopeEntity rs2Add = new RoleScopeEntity(); + rs2Add.setRoleId(roleId); + rs2Add.setOperationKey(operationKey); + rs2Add.setScopeKey(scopeKey); + roleScopeDao.insert(rs2Add); + } + }); + } + + // 删除 + if (!CollectionUtils.isEmpty(scopeKeys2Remove)) { + roleScopeDao.deleteByRoleIdAndOpeKey(roleId, operationKey, scopeKeys2Remove); + } + + // 清空redis缓存 + roleOpeScopeRedis.delRoleAllOpeScopes(roleId); + } + + @Override + public List listRoleDefaultOpsByRoleKey(String roleKey) { + return roleOperationDefaultDao.listRoleDefaultOpsByRoleKey(roleKey); + } + + /** + * + * @param roleKey + * @param operationKeys + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void saveRoleDefaultOperations(String roleKey, List operationKeys) { + + List opesExists = roleOperationDefaultDao.listByRoleKey(roleKey); + Set opeKeysExists = opesExists.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet()); + + // 过滤出删掉的 + Set deletedOpes = opeKeysExists.stream().filter(oke -> !operationKeys.contains(oke)).collect(Collectors.toSet()); + // 过滤出新增的 + Set newOpes = operationKeys.stream().filter(okn -> !opeKeysExists.contains(okn)).collect(Collectors.toSet()); + + for (String deletedOpe : deletedOpes) { + roleOperationDefaultDao.deleteByRoleKeyAndOpeKey(roleKey, deletedOpe); + } + + for (String newOpe : newOpes) { + RoleOperationDefaultEntity entity = new RoleOperationDefaultEntity(); + entity.setRoleKey(roleKey); + entity.setOperationKey(newOpe); + roleOperationDefaultDao.insert(entity); + } + } + + /** + * 查询默认的 + * @param roleKey + * @param operationKey + * @return + */ + @Override + public List listOpeDefaultScopes4Role(String roleKey, String operationKey) { + return operationScopeDefaultDao.listOpeDefaultScopes4Config(roleKey, operationKey); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void saveOpeDefaultScopes(String roleKey, String operationKey, List submitScopeKeys) { + List exists = operationScopeDefaultDao.listOpeDefaultScopesByRoleAndOpeKey(roleKey, operationKey); + + Set existsScopeKeys = exists.stream().map(ope -> ope.getScopeKey()).collect(Collectors.toSet()); + + // 删掉的 + Set deleteds = existsScopeKeys.stream().filter(esk -> !submitScopeKeys.contains(esk)).collect(Collectors.toSet()); + // 新增的 + Set addeds = submitScopeKeys.stream().filter(ssk -> !existsScopeKeys.contains(ssk)).collect(Collectors.toSet()); + + for (String scopeKey : deleteds) { + operationScopeDefaultDao.delete(roleKey, operationKey, scopeKey); + } + + for (String scopeKey : addeds) { + OperationScopeDefaultEntity entity = new OperationScopeDefaultEntity(); + entity.setOperationKey(operationKey); + entity.setRoleKey(roleKey); + entity.setScopeKey(scopeKey); + operationScopeDefaultDao.insert(entity); + } + } + + /** + * @Description 给角色添加操作权限和操作范围 + * @return + * @author wxz + * @date 2020.11.17 17:41 + */ + @Override + public void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys) { + Result> rolesResult = epmetUserOpenFeignClient.listRolesByRoleKey(roleKey); + if (!rolesResult.success()) { + String msg = "调用user服务，根据key查询角色列表失败"; + throw new RenException(EpmetErrorCode.USER_LIST_ROLES_BY_KEY_FAIL.getCode(), msg, msg, + RenException.MessageMode.CODE_INTERNAL_EXTERNAL.CODE_INTERNAL_EXTERNAL); + } + + List roles = rolesResult.getData(); + List roleIds2Add = roles.stream().map(GovStaffRoleResultDTO::getRoleId).collect(Collectors.toList()); + addOpeAndScopes4Role(roleIds2Add, operationKey, scopeKeys); + } + + /** + * @Description 将默认的角色操作和范围同步给具体的角色 + * @return + * @author wxz + * @date 2020.11.17 17:38 + */ + @Transactional(rollbackFor = Exception.class) + public void addOpeAndScopes4Role(List roleIds, String operationKey, List scopeKeys) { + for (String roleId : roleIds) { + // 只给没有添加该权限的用户赋予该权限，已经添加了和添加了又取消的不操作 + RoleOperationEntity roleOpe = roleOperationDao.getRoleOpe(roleId, operationKey); + boolean needRefreshCache = false; + if (roleOpe == null) { + // 没有该操作，则添加 + RoleOperationEntity roleOperation = new RoleOperationEntity(); + roleOperation.setOperationKey(operationKey); + roleOperation.setRoleId(roleId); + roleOperationDao.insert(roleOperation); + needRefreshCache = true; + } + for (String scopeKey : scopeKeys) { + // 没有的话则添加 + RoleScopeEntity roleScopeInDb = roleScopeDao.getByRoleIdAndOpeKey(roleId, operationKey, scopeKey); + if (roleScopeInDb == null) { + RoleScopeEntity roleScopeEntity = new RoleScopeEntity(); + roleScopeEntity.setOperationKey(operationKey); + roleScopeEntity.setRoleId(roleId); + roleScopeEntity.setScopeKey(scopeKey); + roleScopeDao.insert(roleScopeEntity); + needRefreshCache = true; + } + } + + // 清空角色的权限缓存 + if (needRefreshCache) { + roleOpeScopeRedis.delRoleAllOpeScopes(roleId); + } + } + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java new file mode 100644 index 0000000000..25afa314fa --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -0,0 +1,597 @@ +package com.epmet.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.epmet.bean.OpeScopeFilterResultBean; +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.security.dto.GovTokenDto; +import com.epmet.commons.tools.security.user.LoginUserUtil; +import com.epmet.commons.tools.utils.CpUserDetailRedis; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.OperationScopeConstant; +import com.epmet.dao.OperationScopeDao; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.GovStaffRoleDTO; +import com.epmet.dto.form.GetSQLFilterFormDTO; +import com.epmet.dto.form.StaffRoleFormDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; +import com.epmet.dto.result.RoleOpeScopeResultDTO; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.redis.RoleOpeScopeRedis; +import com.epmet.service.AccessService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.*; +import java.util.stream.Collectors; + +@Service +public class AccessServiceImpl implements AccessService { + + private static Logger logger = LoggerFactory.getLogger(AccessServiceImpl.class); + + /** + * 线程变量，记录是否已经添加了至少一个过滤条件 + */ + private static final ThreadLocal hasConditions = new ThreadLocal(); + + @Autowired + private CpUserDetailRedis cpUserDetailRedis; + + @Autowired + private OperationScopeDao operationScopeDao; + + @Autowired + private RoleOpeScopeRedis roleOpeScopeRedis; + + @Autowired + private GovOrgFeignClient govOrgFeignClient; + + @Autowired + private EpmetUserFeignClient userFeignClient; + + @Autowired + private LoginUserUtil loginUserUtil; + + public static final String ORG_RELATION_SAME = "same"; + public static final String ORG_RELATION_SUB = "sub"; + public static final String ORG_RELATION_SUP = "sup"; + public static final String ORG_PATH_SEPARATOR = ":"; + + @Override + public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId) { + return cpUserDetailRedis.get(app, client, staffId, LoginUserDetailsResultDTO.class); + } + + @Override + public List listAllRoleOperationScopesByRoleId(String roleId) { + List roleAllOpeScopes = roleOpeScopeRedis.getRoleAllOpeScopes(roleId); + if (roleAllOpeScopes == null) { + roleAllOpeScopes = operationScopeDao.listAllRoleOperationScopesByRoleId(roleId); + roleOpeScopeRedis.setRoleAllOpeScopes(roleId, roleAllOpeScopes); + } + return roleAllOpeScopes; + } + + @Override + public Boolean hasPermission(String operationKey, String userId, String app, String client) { + if (!AppClientConstant.APP_GOV.equals(app)) { + // 如果不是gov，那么不判断权限，放行 + return true; + } + + LoginUserDetailsResultDTO userDetails = getLoginUserDetails(app, client, userId); + if (userDetails == null) { + return false; + } + List roleList = userDetails.getRoleList(); + if (CollectionUtils.isEmpty(roleList)) { + return false; + } + + final Set operationKeys = new HashSet<>(); + + roleList.stream().forEach(role -> { + List opeAndScopes = listAllRoleOperationScopesByRoleId(role.getId()); + operationKeys.addAll(opeAndScopes.stream().map(opeAndScope -> opeAndScope.getOperationKey()).collect(Collectors.toSet())); + }); + + if (operationKeys.contains(operationKey)) { + return true; + } + return false; + } + + @Override + public String getSqlFilterSegment(GetSQLFilterFormDTO form) { + hasConditions.set(false); + LoginUserDetailsResultDTO userDetails = getLoginUserDetails(form.getApp(), form.getClient(), form.getUserId()); + if (userDetails == null) { + logger.error("查询SQL过滤脚本:没有找到用户的登陆信息:app: {}, client: {}, userId:{}", form.getApp(), form.getClient(), form.getUserId()); + throw new RenException(EpmetErrorCode.ERR10006.getCode()); + } + + StringBuilder sb = new StringBuilder(); + + if (CollectionUtils.isEmpty(userDetails.getRoleList())) { + //logger.warn("用户{}没有配置任何角色，无法执行{}操作", form.getUserId(), form.getOperationKey()); + throw new RenException(String.format("用户%s没有配置任何角色，无法执行%s操作", form.getUserId(), form.getOperationKey())); + } + + OpeScopeFilterResultBean effectiveOpeScopes = getEffectiveOpeScopes(userDetails.getRoleList(), form.getOperationKey()); + if (effectiveOpeScopes.isAllScopes()) { + return sb.toString(); + } + + HashSet orgLevelScopes = effectiveOpeScopes.getOrgLevelScopes(); + Set switchScopes = effectiveOpeScopes.getSwitchScopes(); + + // 生成组织上下级关系系列的sql过滤片段 + if (!CollectionUtil.isEmpty(orgLevelScopes) && !orgLevelScopes.contains(OperationScopeConstant.SCOPE_ORG_ALL)) { + genOrgLevelScopeSqlFilter(sb, orgLevelScopes, userDetails.getOrgIdPath(), form.getTableAlias()); + } + + // 生成开关范围的sql过滤器 + if (!CollectionUtil.isEmpty(switchScopes)) { + genSwitchScopeSqlFilter(switchScopes, sb, form.getTableAlias(), userDetails.getUserId(), form.getGridIds(), form.getDepartmentIds()); + } + + return sb.toString(); + } + + /** + * 生成开关系列范围sql过滤片段 + * @param switchScopes + */ + private void genSwitchScopeSqlFilter(Set switchScopes, + StringBuilder sb, + String tableAlias, + String userId, + Set gridIds, + Set departmentIds) { + + if (switchScopes.contains(OperationScopeConstant.SCOPE_I_CREATED)) { + genICreatedSql(sb, userId, tableAlias); + } + + if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_GRID)) { + if (gridIds == null) { + String error = String.format("DataFilter:拼接SQL语句出错:需要in grid权限，但是代码中没有获取到gridIds"); + logger.error(error); + throw new RenException(error); + } + if (gridIds.size() != 0) { + genInGrid(sb, gridIds, tableAlias); + } + } + + if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_DEPARTMENT)) { + if (departmentIds == null) { + String error = String.format("DataFilter:拼接SQL语句出错:需要in department权限，但是代码中没有获取到, departmentIds"); + logger.error(error); + throw new RenException(error); + } + if (departmentIds.size() != 0) { + genDepartmentFilterSql(sb, departmentIds, tableAlias); + } + } + } + + /** + * sql：我发起的 + * + * @param userId + */ + private void genICreatedSql(StringBuilder sb, String userId, String tableAlias) { + if (StringUtils.isBlank(tableAlias)) { + sb.append(hasConditions.get() ? " OR " : " ").append(" CREATED_BY ='").append(userId).append("'"); + } else { + sb.append(hasConditions.get() ? " OR " : " ").append(tableAlias).append(".CREATED_BY ='").append(userId).append("'"); + } + hasConditions.set(true); + } + + /** + * 网格sql + * + * @param sb + * @param tableAlias + */ + private void genInGrid(StringBuilder sb, Set gridIds, String tableAlias) { + if (hasConditions.get()) { + // 之前没有条件 + sb.append(" OR "); + } + + // OR GRID_ID = 'XXX' OR GRID_ID = 'QQQ' OR + + for (String gridId : gridIds) { + if (StringUtils.isBlank(tableAlias)) { + sb.append(" GRID_ID = '").append(gridId).append("' OR "); + } else { + sb.append(" ").append(tableAlias).append(".GRID_ID ='").append(gridId).append("' OR "); + } + } + + int lastOrIndex = sb.lastIndexOf("OR"); + sb.replace(lastOrIndex, lastOrIndex + "OR".length(), "" ); + + hasConditions.set(true); + } + + /** + * sql语句拼接FALSE + * @param sb + */ + private void genFalseCondition(StringBuilder sb) { + if (hasConditions.get()) { + // 之前没有条件 + sb.append(" OR "); + } + + sb.append(" FALSE "); + + hasConditions.set(true); + } + + /** + * 生成部门过滤sql + * + * @param sb + */ + private void genDepartmentFilterSql(StringBuilder sb, Set deptIds, String tableAlias) { + //Result> deptListResult = govOrgFeignClient.getDepartmentListByStaffId(staffId); + if (hasConditions.get()) { + // 之前没有条件 + sb.append(" OR "); + } + + for (String deptId : deptIds) { + if (StringUtils.isBlank(tableAlias)) { + sb.append(" DEPARTMENT_ID = '").append(deptId).append("' OR "); + } else { + sb.append(" ").append(tableAlias).append(".DEPARTMENT_ID ='").append(deptId).append("' OR "); + } + } + + int lastOrIndex = sb.lastIndexOf("OR"); + sb.replace(lastOrIndex, lastOrIndex + "OR".length(), "" ); + + hasConditions.set(true); + } + + /** + * 计算有效操作范围 + */ + public OpeScopeFilterResultBean getEffectiveOpeScopes(List roles, String reqiurePermission) { + + // 根据角色列表查询操作范围列表 + Set opeAndScopesOfThisOperation = new HashSet<>(); + roles.forEach(role -> { + List opes = listAllRoleOperationScopesByRoleId(role.getId()); + if (!CollectionUtils.isEmpty(opes)) { + opes.forEach(ope -> { + if (reqiurePermission.equals(ope.getOperationKey())) { + // 拿到当前操作对应的 RoleOpeScopeResultDTO + opeAndScopesOfThisOperation.add(ope); + } + }); + } + }); + + // 过滤范围 + return filteAndGroupScopes(opeAndScopesOfThisOperation); + } + + /** + * 对范围进行过滤和分组 + * + * @param scopeDTOS + * @return + */ + private OpeScopeFilterResultBean filteAndGroupScopes(Set scopeDTOS) { + // 存储上下级关系系列范围。先放到Map是为了去重和中途判断 + HashMap orgLevelScopes = new HashMap<>(); + + // 存储开关系列范围 + Set switchScopes = new HashSet<>(); + + // 所有范围 + Boolean all = false; + + for (RoleOpeScopeResultDTO scope : scopeDTOS) { + + if (OperationScopeConstant.SCOPE_ALL.equals(scope.getScopeKey())) { + all = true; + break; + } + + if (OperationScopeConstant.SERIES_SWITCH.equals(scope.getSeries())) { + switchScopes.add(scope.getScopeKey()); + continue; + } + + String scopeIndex = scope.getScopeIndex(); + if (OperationScopeConstant.SCOPE_ORG_ALL.equals(scope.getScopeKey())) { + // 该操作具有org_all的权限，直接放入 + orgLevelScopes.put(scopeIndex, scope); + continue; + } + + String[] currArr = scopeIndex.split("_"); + if ("0".equals(currArr[1])) { + // 为0，说明没有包含关系，直接放入 + orgLevelScopes.put(scopeIndex, scope); + continue; + } + + RoleOpeScopeResultDTO tempScope = orgLevelScopes.get(currArr[0]); + if (tempScope != null) { + // 已经有ac开头的了 + String tempScopeIndex = tempScope.getScopeIndex(); + if (Integer.valueOf(currArr[1]) < Integer.valueOf(tempScopeIndex.split("_")[1])) { + orgLevelScopes.put(currArr[0], scope); + } + } else { + orgLevelScopes.put(currArr[0], scope); + } + } + HashSet scopeStrs = new HashSet<>(); + Set> entries = orgLevelScopes.entrySet(); + for (Map.Entry entry : entries) { + scopeStrs.add(entry.getValue().getScopeKey()); + } + OpeScopeFilterResultBean resultBean = new OpeScopeFilterResultBean(); + resultBean.setOrgLevelScopes(scopeStrs); + resultBean.setSwitchScopes(switchScopes); + resultBean.setAllScopes(all); + return resultBean; + } + + /** + * 生成组织上下级关系系列的sql过滤片段 + * @param sb + * @param orgIdPath + * @param tableAlias + * @return + */ + private void genOrgLevelScopeSqlFilter(StringBuilder sb, HashSet scopes, String orgIdPath, String tableAlias) { + // 取出父组织ID path 和当前组织ID + //String parentOrgIDPath = orgIdPath.substring(0, orgIdPath.lastIndexOf(orgIdPathSpliter)); + //String currOrgID = orgIdPath.substring(orgIdPath.lastIndexOf(orgIdPathSpliter) + 1); + + for (String scope : scopes) { + switch (scope) { + // 当前单位(可以用ORG_ID_PATH，也可以用ORG_ID判断) + case OperationScopeConstant.SCOPE_ORG_CURR: + if (StringUtils.isBlank(tableAlias)) { + sb.append(" ORG_ID_PATH = '").append(orgIdPath).append("' OR "); + //sb.append(" ORG_ID = '").append(currOrgID).append("' OR "); + } else { + sb.append(" ").append(tableAlias).append(".ORG_ID_PATH = '").append(orgIdPath).append("' OR "); + //sb.append(" ").append(tableAlias).append(".ORG_ID = '").append(currOrgID).append("' OR "); + } + break; + // 本单位及其子级单位 + case OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB: + if (StringUtils.isBlank(tableAlias)) { + sb.append(" ORG_ID_PATH like '").append(orgIdPath).append("%' OR "); + } else { + sb.append(" ").append(tableAlias).append(".ORG_ID_PATH like '").append(orgIdPath).append("%' OR "); + } + break; + // 本单位的子级单位 + case OperationScopeConstant.SCOPE_ORG_CURR_SUB: + if (StringUtils.isBlank(tableAlias)) { + sb.append(" ORG_ID_PATH like '").append(orgIdPath).append(":%' OR "); + } else { + sb.append(" ").append(tableAlias).append(".ORG_ID_PATH like '").append(orgIdPath).append(":%' OR "); + } + break; + //当前单位的父级单位 + case OperationScopeConstant.SCOPE_ORG_CURR_SUP: + if (StringUtils.isBlank(tableAlias)) { + sb.append(" '").append(orgIdPath).append("' like CONCAT(").append("ORG_ID_PATH,':%') OR "); + } else { + sb.append(" '").append(orgIdPath).append("' like CONCAT(").append(tableAlias).append(".ORG_ID_PATH,':%') OR "); + } + break; + // 当前单位及其父级单位 + case OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP: + if (StringUtils.isBlank(tableAlias)) { + sb.append(" '").append(orgIdPath).append("' like CONCAT(").append("ORG_ID_PATH,'%') OR "); + } else { + sb.append(" '").append(orgIdPath).append("' like CONCAT(").append(tableAlias).append(".ORG_ID_PATH,'%' ) OR "); + } + break; + case OperationScopeConstant.SCOPE_ORG_EQUAL: + // todo 同级 + //sb.append(" OR "); + break; + case OperationScopeConstant.SCOPE_ORG_EQUAL_AND_SUB: + // todo 同级及其子级 + //sb.append(" OR "); + break; + case OperationScopeConstant.SCOPE_ORG_EQUAL_SUB: + // todo 同级的子级 + //sb.append(" OR "); + break; + case OperationScopeConstant.SCOPE_ORG_EQUAL_AND_SUP: + // todo 同级及其上级 + //sb.append(" OR "); + break; + case OperationScopeConstant.SCOPE_ORG_EQUAL_SUP: + // todo 同级的上级 + //sb.append(" OR "); + break; + } + } + + sb.replace(sb.lastIndexOf("OR"), sb.lastIndexOf("OR") + 3, ""); + hasConditions.set(true); + } + + @Override + public Set listOperationPermissions(String staffId, String currAgencyId) { + + LoginUserDetailsResultDTO userDetails = getLoginUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId()); + if (userDetails == null) { + throw new RenException(EpmetErrorCode.ERR10006.getCode(), EpmetErrorCode.ERR10006.getMsg()); + } + + // 1.拿到所属组织机构信息 + String belongAgencyId = getBelongAgencyFromOrgIdPath(userDetails.getOrgIdPath()); + Result belongAgencyRst = govOrgFeignClient.getAgencyById(belongAgencyId); + if (!belongAgencyRst.success()) { + throw new RenException("查询用户的操作权限列表:调用GovOrg，根据belongAgencyId查询机构信息失败:".concat(belongAgencyRst.getInternalMsg())); + } + + CustomerAgencyDTO belongAgency = belongAgencyRst.getData(); + + //Result agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId); + //if (!agencyByStaffRst.success()) { + // logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg()); + // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + //} + //CustomerAgencyDTO belongAgency = agencyByStaffRst.getData(); + //if (belongAgency == null) { + // logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId); + // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + //} + + // 2.拿到当前所处机关单位信息 + Result currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId); + CustomerAgencyDTO currAgencyDto = currAgencyRst.getData(); + if (!currAgencyRst.success() || currAgencyDto == null) { + throw new RenException(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg())); + } + + // 获取机关单位中的角色 + // 目前一个人只在一个单位下，所以不动态查询，如果后面需要一个人在多个单位，再改这里 + //List roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId()); + List roleList = userDetails.getRoleList(); + + // 当前组织和所属组织的orgId路径,以及他们的上下级关系 + String belongOrgIdPath = getOrgIdPath(belongAgency); + String currOrgIdPath = getOrgIdPath(currAgencyDto); + String currOrgRelation = getCurrOrgRelation(belongOrgIdPath, currOrgIdPath); + + Set filtedOps = new HashSet<>(); + + if (!CollectionUtils.isEmpty(roleList)) { + roleList.forEach(role -> { + List opeAndScopeDTO = listAllRoleOperationScopesByRoleId(role.getId()); + filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO)); + }); + } + return filtedOps; + } + + /** + * 从OrgIdPath中取所属机构(即最后一截) + * @param orgIdPath + * @return + */ + private String getBelongAgencyFromOrgIdPath(String orgIdPath) { + if (!orgIdPath.contains(ORG_PATH_SEPARATOR)) { + return orgIdPath; + } + return orgIdPath.substring(orgIdPath.lastIndexOf(ORG_PATH_SEPARATOR) + 1); + } + + /** + * 获取当前所处机关与所属机关的关系 + */ + private String getCurrOrgRelation(String belongOrgPath, String currAgencyPath) { + if (belongOrgPath.equals(currAgencyPath)) { + // 当前机关即该人员所属机关 + return ORG_RELATION_SAME; + } else if (currAgencyPath.indexOf(belongOrgPath.concat(":")) > -1) { + // 说明当前所在机关是人员所属机关子级,只取出scope为sub的 + return ORG_RELATION_SUB; + } else if (belongOrgPath.indexOf(currAgencyPath.concat(":")) > -1) { + // 说明当前所在机关是人员所属机关的上级 + return ORG_RELATION_SUP; + } + return belongOrgPath; + } + + /** + * 获取组织的orgId路径 + */ + public String getOrgIdPath(CustomerAgencyDTO agency) { + // 拼接单位ID全路径 + if ("0".equals(agency.getPid())) { + // 顶级组织 + return agency.getId(); + } else { + return agency.getPids().concat(":").concat(agency.getId()); + } + } + + public List queryGovStaffRoles(String staffId, String orgId) { + List roleDTOS = new ArrayList<>(); + StaffRoleFormDTO formDTO = new StaffRoleFormDTO(); + formDTO.setStaffId(staffId); + formDTO.setOrgId(orgId); + Result> gridResult = userFeignClient.getRolesOfStaff(formDTO); + if (!CollectionUtils.isEmpty(gridResult.getData())) { + roleDTOS.addAll(gridResult.getData()); + } + return roleDTOS; + } + + /** + * 根据上下级关系过滤出要返回的权限列表 + * + * @param currOrgRelation + * @param roleOperations + * @return + */ + private HashSet filterOpesByScope(String currOrgRelation, List roleOperations) { + HashSet opeKeys = new HashSet<>(); + for (RoleOpeScopeResultDTO opeScope : roleOperations) { + String scopeKey = opeScope.getScopeKey(); + if (OperationScopeConstant.SCOPE_ORG_ALL.equals(scopeKey) || OperationScopeConstant.SCOPE_ALL.equals(scopeKey)) { + // 如果该操作的范围是org_all或者all，不需要根据上下级关系判断，直接返回即可。 + opeKeys.add(opeScope.getOperationKey()); + continue; + } + + if (!opeScope.getSeries().equals(OperationScopeConstant.SERIES_ORG_LEVEL)) { + opeKeys.add(opeScope.getOperationKey()); + continue; + } + + switch (currOrgRelation) { + case ORG_RELATION_SAME:// 就在所在机构下 + if (OperationScopeConstant.SCOPE_ORG_CURR.equals(scopeKey) + || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB.equals(scopeKey) + || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP.equals(scopeKey)) { + opeKeys.add(opeScope.getOperationKey()); + } + break; + case ORG_RELATION_SUB:// 所在机构的子级 + if (OperationScopeConstant.SCOPE_ORG_CURR_SUB.equals(scopeKey) + || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB.equals(scopeKey)) { + opeKeys.add(opeScope.getOperationKey()); + } + break; + case ORG_RELATION_SUP:// 所在机构的上级 + if (OperationScopeConstant.SCOPE_ORG_CURR_SUP.equals(scopeKey) + || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP.equals(scopeKey)) { + opeKeys.add(opeScope.getOperationKey()); + } + break; + } + } + return opeKeys; + } + +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java new file mode 100644 index 0000000000..43e21684ef --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java @@ -0,0 +1,121 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.GovLanguageDao; +import com.epmet.dto.GovLanguageDTO; +import com.epmet.entity.GovLanguageEntity; +import com.epmet.redis.GovLanguageRedis; +import com.epmet.service.GovLanguageService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 国际化 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Service +public class GovLanguageServiceImpl extends BaseServiceImpl implements GovLanguageService { + + @Autowired + private GovLanguageRedis govLanguageRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GovLanguageDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GovLanguageDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GovLanguageDTO get(String id) { + GovLanguageEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovLanguageDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GovLanguageDTO dto) { + GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GovLanguageDTO dto) { + GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public void saveOrUpdate(String tableName, String tableId, String fieldName, String fieldValue, String language) { + GovLanguageEntity entity = new GovLanguageEntity(); + entity.setTableName(tableName); + entity.setTableId(tableId); + entity.setFieldName(fieldName); + entity.setFieldValue(fieldValue); + entity.setLanguage(language); + + //判断是否有数据 + if(baseDao.getLanguage(entity) == null){ + baseDao.insertOperLanguageEntity(entity); + }else { + baseDao.updateLanguage(entity); + } + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java new file mode 100644 index 0000000000..5a6efd43f2 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -0,0 +1,247 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.ErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpContextUtils; +import com.epmet.commons.tools.utils.TreeUtils; +import com.epmet.dao.GovMenuDao; +import com.epmet.dto.GovMenuDTO; +import com.epmet.entity.GovMenuEntity; +import com.epmet.enums.MenuTypeEnum; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.redis.GovMenuRedis; +import com.epmet.service.GovLanguageService; +import com.epmet.service.GovMenuService; +import com.epmet.service.GovResourceService; +import com.epmet.service.GovRoleMenuService; +import org.apache.commons.lang3.StringUtils; +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; + +import java.util.*; + +/** + * 菜单管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Service +public class GovMenuServiceImpl extends BaseServiceImpl implements GovMenuService { + protected Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private GovMenuRedis govMenuRedis; + @Autowired + private EpmetUserFeignClient epmetUserFeignClient; + @Autowired + private GovRoleMenuService govRoleMenuService; + @Autowired + private GovResourceService govResourceService; + @Autowired + private GovLanguageService govLanguageService; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GovMenuDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GovMenuDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GovMenuDTO get(String id) { + GovMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage()); + + return ConvertUtils.sourceToTarget(entity, GovMenuDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GovMenuDTO dto, TokenDto tokenDto) { + GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class); + + //保存菜单 + insert(entity); + saveLanguage(entity.getId(), "name", entity.getName()); + + //保存菜单资源 + govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList()); + + //清空当前用户，菜单导航、权限标识 + govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GovMenuDTO dto, TokenDto tokenDto) { + GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class); + + //上级菜单不能为自身 + if(entity.getId().equals(entity.getPid())){ + throw new RenException(ErrorCode.SUPERIOR_MENU_ERROR); + } + + //更新菜单 + updateById(entity); + saveLanguage(entity.getId(), "name", entity.getName()); + + //更新菜单资源 + govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList()); + + //清空当前用户，菜单导航、权限标识 + govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String id, TokenDto tokenDto) { + //逻辑删除 + baseDao.deleteBatchIds(Collections.singletonList(id)); + //删除角色菜单关系 + govRoleMenuService.deleteByMenuId(id); + + //清空当前用户，菜单导航、权限标识 + govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + } + + @Override + public List getUserMenuList(TokenDto tokenDto, Integer type) { + List menuList; + +// Result govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); + +// //系统管理员，拥有最高权限 +// if(govUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ + menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); +// }else { +// menuList = baseDao.getUserMenuList(tokenDto.getUserId(), type, HttpContextUtils.getLanguage()); +// } + + List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); + + return TreeUtils.buildTree(dtoList); + } + + @Override + public List getMenuList(Integer type) { + List menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); + + List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); + + return TreeUtils.buildTree(dtoList, Constant.OPER_MENU_ROOT); + } + + @Override + public List getUserMenuNavList(TokenDto tokenDto) { + List menuList = govMenuRedis.getUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + if(menuList == null){ + menuList = getUserMenuList(tokenDto, MenuTypeEnum.MENU.value()); + + govMenuRedis.setUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), menuList); + } + + return menuList; + } + + @Override + public Set getUserPermissions(TokenDto tokenDto) { + //用户权限列表 + Set permsSet = govMenuRedis.getUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + if(permsSet != null){ + return permsSet; + } + +// Result govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); + + //超级管理员，拥有最高权限 + List menuList; +// if(govUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ + menuList = baseDao.getMenuList(MenuTypeEnum.BUTTON.value(), HttpContextUtils.getLanguage()); +// }else{ +// menuList = baseDao.getUserMenuList(tokenDto.getUserId(), MenuTypeEnum.BUTTON.value(), HttpContextUtils.getLanguage()); +// } + + permsSet = new HashSet<>(); + for(GovMenuEntity menu : menuList){ + if(StringUtils.isNotBlank(menu.getPermissions())){ + permsSet.add(menu.getPermissions()); + } + } + + //保存到缓存 + govMenuRedis.setUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), permsSet); + + return permsSet; + } + + @Override + public List getListPid(String pid) { + List menuList = baseDao.getListPid(pid); + + return ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); + } + + @Override + public void clearOperUserAccess(String app, String client, String userId) { + //清空当前用户，菜单导航、权限标识 + govMenuRedis.delete(userId, app, client); + logger.info(String.format("运营端用户退出系统%s,清空菜单、权限成功",userId)); + } + + private void saveLanguage(String tableId, String fieldName, String fieldValue){ + govLanguageService.saveOrUpdate("gov_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage()); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java new file mode 100644 index 0000000000..2cb1da7087 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java @@ -0,0 +1,143 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.enums.ResourceAuthEnum; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.GovResourceDao; +import com.epmet.dto.GovResourceDTO; +import com.epmet.dto.result.MenuResourceDTO; +import com.epmet.entity.GovResourceEntity; +import com.epmet.enums.MenuFlagEnum; +import com.epmet.redis.GovResourceRedis; +import com.epmet.service.GovResourceService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Service +public class GovResourceServiceImpl extends BaseServiceImpl implements GovResourceService { + + @Autowired + private GovResourceRedis govResourceRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GovResourceDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GovResourceDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GovResourceDTO get(String id) { + GovResourceEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovResourceDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GovResourceDTO dto) { + GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GovResourceDTO dto) { + GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public void saveMenuResource(String menuId, String menuName, List resourceList) { + //先删除菜单资源关系 + baseDao.deleteByCode(menuId+""); + + //删除缓存 + govResourceRedis.delete(); + + //菜单没有一个资源的情况 + if(CollUtil.isEmpty(resourceList)){ + return ; + } + + //保存菜单资源关系 + for(MenuResourceDTO dto : resourceList){ + GovResourceEntity entity = new GovResourceEntity(); + entity.setResourceCode(menuId+""); + entity.setResourceName(menuName); + entity.setResourceUrl(dto.getResourceUrl()); + entity.setResourceMethod(dto.getResourceMethod()); + entity.setAuthLevel(ResourceAuthEnum.PERMISSIONS_AUTH.value()); + entity.setMenuFlag(MenuFlagEnum.YES.value()); + + //保存 + insert(entity); + } + } + + @Override + public List getMenuResourceList(String menuId) { + List entityList = baseDao.getMenuResourceList(menuId+""); + + return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java new file mode 100644 index 0000000000..ec31c69146 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java @@ -0,0 +1,150 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.GovRoleMenuDao; +import com.epmet.dto.GovRoleMenuDTO; +import com.epmet.entity.GovRoleMenuEntity; +import com.epmet.redis.GovRoleMenuRedis; +import com.epmet.service.GovRoleMenuService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 角色菜单关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Service +public class GovRoleMenuServiceImpl extends BaseServiceImpl implements GovRoleMenuService { + + @Autowired + private GovRoleMenuRedis govRoleMenuRedis; + @Autowired + private GovRoleMenuDao govRoleMenuDao; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GovRoleMenuDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GovRoleMenuDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GovRoleMenuDTO get(String id) { + GovRoleMenuEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovRoleMenuDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GovRoleMenuDTO dto) { + GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GovRoleMenuDTO dto) { + GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public List getMenuIdList(String roleId){ + return baseDao.getMenuIdList(roleId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveOrUpdate(String roleId, List menuIdList) { + //先删除角色菜单关系 + deleteByRoleId(roleId); + + //角色没有一个菜单权限的情况 + if(CollUtil.isEmpty(menuIdList)){ + return ; + } + + //保存角色菜单关系 + for(String menuId : menuIdList){ + GovRoleMenuEntity govRoleMenuEntity = new GovRoleMenuEntity(); + govRoleMenuEntity.setMenuId(menuId); + govRoleMenuEntity.setRoleId(roleId); + + //保存 + insert(govRoleMenuEntity); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteByRoleId(String roleId) { + baseDao.deleteByRoleId(roleId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteByRoleIds(String[] roleIds) { + govRoleMenuDao.deleteByRoleIds(roleIds); + } + + @Override + public void deleteByMenuId(String menuId) { + baseDao.deleteByMenuId(menuId); + } +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java new file mode 100644 index 0000000000..5810b420e5 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -0,0 +1,118 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.GovRoleDao; +import com.epmet.dto.GovRoleDTO; +import com.epmet.entity.GovRoleEntity; +import com.epmet.redis.GovRoleRedis; +import com.epmet.service.GovRoleMenuService; +import com.epmet.service.GovRoleService; +import com.epmet.service.GovRoleUserService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Service +public class GovRoleServiceImpl extends BaseServiceImpl implements GovRoleService { + + @Autowired + private GovRoleRedis govRoleRedis; + @Autowired + private GovRoleMenuService govRoleMenuService; + @Autowired + private GovRoleUserService govRoleUserService; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GovRoleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GovRoleDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + String name = (String)params.get(FieldConstant.NAME_HUMP); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name); + + return wrapper; + } + + @Override + public GovRoleDTO get(String id) { + GovRoleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovRoleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GovRoleDTO dto) { + GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class); + insert(entity); + //保存角色菜单关系 + govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GovRoleDTO dto) { + GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class); + updateById(entity); + //保存角色菜单关系 + govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + + govRoleMenuService.deleteByRoleIds(ids); + + govRoleUserService.deleteByRoleIds(ids); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java new file mode 100644 index 0000000000..21b796cc3b --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java @@ -0,0 +1,156 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.GovRoleUserDao; +import com.epmet.dto.GovRoleUserDTO; +import com.epmet.entity.GovRoleUserEntity; +import com.epmet.redis.GovRoleUserRedis; +import com.epmet.service.GovRoleUserService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 角色用户关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Service +public class GovRoleUserServiceImpl extends BaseServiceImpl implements GovRoleUserService { + + @Autowired + private GovRoleUserRedis govRoleUserRedis; + @Autowired + private GovRoleUserDao govRoleUserDao; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GovRoleUserDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GovRoleUserDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GovRoleUserDTO get(String id) { + GovRoleUserEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovRoleUserDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GovRoleUserDTO dto) { + GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GovRoleUserDTO dto) { + GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveOrUpdate(String userId, List roleIdList) { + //先删除角色用户关系 + deleteByUserId(userId); + + //用户没有一个角色权限的情况 + if(CollUtil.isEmpty(roleIdList)){ + return ; + } + + //保存角色用户关系 + for(String roleId : roleIdList){ + GovRoleUserEntity govRoleUserEntity = new GovRoleUserEntity(); + govRoleUserEntity.setUserId(userId); + govRoleUserEntity.setRoleId(roleId); + + //保存 + insert(govRoleUserEntity); + } + } + + @Override + public void deleteByRoleId(String roleId) { + govRoleUserDao.deleteByRoleId(roleId); + } + + @Override + public void deleteByUserId(String userId) { + govRoleUserDao.deleteByUserId(userId); + } + + @Override + public List getRoleIdList(String userId) { + + return baseDao.getRoleIdList(userId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteByRoleIds(String[] roleIds) { + govRoleUserDao.deleteByRoleIds(roleIds); + } + + @Override + public void deleteByUserIds(String[] userIds) { + govRoleUserDao.deleteByUserIds(userIds); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java new file mode 100644 index 0000000000..e582395fe2 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java @@ -0,0 +1,101 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.OperationScopeDao; +import com.epmet.dto.OperationScopeDTO; +import com.epmet.entity.OperationScopeEntity; +import com.epmet.service.OperationScopeService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 权限范围表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Service +public class OperationScopeServiceImpl extends BaseServiceImpl implements OperationScopeService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, OperationScopeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, OperationScopeDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public OperationScopeDTO get(String id) { + OperationScopeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, OperationScopeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(OperationScopeDTO dto) { + OperationScopeEntity entity = ConvertUtils.sourceToTarget(dto, OperationScopeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(OperationScopeDTO dto) { + OperationScopeEntity entity = ConvertUtils.sourceToTarget(dto, OperationScopeEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java new file mode 100644 index 0000000000..ca28d43d0b --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java @@ -0,0 +1,35 @@ +package com.epmet.service.impl; + +import com.epmet.dao.OperationDao; +import com.epmet.entity.OperationEntity; +import com.epmet.service.OperationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class OperationServiceImpl implements OperationService { + + @Autowired + private OperationDao operationDao; + + @Override + public List listAllOperations() { + return operationDao.listAllOperationEntities(); + } + + @Transactional + @Override + public void createBatch(ArrayList operations2Create) { + operations2Create.forEach(ope -> operationDao.insert(ope)); + } + + @Transactional + @Override + public void updateBatch(ArrayList operations2Update) { + operations2Update.forEach(ope -> operationDao.updateById(ope)); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java new file mode 100644 index 0000000000..28943e74b8 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java @@ -0,0 +1,218 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.OperationScopeDefaultDao; +import com.epmet.dao.RoleOperationDao; +import com.epmet.dao.RoleOperationDefaultDao; +import com.epmet.dao.RoleScopeDao; +import com.epmet.dto.RoleOperationDTO; +import com.epmet.dto.form.InitDefaultOperationsFormDTO; +import com.epmet.dto.result.OperationScopeDefaultResultDTO; +import com.epmet.dto.result.RoleOperationDefaultResultDTO; +import com.epmet.dto.result.RoleOperationResultDTO; +import com.epmet.entity.OperationScopeDefaultEntity; +import com.epmet.entity.RoleOperationEntity; +import com.epmet.entity.RoleScopeEntity; +import com.epmet.service.RoleOperationService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.*; + +/** + * 角色能进行那些操作 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Service +public class RoleOperationServiceImpl extends BaseServiceImpl implements RoleOperationService { + + @Autowired + private RoleOperationDefaultDao roleOperationDefaultDao; + + @Autowired + private RoleOperationDao roleOperationDao; + + @Autowired + private OperationScopeDefaultDao operationScopeDefaultDao; + + @Autowired + private RoleScopeDao roleScopeDao; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, RoleOperationDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, RoleOperationDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public RoleOperationDTO get(String id) { + RoleOperationEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, RoleOperationDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(RoleOperationDTO dto) { + RoleOperationEntity entity = ConvertUtils.sourceToTarget(dto, RoleOperationEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(RoleOperationDTO dto) { + RoleOperationEntity entity = ConvertUtils.sourceToTarget(dto, RoleOperationEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public List listOperationsByRoleId(String roleId) { + return baseDao.listOperationsByRoleId(roleId); + } + + @Override + @Transactional + public void initDefaultOperationsForRoles(List roles) { + for (InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role : roles) { + String roleId = role.getRoleId(); + String roleKey = role.getRoleKey(); + List defaultOperations = roleOperationDefaultDao.listByRoleKey(roleKey); + if (!CollectionUtils.isEmpty(defaultOperations)) { + // 有的角色并没有配置默认的操作权限，应该忽略 + initDefaultOperationsForRole(roleId, defaultOperations); + initDefaultOperationScopesForRole(roleId, roleKey, defaultOperations); + } + } + } + + /** + * 为某一个角色初始化默认操作权限 + * @param roleId + * @param operations + */ + public void initDefaultOperationsForRole(String roleId, List operations) { + for (RoleOperationDefaultResultDTO operation : operations) { + RoleOperationEntity entity = new RoleOperationEntity(); + entity.setOperationKey(operation.getOperationKey()); + entity.setRoleId(roleId); + roleOperationDao.insert(entity); + } + } + + /** + * 为角色初始化操作范围 + * 传入的map为所有操作的默认操作范围，但是具体要为该角色初始化哪一些操作，是由operations参数决定的，并不是map中所有操作都会被初始化给该role + * @param roleId 角色ID + * @param operations 该角色可以做的操作列表 + */ + public void initDefaultOperationScopesForRole(String roleId, String roleKey, List operations) { + HashMap> opeScopeMap = listDefaultOpeScopesMap(roleKey); + for (RoleOperationDefaultResultDTO operation : operations) { + // 该角色，该操作的操作范围列表 + Set scopeKeys4ThisOpe = opeScopeMap.get(operation.getOperationKey()); + if (!CollectionUtils.isEmpty(scopeKeys4ThisOpe)) { + for (String scopeKey : scopeKeys4ThisOpe) { + RoleScopeEntity roleScopeEntity = new RoleScopeEntity(); + roleScopeEntity.setOperationKey(operation.getOperationKey()); + roleScopeEntity.setRoleId(roleId); + roleScopeEntity.setScopeKey(scopeKey); + roleScopeDao.insert(roleScopeEntity); + } + } + } + } + + private HashMap> listDefaultOpeScopesMap(String roleKey) { + List defaultScopes = operationScopeDefaultDao.listDefaultOpeScopes(roleKey); + return convertScopeDefaultDto2Map(defaultScopes); + } + + /** + * 将默认范围entity转换为map + * @param entities + * @return + */ + private HashMap> convertScopeDefaultEntity2Map(List entities) { + HashMap> map = new HashMap<>(); + for (OperationScopeDefaultEntity entity : entities) { + Set scopes = map.get(entity.getOperationKey()); + if (scopes == null) { + scopes = new HashSet<>(); + map.put(entity.getOperationKey(), scopes); + } + scopes.add(entity.getScopeKey()); + } + return map; + } + + /** + * 将默认范围dto转换为map + * @param dtos + * @return + */ + private HashMap> convertScopeDefaultDto2Map(List dtos) { + HashMap> map = new HashMap<>(); + for (OperationScopeDefaultResultDTO dto : dtos) { + Set scopes = map.get(dto.getOperationKey()); + if (scopes == null) { + scopes = new HashSet<>(); + map.put(dto.getOperationKey(), scopes); + } + scopes.add(dto.getScopeKey()); + } + return map; + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java new file mode 100644 index 0000000000..bff52f8d64 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java @@ -0,0 +1,100 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.RoleScopeDao; +import com.epmet.dto.RoleScopeDTO; +import com.epmet.entity.RoleScopeEntity; +import com.epmet.service.RoleScopeService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 角色能操作哪些范围 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-24 + */ +@Service +public class RoleScopeServiceImpl extends BaseServiceImpl implements RoleScopeService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, RoleScopeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, RoleScopeDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public RoleScopeDTO get(String id) { + RoleScopeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, RoleScopeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(RoleScopeDTO dto) { + RoleScopeEntity entity = ConvertUtils.sourceToTarget(dto, RoleScopeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(RoleScopeDTO dto) { + RoleScopeEntity entity = ConvertUtils.sourceToTarget(dto, RoleScopeEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java new file mode 100644 index 0000000000..99ba370525 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java @@ -0,0 +1,16 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.annotation.ExternalRequestAuth; +import com.epmet.service.TestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class TestServiceImpl implements TestService { + + @ExternalRequestAuth + @Override + public void test() { + System.out.println("TestService -> test()"); + } +} diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml b/gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..ba54ae13d4 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml @@ -0,0 +1,125 @@ +server: + port: 9999 + servlet: + context-path: /lb + +spring: + main: + allow-bean-definition-overriding: true + application: + name: lb-server + #环境 dev|test|prod + profiles: + active: @spring.profiles.active@ + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + redis: + database: @spring.redis.index@ + host: @spring.redis.host@ + port: @spring.redis.port@ + password: @spring.redis.password@ + timeout: 30s + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + cloud: + nacos: + discovery: + server-addr: 192.168.1.130:8848 + #nacos的命名空间ID，默认是public + namespace: 6ceab336-d004-4acf-89c6-e121d06f4988 + #不把自己注册到注册中心的地址 + register-enabled: true + ip: @nacos.ip@ + config: + enabled: @nacos.config-enabled@ + server-addr: @nacos.server-addr@ + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + file-extension: yaml + #指定共享配置，且支持动态刷新 +# ext-config: +# - data-id: datasource.yaml +# group: ${spring.cloud.nacos.config.group} +# refresh: true +# - data-id: common.yaml +# group: ${spring.cloud.nacos.config.group} +# refresh: true + + # 数据迁移工具flyway + flyway: + enabled: @spring.flyway.enabled@ + locations: classpath:db/migration + url: @spring.datasource.druid.url@ + user: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + baseline-on-migrate: true + baseline-version: 0 + + +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.epmet.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: ID_WORKER + #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" + field-strategy: NOT_NULL + #驼峰下划线转换 + column-underline: true + banner: false + #原生配置 + configuration: + map-underscore-to-camel-case: true + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 + +#pageHelper分页插件 +pagehelper: + helper-dialect: mysql + reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1 + +#feign 日志需要该配置 +logging: + level: + com.epmet: debug \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql b/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql new file mode 100644 index 0000000000..7a51a3f595 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql @@ -0,0 +1 @@ +select 0; \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql b/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql new file mode 100644 index 0000000000..7933982d49 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql @@ -0,0 +1,91 @@ +CREATE TABLE `gov_language` ( + `table_name` varchar(32) NOT NULL COMMENT '表名', + `table_id` varchar(64) NOT NULL COMMENT '表主键', + `field_name` varchar(32) NOT NULL COMMENT '字段名', + `field_value` varchar(200) NOT NULL COMMENT '字段值', + `language` varchar(10) NOT NULL COMMENT '语言', + PRIMARY KEY (`table_name`,`table_id`,`field_name`,`language`) USING BTREE, + KEY `idx_table_id` (`table_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='国际化'; +CREATE TABLE `gov_menu` ( + `id` varchar(64) NOT NULL COMMENT 'id', + `pid` varchar(64) DEFAULT NULL COMMENT '上级ID，一级菜单为0', + `url` varchar(200) DEFAULT NULL COMMENT '菜单URL', + `type` tinyint(3) unsigned DEFAULT NULL COMMENT '类型 0：菜单 1：按钮', + `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', + `permissions` varchar(32) DEFAULT NULL COMMENT '权限标识，如：sys:menu:save', + `sort` int(11) DEFAULT NULL COMMENT '排序', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', + `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + `SHOW_FLAG` int(11) NOT NULL DEFAULT '1' COMMENT '是否显示，1：显示 0不显示', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_pid` (`pid`) USING BTREE, + KEY `idx_del_flag` (`DEL_FLAG`) USING BTREE, + KEY `idx_create_date` (`CREATED_TIME`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='菜单管理'; +CREATE TABLE `gov_resource` ( + `id` varchar(64) NOT NULL COMMENT 'id', + `resource_code` varchar(32) DEFAULT NULL COMMENT '资源编码，如菜单ID', + `resource_name` varchar(32) DEFAULT NULL COMMENT '资源名称', + `resource_url` varchar(100) DEFAULT NULL COMMENT '资源URL', + `resource_method` varchar(8) DEFAULT NULL COMMENT '请求方式（如：GET、POST、PUT、DELETE）', + `menu_flag` tinyint(3) unsigned DEFAULT NULL COMMENT '菜单标识 0：非菜单资源 1：菜单资源', + `auth_level` tinyint(3) unsigned DEFAULT NULL COMMENT '认证等级 0：权限认证 1：登录认证 2：无需认证', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', + `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_resource_code` (`resource_code`) USING BTREE, + KEY `idx_create_date` (`CREATED_TIME`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='资源管理'; +CREATE TABLE `gov_role` ( + `id` varchar(64) NOT NULL COMMENT 'id', + `name` varchar(32) DEFAULT NULL COMMENT '角色名称', + `remark` varchar(100) DEFAULT NULL COMMENT '备注', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', + `dept_id` bigint(20) DEFAULT NULL COMMENT '部门ID', + `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_dept_id` (`dept_id`) USING BTREE, + KEY `idx_del_flag` (`DEL_FLAG`) USING BTREE, + KEY `idx_create_date` (`CREATED_TIME`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色管理'; +CREATE TABLE `gov_role_menu` ( + `id` varchar(64) NOT NULL COMMENT 'id', + `role_id` varchar(64) DEFAULT NULL COMMENT '角色ID', + `menu_id` varchar(64) DEFAULT NULL COMMENT '菜单ID', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', + `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_role_id` (`role_id`) USING BTREE, + KEY `idx_menu_id` (`menu_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色菜单关系'; +CREATE TABLE `gov_role_user` ( + `id` varchar(64) NOT NULL COMMENT 'id', + `role_id` varchar(64) DEFAULT NULL COMMENT '角色ID', + `user_id` varchar(64) DEFAULT NULL COMMENT '用户ID', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', + `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_role_id` (`role_id`) USING BTREE, + KEY `idx_user_id` (`user_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色用户关系'; \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..45b1ddc4e0 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml @@ -0,0 +1,164 @@ + + + + + + + + + + ${appname} + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml new file mode 100644 index 0000000000..5b829dc734 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + INSERT INTO `gov_language` ( `table_name`, `table_id`, `field_name`, `field_value`, `language` ) + VALUES + ( #{tableName}, #{tableId}, #{fieldName}, #{fieldValue}, #{language} ) + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml new file mode 100644 index 0000000000..90d0b8ee92 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml new file mode 100644 index 0000000000..8296d14065 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml @@ -0,0 +1,25 @@ + + + + + + + delete from gov_resource where resource_code = #{value} + + + + + + + + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml new file mode 100644 index 0000000000..2de28e07bf --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml new file mode 100644 index 0000000000..862679b5de --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + update gov_role_menu set del_flag = 1 where del_flag = 0 and role_id in + + #{roleId} + + + + + update gov_role_menu set del_flag = 1 where role_id = #{value} and del_flag = 0 + + + + update gov_role_menu set del_flag = 1 where menu_id = #{value} and del_flag = 0 + + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml new file mode 100644 index 0000000000..b5cb172451 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml @@ -0,0 +1,32 @@ + + + + + + + update gov_role_user set del_flag = 1 where del_flag = 0 and role_id in + + #{roleId} + + + + + update gov_role_user set del_flag = 1 where del_flag = 0 and user_id in + + #{userId} + + + + + update gov_role_user set del_flag = 1 where role_id = #{value} and del_flag = 0 + + + + update gov_role_user set del_flag = 1 where user_id = #{value} and del_flag = 0 + + + + + diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml new file mode 100644 index 0000000000..824b7a4feb --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml new file mode 100644 index 0000000000..0591776c96 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml new file mode 100755 index 0000000000..da0ae9597d --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + DELETE + FROM operation_scope_default + WHERE ROLE_KEY = #{roleKey} + AND OPERATION_KEY = #{operationKey} + AND SCOPE_KEY = #{scopeKey} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml new file mode 100644 index 0000000000..7009237115 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE role_operation + SET DEL_FLAG = 1 + WHERE ROLE_ID = #{roleId} + AND OPERATION_KEY = #{opeKey} + + + + + + + UPDATE role_operation + SET DEL_FLAG = 0 + WHERE ROLE_ID = #{roleId} + AND OPERATION_KEY = #{opeKey} + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml new file mode 100755 index 0000000000..98cd9f675b --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + DELETE FROM role_operation_default WHERE ROLE_KEY = #{roleKey} AND OPERATION_KEY = #{operationKey} + + + + + + + + \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml new file mode 100644 index 0000000000..9a0337a2c7 --- /dev/null +++ b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + DELETE + FROM role_scope + WHERE ROLE_ID = #{roleId} + AND OPERATION_KEY = #{operationKey} + AND SCOPE_KEY IN + + #{scopeKey} + + + + + + DELETE + FROM role_scope + WHERE ROLE_ID = #{roleId} + AND OPERATION_KEY = #{operationKey} + AND SCOPE_KEY = #{scopeKey} + + + + + + + \ No newline at end of file diff --git a/gov-access-lb/pom.xml b/gov-access-lb/pom.xml new file mode 100644 index 0000000000..c7847e4776 --- /dev/null +++ b/gov-access-lb/pom.xml @@ -0,0 +1,21 @@ + + + + epmet-module + com.epmet + 2.0.0 + + 4.0.0 + + gov-access-lb + pom + + + gov-access-lb-client + gov-access-lb-server + + + + \ No newline at end of file From 70b2b8a35dd650798d21d262e9c892c5065a2a89 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 11:09:53 +0800 Subject: [PATCH 347/589] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gov-access-lb/gov-access-lb-client/pom.xml | 27 - .../java/com/epmet/dto/GovLanguageDTO.java | 61 -- .../main/java/com/epmet/dto/GovMenuDTO.java | 124 ---- .../java/com/epmet/dto/GovResourceDTO.java | 102 --- .../main/java/com/epmet/dto/GovRoleDTO.java | 93 --- .../java/com/epmet/dto/GovRoleMenuDTO.java | 82 --- .../java/com/epmet/dto/GovRoleUserDTO.java | 82 --- .../java/com/epmet/dto/OperationScopeDTO.java | 86 --- .../java/com/epmet/dto/RoleOperationDTO.java | 82 --- .../main/java/com/epmet/dto/RoleScopeDTO.java | 86 --- .../form/AccessConfigAdd4RoletFormDTO.java | 17 - .../AccessConfigOpeDefaultScopesFormDTO.java | 26 - .../dto/form/AccessConfigOpesFormDTO.java | 16 - .../dto/form/AccessConfigOptionsFormDTO.java | 16 - .../AccessConfigRoleDefaultOpesFormDTO.java | 18 - .../dto/form/AccessConfigSaveConfigDTO.java | 18 - .../epmet/dto/form/AccessSettingFormDTO.java | 12 - .../epmet/dto/form/GetSQLFilterFormDTO.java | 29 - .../form/HasSpecifiedPermissionFormDTO.java | 22 - .../form/InitDefaultOperationsFormDTO.java | 20 - .../epmet/dto/form/ListOpePermsFormDTO.java | 18 - .../epmet/dto/form/OperationScopeFormDTO.java | 18 - .../epmet/dto/form/StaffPermCacheFormDTO.java | 59 -- ...AccessConfigOpeDefaultScopesResultDTO.java | 16 - .../dto/result/AccessConfigOpesResultDTO.java | 13 - .../result/AccessConfigOptionsResultDTO.java | 10 - .../result/AccessConfigScopeResultDTO.java | 15 - .../dto/result/AccessSettingResultDTO.java | 58 -- .../dto/result/LoginUserDetailsResultDTO.java | 59 -- .../com/epmet/dto/result/MenuResourceDTO.java | 29 - .../OperationScopeDefaultResultDTO.java | 20 - .../dto/result/RoleOpeScopeResultDTO.java | 36 -- .../result/RoleOperationDefaultResultDTO.java | 60 -- .../dto/result/RoleOperationResultDTO.java | 87 --- .../java/com/epmet/enums/MenuFlagEnum.java | 36 -- .../java/com/epmet/enums/MenuTypeEnum.java | 36 -- .../java/com/epmet/enums/RegionLeafEnum.java | 29 - .../java/com/epmet/enums/RegionLevelEnum.java | 30 - .../java/com/epmet/enums/UserStatusEnum.java | 30 - .../com/epmet/feign/GovAccessFeignClient.java | 35 - gov-access-lb/gov-access-lb-server/Dockerfile | 11 - .../deploy/docker-compose-dev.yml | 18 - .../deploy/docker-compose-prod.yml | 18 - .../deploy/docker-compose-test.yml | 18 - gov-access-lb/gov-access-lb-server/pom.xml | 137 ---- .../com/epmet/GovAccessLbApplication.java | 20 - .../com/epmet/aspect/RequestLogAspect.java | 40 -- .../epmet/bean/OpeScopeFilterResultBean.java | 15 - .../com/epmet/config/DatabaseProperties.java | 15 - .../com/epmet/config/DbMigrationConfig.java | 29 - .../com/epmet/config/ModuleConfigImpl.java | 26 - .../epmet/config/PermissionInitializer.java | 69 -- .../constant/OperationScopeConstant.java | 53 -- .../controller/AccessConfigController.java | 138 ---- .../epmet/controller/AccessController.java | 60 -- .../com/epmet/controller/DemoController.java | 64 -- .../controller/GovLanguageController.java | 85 --- .../epmet/controller/GovMenuController.java | 156 ----- .../controller/GovResourceController.java | 84 --- .../epmet/controller/GovRoleController.java | 104 --- .../controller/GovRoleMenuController.java | 85 --- .../controller/GovRoleUserController.java | 132 ---- .../com/epmet/controller/LbController.java | 21 - .../com/epmet/controller/RoleController.java | 41 -- .../com/epmet/controller/TestController.java | 25 - .../java/com/epmet/dao/GovLanguageDao.java | 28 - .../main/java/com/epmet/dao/GovMenuDao.java | 52 -- .../java/com/epmet/dao/GovResourceDao.java | 48 -- .../main/java/com/epmet/dao/GovRoleDao.java | 24 - .../java/com/epmet/dao/GovRoleMenuDao.java | 49 -- .../java/com/epmet/dao/GovRoleUserDao.java | 57 -- .../main/java/com/epmet/dao/OperationDao.java | 38 -- .../java/com/epmet/dao/OperationScopeDao.java | 57 -- .../epmet/dao/OperationScopeDefaultDao.java | 64 -- .../java/com/epmet/dao/RoleOperationDao.java | 47 -- .../epmet/dao/RoleOperationDefaultDao.java | 57 -- .../main/java/com/epmet/dao/RoleScopeDao.java | 85 --- .../com/epmet/entity/GovLanguageEntity.java | 49 -- .../java/com/epmet/entity/GovMenuEntity.java | 69 -- .../com/epmet/entity/GovResourceEntity.java | 53 -- .../java/com/epmet/entity/GovRoleEntity.java | 44 -- .../com/epmet/entity/GovRoleMenuEntity.java | 36 -- .../com/epmet/entity/GovRoleUserEntity.java | 37 -- .../com/epmet/entity/OperationEntity.java | 56 -- .../entity/OperationScopeDefaultEntity.java | 53 -- .../epmet/entity/OperationScopeEntity.java | 55 -- .../entity/RoleOperationDefaultEntity.java | 42 -- .../com/epmet/entity/RoleOperationEntity.java | 51 -- .../com/epmet/entity/RoleScopeEntity.java | 56 -- .../com/epmet/excel/RoleOperationExcel.java | 62 -- .../com/epmet/feign/EpmetUserFeignClient.java | 77 --- .../com/epmet/feign/GovOrgFeignClient.java | 34 - .../EpmetUserFeignClientFallback.java | 49 -- .../fallback/GovOrgFeignClientFallBack.java | 31 - .../com/epmet/redis/GovLanguageRedis.java | 47 -- .../java/com/epmet/redis/GovMenuRedis.java | 74 --- .../com/epmet/redis/GovResourceRedis.java | 50 -- .../com/epmet/redis/GovRoleMenuRedis.java | 47 -- .../java/com/epmet/redis/GovRoleRedis.java | 47 -- .../com/epmet/redis/GovRoleUserRedis.java | 47 -- .../com/epmet/redis/RoleOpeScopeRedis.java | 74 --- .../epmet/service/AccessConfigService.java | 30 - .../java/com/epmet/service/AccessService.java | 44 -- .../com/epmet/service/GovLanguageService.java | 105 --- .../com/epmet/service/GovMenuService.java | 144 ----- .../com/epmet/service/GovResourceService.java | 110 ---- .../com/epmet/service/GovRoleMenuService.java | 125 ---- .../com/epmet/service/GovRoleService.java | 95 --- .../com/epmet/service/GovRoleUserService.java | 133 ---- .../epmet/service/OperationScopeService.java | 95 --- .../com/epmet/service/OperationService.java | 14 - .../epmet/service/RoleOperationService.java | 106 ---- .../com/epmet/service/RoleScopeService.java | 95 --- .../java/com/epmet/service/TestService.java | 7 - .../service/impl/AccessConfigServiceImpl.java | 264 -------- .../epmet/service/impl/AccessServiceImpl.java | 597 ------------------ .../service/impl/GovLanguageServiceImpl.java | 121 ---- .../service/impl/GovMenuServiceImpl.java | 247 -------- .../service/impl/GovResourceServiceImpl.java | 143 ----- .../service/impl/GovRoleMenuServiceImpl.java | 150 ----- .../service/impl/GovRoleServiceImpl.java | 118 ---- .../service/impl/GovRoleUserServiceImpl.java | 156 ----- .../impl/OperationScopeServiceImpl.java | 101 --- .../service/impl/OperationServiceImpl.java | 35 - .../impl/RoleOperationServiceImpl.java | 218 ------- .../service/impl/RoleScopeServiceImpl.java | 100 --- .../epmet/service/impl/TestServiceImpl.java | 16 - .../src/main/resources/bootstrap.yml | 125 ---- .../resources/db/migration/V0.0.1__init.sql | 1 - .../resources/db/migration/V0.0.2__add.sql | 91 --- .../src/main/resources/logback-spring.xml | 164 ----- .../main/resources/mapper/GovLanguageDao.xml | 21 - .../src/main/resources/mapper/GovMenuDao.xml | 42 -- .../main/resources/mapper/GovResourceDao.xml | 25 - .../src/main/resources/mapper/GovRoleDao.xml | 6 - .../main/resources/mapper/GovRoleMenuDao.xml | 25 - .../main/resources/mapper/GovRoleUserDao.xml | 32 - .../main/resources/mapper/OperationDao.xml | 32 - .../resources/mapper/OperationScopeDao.xml | 76 --- .../mapper/OperationScopeDefaultDao.xml | 77 --- .../resources/mapper/RoleOperationDao.xml | 69 -- .../mapper/RoleOperationDefaultDao.xml | 53 -- .../main/resources/mapper/RoleScopeDao.xml | 75 --- gov-access-lb/pom.xml | 21 - 144 files changed, 9327 deletions(-) delete mode 100644 gov-access-lb/gov-access-lb-client/pom.xml delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java delete mode 100755 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java delete mode 100644 gov-access-lb/gov-access-lb-server/Dockerfile delete mode 100644 gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml delete mode 100644 gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml delete mode 100644 gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml delete mode 100644 gov-access-lb/gov-access-lb-server/pom.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java delete mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java delete mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java delete mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java delete mode 100755 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml delete mode 100755 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml delete mode 100755 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml delete mode 100644 gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml delete mode 100644 gov-access-lb/pom.xml diff --git a/gov-access-lb/gov-access-lb-client/pom.xml b/gov-access-lb/gov-access-lb-client/pom.xml deleted file mode 100644 index 1861f2e625..0000000000 --- a/gov-access-lb/gov-access-lb-client/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - gov-access-lb - com.epmet - 2.0.0 - - 4.0.0 - - gov-access-lb-client - - - - com.epmet - epmet-commons-tools - 2.0.0 - - - io.swagger - swagger-annotations - 1.5.20 - compile - - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java deleted file mode 100644 index ed7f5924db..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovLanguageDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; - - -/** - * 国际化 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Data -public class GovLanguageDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 表名 - */ - private String tableName; - - /** - * 表主键 - */ - private String tableId; - - /** - * 字段名 - */ - private String fieldName; - - /** - * 字段值 - */ - private String fieldValue; - - /** - * 语言 - */ - private String language; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java deleted file mode 100644 index fb130e9c65..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovMenuDTO.java +++ /dev/null @@ -1,124 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import com.epmet.commons.tools.utils.TreeStringNode; -import com.epmet.dto.result.MenuResourceDTO; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - - -/** - * 菜单管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Data -public class GovMenuDTO extends TreeStringNode implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - - /** - * 上级ID，一级菜单为0 - */ - private String pid; - - /** - * 菜单名称 - */ - private String name; - - /** - * 菜单URL - */ - private String url; - - /** - * 类型 0：菜单 1：按钮 - */ - private Integer type; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 权限标识，如：sys:menu:save - */ - private String permissions; - - /** - * 排序 - */ - private Integer sort; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 菜单资源 - */ - private List resourceList; - - /** - * 上级菜单名称 - */ - private String parentName; - - /** - * 是否显示，1：显示 0不显示 - */ - private Integer showFlag; -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java deleted file mode 100644 index 59a9576598..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovResourceDTO.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 资源管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Data -public class GovResourceDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - - /** - * 资源编码，如菜单ID - */ - private String resourceCode; - - /** - * 资源名称 - */ - private String resourceName; - - /** - * 资源URL - */ - private String resourceUrl; - - /** - * 请求方式（如：GET、POST、PUT、DELETE） - */ - private String resourceMethod; - - /** - * 菜单标识 0：非菜单资源 1：菜单资源 - */ - private Integer menuFlag; - - /** - * 认证等级 0：权限认证 1：登录认证 2：无需认证 - */ - private Integer authLevel; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java deleted file mode 100644 index efe6643df6..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleDTO.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - - -/** - * 角色管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Data -public class GovRoleDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - - /** - * 角色名称 - */ - private String name; - - /** - * 备注 - */ - private String remark; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 菜单ID列表 - */ - private List menuIdList; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java deleted file mode 100644 index eacde30cf3..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 角色菜单关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Data -public class GovRoleMenuDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 菜单ID - */ - private String menuId; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java deleted file mode 100644 index d3881edeb2..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 角色用户关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Data -public class GovRoleUserDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 用户ID - */ - private String userId; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java deleted file mode 100644 index 35885d7f8c..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/OperationScopeDTO.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 权限范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Data -public class OperationScopeDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - - /** - * 范围key - */ - private String scopeKey; - - /** - * 范围名称 - */ - private String scopeName; - - /** - * 范围序号 - */ - private String scopeIndex; - - /** - * 是否删除，0：未删除，1：已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建者id - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新者id - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java deleted file mode 100644 index bda4931386..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleOperationDTO.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -@Data -public class RoleOperationDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - - /** - * 是否删除，0：未删除，1：已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建者id - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新者id - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java deleted file mode 100644 index 17f8866215..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/RoleScopeDTO.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 角色能操作哪些范围 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Data -public class RoleScopeDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - - /** - * 范围Key - */ - private String scopeKey; - - /** - * 是否删除，0：未删除，1：已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建者id - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新者id - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java deleted file mode 100644 index 85b9e9d68d..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.List; - -@Data -public class AccessConfigAdd4RoletFormDTO { - @NotBlank(message = "角色Key不能为空") - private String roleKey; - - @NotBlank(message = "操作Key不能为空") - private String operationKey; - - private List scopeKeys; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java deleted file mode 100644 index 86dad3a7a3..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * 权限配置-操作默认范围form dto - */ -@Data -public class AccessConfigOpeDefaultScopesFormDTO { - - public interface ListOpeDefaultScopesGroup {} - public interface SaveOpeDefaultScopesGroup {} - - @NotBlank(message = "角色Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class }) - private String roleKey; - - @NotBlank(message = "操作Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class }) - private String operationKey; - - private List scopeKeys; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java deleted file mode 100644 index 8a84ddf960..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOpesFormDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dto.form; - -import com.epmet.dto.result.AccessConfigOpesResultDTO; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.List; - -@Data -public class AccessConfigOpesFormDTO { - - @NotBlank(message = "角色ID不能为空") - private String roleId; - private List opes; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java deleted file mode 100644 index b96e438e0b..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigOptionsFormDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -@Data -public class AccessConfigOptionsFormDTO { - - @NotBlank(message = "角色ID不能为空") - private String roleId; - - @NotBlank(message = "操作的Key不能为空") - private String operationKey; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java deleted file mode 100644 index cb6f196403..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.List; - -/** - * 角色默认操作权限列表from DTO - */ -@Data -public class AccessConfigRoleDefaultOpesFormDTO { - - @NotBlank(message = "角色Key不能为空") - private String roleKey; - - private List operationKeys; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java deleted file mode 100644 index 6a918b5bb2..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessConfigSaveConfigDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.Set; - -@Data -public class AccessConfigSaveConfigDTO { - - @NotBlank(message = "角色ID不能为空") - private String roleId; - @NotBlank(message = "操作Key不能为空") - private String operationKey; - private Set scopeKeys; - private Set settingKeys; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java deleted file mode 100644 index ecd5e6b99f..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/AccessSettingFormDTO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -/** - * 查询拥有的权限的DTO，非后台配置用 - */ -@Data -public class AccessSettingFormDTO { - private String roleId; - private String operationKey; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java deleted file mode 100644 index 4901eca2bb..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.Set; - -@Data -public class GetSQLFilterFormDTO { - - @NotBlank - private String operationKey; - - @NotBlank - private String userId; - - @NotBlank - private String app; - - @NotBlank - private String client; - - private String tableAlias; - - private Set gridIds; - - private Set departmentIds; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java deleted file mode 100644 index 4dabc98dd0..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/HasSpecifiedPermissionFormDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -@Data -public class HasSpecifiedPermissionFormDTO { - - @NotBlank - private String operationKey; - - @NotBlank - private String userId; - - @NotBlank - private String app; - - @NotBlank - private String client; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java deleted file mode 100644 index d7b487ad67..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import java.util.List; - -@Data -public class InitDefaultOperationsFormDTO { - - private List roles; - - @Data - public static class InitDefaultOpesRoleDTO { - public InitDefaultOpesRoleDTO() { - } - - private String roleId; - private String roleKey; - } -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java deleted file mode 100644 index a7b1b2a7df..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -@Data -public class ListOpePermsFormDTO { - - @NotBlank(message = "用户ID不能为空") - private String staffId; - @NotBlank(message = "当前单位不能为空") - private String currAgencyId; - - private String currGridId; - - private String currDeptId; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java deleted file mode 100644 index af992b7d51..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/OperationScopeFormDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -@Data -public class OperationScopeFormDTO { - - public interface ListOperationScopeGroup {} - - @NotBlank(message = "角色ID不能为空", groups = {ListOperationScopeGroup.class}) - private String roleId; - - @NotBlank(message = "操作的key不能为空", groups = {ListOperationScopeGroup.class}) - private String operationKey; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java deleted file mode 100644 index a35af017c9..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/form/StaffPermCacheFormDTO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.Set; - -@Data -public class StaffPermCacheFormDTO { - - /** - * 更新权限缓存分组 - */ - public interface UpdatePermissionCache {} - - /** - * 查询当前权限列表 - */ - public interface GetStaffCurrPermissions {} - - /** - * 工作人员 id - */ - @NotBlank(message = "工作人员ID不能为空", groups = {UpdatePermissionCache.class, GetStaffCurrPermissions.class}) - private String staffId; - - /** - * 登录头信息app - */ - @NotBlank(message = "登录头信息app不能为空", groups = {UpdatePermissionCache.class, GetStaffCurrPermissions.class}) - private String app; - - /** - * 登录头信息client - */ - @NotBlank(message = "登录头信息client不能为空", groups = {UpdatePermissionCache.class, GetStaffCurrPermissions.class}) - private String client; - - /** - * 组织ID路径 - */ - private String orgIdPath; - - /** - * 权限列表 - */ - private Set permissions; - - /** - * 角色列表 - */ - private Set roleIdList; - - /** - * 当前所在网格id - */ - private String gridId; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java deleted file mode 100644 index 53023bd459..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -/** - * 权限配置-操作的默认范围result dto - */ -@Data -public class AccessConfigOpeDefaultScopesResultDTO { - private String scopeKey; - private String scopeName; - private String scopeIndex; - private String operationKey; - private String roleKey; - private Boolean assigned; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java deleted file mode 100644 index bf24f851d2..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOpesResultDTO.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -@Data -public class AccessConfigOpesResultDTO { - - private String operationKey; - private String operationName; - private String brief; - private Boolean assigned; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java deleted file mode 100644 index 4959a3af40..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigOptionsResultDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -import java.util.List; - -@Data -public class AccessConfigOptionsResultDTO { - private List scopeOptions; -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java deleted file mode 100644 index e1eb02e9fb..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessConfigScopeResultDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -@Data -public class AccessConfigScopeResultDTO { - - private String scopeKey; - private String scopeName; - private String scopeIndex; - private String operationKey; - private String roleId; - private Boolean assigned; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java deleted file mode 100644 index d00d440e63..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/AccessSettingResultDTO.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto.result; - -import lombok.Data; - -/** - * 权限配置 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-29 - */ -@Data -public class AccessSettingResultDTO { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - - /** - * 配置KEY - */ - private String settingKey; - - /** - * 配置值 - */ - private String settingValue; - - /** - * 配置名称 - */ - private String settingName; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java deleted file mode 100644 index 2a14ada3fd..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.epmet.dto.result; - -import com.epmet.commons.tools.security.dto.GovTokenDto; -import lombok.Data; - -import java.util.List; -import java.util.Set; - -@Data -public class LoginUserDetailsResultDTO { - - /** - * 政府端:gov、居民端:resi、运营端:oper - */ - private String app; - - /** - * PC端:web、微信小程序:wxmp - */ - private String client; - - /** - * 用户ID - */ - private String userId; - - /** - * 角色列表 - */ - //private Set roleIdList; - private List roleList; - - /** - * 部门id列表 - */ - private Set deptIdList; - - /** - * 当前登录的组织id(顶级) - */ - private String agencyId; - - /** - * 组织ID - */ - private String orgIdPath; - - /** - * 网格ID列表 - */ - private Set gridIdList; - - /** - * 当前工作人员进入的客户id - */ - private String customerId; - - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java deleted file mode 100644 index 86df7d55ca..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dto.result; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 菜单资源 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Data -@ApiModel(value = "菜单资源") -public class MenuResourceDTO { - @ApiModelProperty(value = "资源URL") - private String resourceUrl; - @ApiModelProperty(value = "请求方式（如：GET、POST、PUT、DELETE）") - private String resourceMethod; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java deleted file mode 100644 index 4c1f593712..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -@Data -public class OperationScopeDefaultResultDTO { - - private String roleKey; - - /** - * 操作key - */ - private String operationKey; - - /** - * 范围key - */ - private String scopeKey; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java deleted file mode 100644 index d950f7dc85..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOpeScopeResultDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -@Data -public class RoleOpeScopeResultDTO { - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - - /** - * 范围key - */ - private String scopeKey; - - /** - * 范围名称 - */ - private String scopeName; - - /** - * 范围序号 - */ - private String scopeIndex; - - private String series; - private Integer sort; - -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java deleted file mode 100755 index 6961dad6ca..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto.result; - -import java.io.Serializable; -import lombok.Data; - - -/** - * 角色默认的可操作功能列表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-21 - */ -@Data -public class RoleOperationDefaultResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - - /** - * 角色KEY - */ - private String roleKey; - - /** - * 操作key - */ - private String operationKey; - - /** - * 操作名称 - */ - private String operationName; - - /** - * 是否已经具有该操作权限 - */ - private Boolean assigned; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java deleted file mode 100644 index dc7fc1559e..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/dto/result/RoleOperationResultDTO.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dto.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -@Data -public class RoleOperationResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - - /** - * 操作名称 - */ - private String operationName; - - /** - * 是否删除，0：未删除，1：已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建者id - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新者id - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java deleted file mode 100644 index 2a880a728a..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuFlagEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.enums; - -/** - * 菜单资源标识 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -public enum MenuFlagEnum { - /** - * 菜单资源 - */ - YES(1), - /** - * 非菜单资源 - */ - NO(0); - - private int value; - - MenuFlagEnum(int value) { - this.value = value; - } - - public int value() { - return this.value; - } -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java deleted file mode 100644 index 7132fa2ce3..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/MenuTypeEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.enums; - -/** - * 菜单类型枚举 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -public enum MenuTypeEnum { - /** - * 菜单 - */ - MENU(0), - /** - * 按钮 - */ - BUTTON(1); - - private int value; - - MenuTypeEnum(int value) { - this.value = value; - } - - public int value() { - return this.value; - } -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java deleted file mode 100644 index 36300e201f..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLeafEnum.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) 2019 人人开源 All rights reserved. - *

- * https://www.renren.io - *

- * 版权所有，侵权必究！ - */ - -package com.epmet.enums; - -/** - * 叶子节点枚举 - * - * @author Mark sunlightcs@gmail.com - */ -public enum RegionLeafEnum { - YES(1), - NO(0); - - private int value; - - RegionLeafEnum(int value) { - this.value = value; - } - - public int value() { - return this.value; - } -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java deleted file mode 100644 index b29c456897..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/RegionLevelEnum.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2019 人人开源 All rights reserved. - *

- * https://www.renren.io - *

- * 版权所有，侵权必究！ - */ - -package com.epmet.enums; - -/** - * 行政区域 级别枚举 - * - * @author Mark sunlightcs@gmail.com - */ -public enum RegionLevelEnum { - ONE(1), - TWO(2), - THREE(3); - - private int value; - - RegionLevelEnum(int value) { - this.value = value; - } - - public int value() { - return this.value; - } -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java deleted file mode 100644 index dbc043f529..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/enums/UserStatusEnum.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.enums; - -/** - * 用户状态 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -public enum UserStatusEnum { - DISABLE(0), - ENABLED(1); - - private int value; - - UserStatusEnum(int value) { - this.value = value; - } - - public int value() { - return this.value; - } -} diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java deleted file mode 100644 index 1af72f3d72..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.epmet.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.feign.fallback.GovAccessFeignClientFallBack; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.Set; - -//@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "http://localhost:8099") -@FeignClient(name = "lb-server", fallback = GovAccessFeignClientFallBack.class) -public interface GovAccessFeignClient { - - /** - * 批量为角色ID初始化操作权限列表 - * @param formDTO - * @return - */ - @PostMapping("/gov/access/role/initdefaultoperationsforroles") - Result initDefaultOperationsForRoles(@RequestBody InitDefaultOperationsFormDTO formDTO); - - /** - * 列出觉得的功能权限列表 - * @return - */ - @PostMapping("/gov/access/access/listoperationpermissions") - Result> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO); - - @PostMapping("/lb/get-host") - Result getHost(); -} diff --git a/gov-access-lb/gov-access-lb-server/Dockerfile b/gov-access-lb/gov-access-lb-server/Dockerfile deleted file mode 100644 index a2e8d5d488..0000000000 --- a/gov-access-lb/gov-access-lb-server/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM java:8 - -RUN export LANG="zh_CN.UTF-8" -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' > /etc/timezone - -COPY ./target/*.jar ./gov-access-lb.jar - -EXPOSE 9999 - -ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml deleted file mode 100644 index 58de243d08..0000000000 --- a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-dev.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3.7" -services: - gov-access-lb-server: - container_name: gov-access-lb-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-lb-server:version_placeholder - ports: - - "9999:9999" - network_mode: host # 使用现有网络 - volumes: - - "/opt/epmet-cloud-logs/dev:/logs" - environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-access-lb.jar" - restart: "unless-stopped" - deploy: - resources: - limits: - cpus: '0.1' - memory: 250M \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml deleted file mode 100644 index ababaa4a99..0000000000 --- a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-prod.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3.7" -services: - gov-access-server: - container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.39 - ports: - - "8099:8099" - network_mode: host # 使用现有网络 - volumes: - - "/opt/epmet-cloud-logs/prod:/logs" - environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-access.jar" - restart: "unless-stopped" - deploy: - resources: - limits: - cpus: '0.1' - memory: 600M \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml b/gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml deleted file mode 100644 index e28e5d30f0..0000000000 --- a/gov-access-lb/gov-access-lb-server/deploy/docker-compose-test.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3.7" -services: - gov-access-server: - container_name: gov-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:version_placeholder - ports: - - "8099:8099" - network_mode: host # 使用现有网络 - volumes: - - "/opt/epmet-cloud-logs/test:/logs" - environment: - RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-access.jar" - restart: "unless-stopped" - deploy: - resources: - limits: - cpus: '0.1' - memory: 400M \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/pom.xml b/gov-access-lb/gov-access-lb-server/pom.xml deleted file mode 100644 index b5e2005cc3..0000000000 --- a/gov-access-lb/gov-access-lb-server/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - 0.3.41 - - gov-access-lb - com.epmet - 2.0.0 - - 4.0.0 - - gov-access-lb-server - jar - - - - com.epmet - gov-access-client - 2.0.0 - - - com.epmet - gov-org-client - 2.0.0 - compile - - - com.epmet - epmet-user-client - 2.0.0 - compile - - - com.epmet - epmet-commons-tools - 2.0.0 - - - com.epmet - epmet-commons-mybatis - 2.0.0 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework - spring-context-support - - - org.springframework.boot - spring-boot-starter-actuator - - - de.codecentric - spring-boot-admin-starter-client - ${spring.boot.admin.version} - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - io.github.openfeign - feign-httpclient - 10.3.0 - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - ${project.basedir}/src/main/java - - - true - ${basedir}/src/main/resources - - - - - - - dev - - true - - - 9999 - dev - - - - - - epmet_gov_access_user - EpmEt-db-UsEr - - 0 - 192.168.1.130 - 6379 - 123456 - - true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 - - - false - - - - false - - - - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java deleted file mode 100644 index 9a3714756e..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/GovAccessLbApplication.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@SpringBootApplication -@EnableDiscoveryClient -@EnableFeignClients -//@EnableConfigurationProperties(value = {DatabaseProperties.class}) -public class GovAccessLbApplication { - public static void main(String[] args) { - SpringApplication.run(GovAccessLbApplication.class, args); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java deleted file mode 100644 index 49581cf63c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/aspect/RequestLogAspect.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.epmet.aspect; - -import com.epmet.commons.tools.aspect.BaseRequestLogAspect; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; - -/** - * 日志/异常处理切面实现，调用父类方法完成日志记录和异常处理。 - */ -@Aspect -@Component -@Order(0) -public class RequestLogAspect extends BaseRequestLogAspect { - - @Override - @Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ") - public Object proceed(ProceedingJoinPoint point) throws Throwable { - return super.proceed(point, getRequest()); - } - - /** - * 获取Request对象 - * - * @return - */ - private HttpServletRequest getRequest() { - RequestAttributes ra = RequestContextHolder.getRequestAttributes(); - ServletRequestAttributes sra = (ServletRequestAttributes) ra; - return sra.getRequest(); - } - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java deleted file mode 100644 index fbe1b38052..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/bean/OpeScopeFilterResultBean.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.epmet.bean; - -import lombok.Data; - -import java.util.HashSet; -import java.util.Set; - -@Data -public class OpeScopeFilterResultBean { - - private HashSet orgLevelScopes; - private Set switchScopes; - private boolean allScopes; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java deleted file mode 100644 index e9282216d8..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DatabaseProperties.java +++ /dev/null @@ -1,15 +0,0 @@ -//package com.epmet.config; -// -//import lombok.Data; -//import org.springframework.boot.context.properties.ConfigurationProperties; -// -//@ConfigurationProperties(prefix = "spring.datasource.druid") -//@Data -//public class DatabaseProperties { -// -// private String driverClassName; -// private String url; -// private String username; -// private String password; -// -//} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java deleted file mode 100644 index b9fcdfb160..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/DbMigrationConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -//package com.epmet.config; -// -//import org.flywaydb.core.Flyway; -//import org.springframework.beans.factory.annotation.Autowired; -// -//import javax.annotation.PostConstruct; -// -///** -// * 数据库迁移配置 -// */ -//@Configuration -//public class DbMigrationConfig { -// -// @Autowired -// private DatabaseProperties databaseProperties; -// -// @PostConstruct -// public void migrate() { -// Flyway flyway = Flyway.configure().dataSource( -// databaseProperties.getUrl(), -// databaseProperties.getUsername(), -// databaseProperties.getPassword()) -// .baselineOnMigrate(true) -// .load(); -// -// flyway.migrate(); -// } -// -//} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java deleted file mode 100644 index 128f1060ef..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/ModuleConfigImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - *

- * https://www.renren.io - *

- * 版权所有，侵权必究！ - */ - -package com.epmet.config; - -import com.epmet.commons.tools.config.ModuleConfig; -import org.springframework.stereotype.Service; - -/** - * 模块配置信息-新闻公告模块 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Service -public class ModuleConfigImpl implements ModuleConfig { - @Override - public String getName() { - return "govaccess"; - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java deleted file mode 100644 index 5196bd2c8c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/config/PermissionInitializer.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.epmet.config; - -import com.epmet.commons.tools.enums.RequirePermissionEnum; -import com.epmet.entity.OperationEntity; -import com.epmet.service.OperationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.CollectionUtils; - -import javax.annotation.PostConstruct; -import java.util.*; - -@Configuration -public class PermissionInitializer { - - @Autowired - private OperationService operationService; - - /** - * 初始化操作权限 - */ - @PostConstruct - public void initOpePermissions() { - final Map existsOpesMap = new HashMap<>(); - List allExistsOpeEntities = operationService.listAllOperations(); - allExistsOpeEntities.stream().forEach(ope -> existsOpesMap.put(ope.getOperationKey(), ope)); - - ArrayList operations2Create = new ArrayList<>(); - ArrayList operations2Update = new ArrayList<>(); - - // 1.收集需要添加的 - List permEnums = Arrays.asList(RequirePermissionEnum.values()); - for (RequirePermissionEnum perm : permEnums) { - String key = perm.getKey(); - if (!existsOpesMap.containsKey(key)) { - OperationEntity operationEntity = new OperationEntity(); - operationEntity.setOperationKey(key); - operationEntity.setBrief(perm.getBrief()); - operationEntity.setOperationName(perm.getName()); - operations2Create.add(operationEntity); - } - } - - //2.收集需要修改的 - for (RequirePermissionEnum perm : permEnums) { - String key = perm.getKey(); - String name = perm.getName(); - String brief = perm.getBrief(); - if (existsOpesMap.containsKey(key)) { - OperationEntity ope = existsOpesMap.get(key); - if (!name.equals(ope.getOperationName()) || !brief.equals(ope.getBrief())) { - // name或者brief发生过变化的，需要更新 - ope.setBrief(brief); - ope.setOperationName(name); - operations2Update.add(ope); - } - } - } - - //3.批量添加和修改 - if (!CollectionUtils.isEmpty(operations2Create)) { - operationService.createBatch(operations2Create); - } - - if (!CollectionUtils.isEmpty(operations2Update)) { - operationService.updateBatch(operations2Update); - } - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java deleted file mode 100644 index f4aba15fbc..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/constant/OperationScopeConstant.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.epmet.constant; - -/** - * 操作范围系列常量 - */ -public class OperationScopeConstant { - - /** - * ===================系列=================== - */ - public static final String SERIES_ORG_LEVEL = "org_level"; - public static final String SERIES_SWITCH = "switch"; - public static final String SERIES_ALL = "all"; - - /** - * ===================范围=================== - */ - // 无任何范围限制 - public static final String SCOPE_ALL = "all"; - - // 覆盖机构下的所有范围 - public static final String SCOPE_ORG_ALL = "org_all"; - - //"同级组织的下级" - public static final String SCOPE_ORG_EQUAL_SUB = "org_equal_sub"; - //"同级组织及下级" - public static final String SCOPE_ORG_EQUAL_AND_SUB = "org_equal_and_sub"; - // 同级组织的上级 - public static final String SCOPE_ORG_EQUAL_SUP = "org_equal_sup"; - // 同级组织及上级 - public static final String SCOPE_ORG_EQUAL_AND_SUP = "org_equal_and_sup"; - //"同级组织" - public static final String SCOPE_ORG_EQUAL = "org_equal"; - - //"本组织的下级" - public static final String SCOPE_ORG_CURR_SUB = "org_curr_sub"; - //"本组织及下级" - public static final String SCOPE_ORG_CURR_AND_SUB = "org_curr_and_sub"; - //"本组织" - public static final String SCOPE_ORG_CURR = "org_curr"; - - //"本组织的上级" - public static final String SCOPE_ORG_CURR_SUP = "org_curr_sup"; - //"本组织及上级" - public static final String SCOPE_ORG_CURR_AND_SUP = "org_curr_and_sup"; - - //我创建的 - public static final String SCOPE_I_CREATED = "i_created"; - //网格内 - public static final String SCOPE_IN_GRID = "in_grid"; - // 部门内 - public static final String SCOPE_IN_DEPARTMENT = "in_department"; -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java deleted file mode 100644 index 76a7886947..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessConfigController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.*; -import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; -import com.epmet.dto.result.AccessConfigOpesResultDTO; -import com.epmet.dto.result.AccessConfigOptionsResultDTO; -import com.epmet.dto.result.RoleOperationDefaultResultDTO; -import com.epmet.service.AccessConfigService; -import oracle.jdbc.proxy.annotation.Post; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.constraints.NotBlank; -import java.util.List; -import java.util.Set; - -@RestController -@RequestMapping("config") -public class AccessConfigController { - - @Autowired - private AccessConfigService accessConfigService; - - /** - * 根据roleKey查询角色默认操作列表(包括assigned字段，标识该角色是否已经具有该操作权限) - * @param roleKey - * @return - */ - @PostMapping("roledefaultops/{roleKey}") - public Result listRoleDefaultOps(@PathVariable("roleKey") String roleKey) { - List defaultOps = accessConfigService.listRoleDefaultOpsByRoleKey(roleKey); - return new Result().ok(defaultOps); - } - - /** - * 根据角色ID列出角色的操作列表(及该操作的scope范围) - * @param roleId - * @return - */ - @PostMapping("roleopes/{roleId}") - public Result listRoleOperations(@PathVariable("roleId") String roleId) { - List opes = accessConfigService.listOpesByRole(roleId); - return new Result().ok(opes); - } - - /** - * 保存角色的操作权限列表 - * @return - */ - @PostMapping("saveroleopes") - public Result saveRoleOpes(@RequestBody AccessConfigOpesFormDTO formDTO) { - accessConfigService.saveRoleOpes(formDTO.getRoleId(), formDTO.getOpes()); - return new Result(); - } - - /** - * 查询可配置项列表 - * @return - */ - @PostMapping("configoptions") - public Result listConfigOptions(@RequestBody AccessConfigOptionsFormDTO accessConfigFormDTO) { - ValidatorUtils.validateEntity(accessConfigFormDTO); - AccessConfigOptionsResultDTO options = accessConfigService.listScopeOptionsForAccessConfig(accessConfigFormDTO.getRoleId(), accessConfigFormDTO.getOperationKey()); - return new Result().ok(options); - } - - /** - * 保存设置 - * @param config - * @return - */ - @PostMapping("saveconfig") - public Result saveSettings(@RequestBody AccessConfigSaveConfigDTO config) { - ValidatorUtils.validateEntity(config); - String roleId = config.getRoleId(); - String operationKey = config.getOperationKey(); - Set scopeKeys = config.getScopeKeys(); - accessConfigService.saveConfig(roleId, operationKey, scopeKeys); - return new Result(); - } - - /** - * 保存角色默认操作权限列表 - * @param form - * @return - */ - @PostMapping("roledefaultopes/save") - public Result saveRoleDefaultOperations(@RequestBody AccessConfigRoleDefaultOpesFormDTO form) { - ValidatorUtils.validateEntity(form); - accessConfigService.saveRoleDefaultOperations(form.getRoleKey(), form.getOperationKeys()); - return new Result(); - } - - /** - * 查询操作的默认范围列表 - * @param form - * @return - */ - @PostMapping("opedefaultscopes/list") - public Result listOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) { - ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.ListOpeDefaultScopesGroup.class); - List scopes = accessConfigService.listOpeDefaultScopes4Role(form.getRoleKey(), form.getOperationKey()); - return new Result().ok(scopes); - } - - /** - * 保存操作的默认范围配置 - * @param form - * @return - */ - @PostMapping("opedefaultscopes/save") - public Result saveOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) { - ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.SaveOpeDefaultScopesGroup.class); - accessConfigService.saveOpeDefaultScopes(form.getRoleKey(), form.getOperationKey(), form.getScopeKeys()); - return new Result(); - } - - /** - * @Description 给角色添加操作权限和操作范围 - * @return - * @author wxz - * @date 2020.11.17 17:41 - */ - @PostMapping("add-ope-and-scopes-4role") - public Result addOpeAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) { - ValidatorUtils.validateEntity(form); - String roleKey = form.getRoleKey(); - String operationKey = form.getOperationKey(); - List scopeKeys = form.getScopeKeys(); - - accessConfigService.addOpeAndScopes4Role(roleKey, operationKey, scopeKeys); - return new Result(); - } - - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java deleted file mode 100644 index dad8f7e095..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/AccessController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.*; -import com.epmet.service.AccessService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Set; - -/** - * 权限相关Api - * @Author wxz - * @Description - * @Date 2020/4/23 17:54 - **/ -@RestController -@RequestMapping("access") -public class AccessController { - - @Autowired - private AccessService accessService; - - /** - * 用户是否具有指定功能权限 - * @return - */ - @PostMapping("hasspecifiedpermission") - public Result hasSpecifiedPermission(@RequestBody HasSpecifiedPermissionFormDTO form) { - ValidatorUtils.validateEntity(form); - Boolean hasPermission = accessService.hasPermission(form.getOperationKey(), form.getUserId(), form.getApp(), form.getClient()); - return new Result().ok(hasPermission); - } - - /** - * 列出功能权限列表 - * @return - */ - @PostMapping("listoperationpermissions") - public Result> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO) { - ValidatorUtils.validateEntity(listOpePermsFormDTO); - String currAgencyId = listOpePermsFormDTO.getCurrAgencyId(); - String staffId = listOpePermsFormDTO.getStaffId(); - Set operationPermissions = accessService.listOperationPermissions(staffId, currAgencyId); - return new Result>().ok(operationPermissions); - } - - /** - * 查询sql过滤片段 - * @param form - * @return - */ - @PostMapping("getSqlFilterSegment") - public Result getSqlFilterSegment(@RequestBody GetSQLFilterFormDTO form) { - ValidatorUtils.validateEntity(form); - String sqlFilterSegment = accessService.getSqlFilterSegment(form); - return new Result().ok(sqlFilterSegment); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java deleted file mode 100644 index 357ea2c9af..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/DemoController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; -import lombok.Data; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.constraints.NotBlank; - -@RestController -@RequestMapping("demo") -public class DemoController { - - @PostMapping("adduser") - public Result addUser(@RequestBody UserFormDTO form) { - ValidatorUtils.validateEntity(form, UserFormDTO.AddUserShowGroup.class, UserFormDTO.AddUserInternalGroup.class); - System.out.println(form); - return new Result(); - } - -} - -@Data -class UserFormDTO { - //>>>>>>>>>>>>>>>>>校验分组开始>>>>>>>>>>>>>>>>>>>>> - /** - * 添加用户操作的内部异常分组 - * 出现错误会提示给前端7000错误码，返回信息为：服务器开小差... - */ - public interface AddUserInternalGroup {} - - /** - * 添加用户操作的用户可见异常分组 - * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup - * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 - */ - public interface AddUserShowGroup extends CustomerClientShowGroup {} - - // <<<<<<<<<<<<<<<<<<<校验分组结束<<<<<<<<<<<<<<<<<<<<<<<< - - /** - * 该字段在查询用户和添加用户的时候都要校验，所以在groups中会添加2个分组，校验器会优先校验继承了CustomerClientShowGroup - * 的分组 - * 1.该分组校验出错，直接将信息返回客户端，(多个字段有错误，多个字段的错误信息 - * 拼接起来，逗号分隔,详见ValidatorUtils#validadtorEntity()方法) - * 2.该分组校验成功，则继续往下，校验内部错误，若出现内部错误，则返回7000,服务器开小差... - */ - @NotBlank(message = "请输入姓名信息", groups = { AddUserInternalGroup.class, AddUserShowGroup.class }) - private String name; - - /** - * 用户别名，只在内部传输，因此它所属的分组不能继承CustomerClientShowGroup - */ - @NotBlank(message = "用户别名不能为空", groups = { AddUserInternalGroup.class }) - private String alias; - - @NotBlank(message = "请输入地址信息", groups = { AddUserShowGroup.class }) - private String address; - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java deleted file mode 100644 index 85e8bce73d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovLanguageController.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.GovLanguageDTO; -import com.epmet.service.GovLanguageService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 国际化 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@RestController -@RequestMapping("operlanguage") -public class GovLanguageController { - - @Autowired - private GovLanguageService govLanguageService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = govLanguageService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - GovLanguageDTO data = govLanguageService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody GovLanguageDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - govLanguageService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody GovLanguageDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - govLanguageService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - govLanguageService.delete(ids); - return new Result(); - } - - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java deleted file mode 100644 index d3a67c889f..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovMenuController.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.exception.ErrorCode; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.GovMenuDTO; -import com.epmet.dto.result.MenuResourceDTO; -import com.epmet.service.GovMenuService; -import com.epmet.service.GovResourceService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * - * 菜单管理 - * - * @author zhaoqifeng - * @date 2020/3/17 16:35 - */ -@RestController -@RequestMapping("menu") -public class GovMenuController { - - @Autowired - private GovMenuService govMenuService; - - @Autowired - private GovResourceService govResourceService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = govMenuService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - GovMenuDTO data = govMenuService.get(id); - - //菜单资源列表 - List resourceList = govResourceService.getMenuResourceList(id); - - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - govMenuService.save(dto,tokenDto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - govMenuService.update(dto,tokenDto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - govMenuService.delete(ids); - return new Result(); - } - - @DeleteMapping("{id}") - public Result delete(@PathVariable("id") String id, @LoginUser TokenDto tokenDto){ - //效验数据 - AssertUtils.isNull(id, "id"); - - //判断是否有子菜单或按钮 - List list = govMenuService.getListPid(id); - if(list.size() > 0){ - return new Result().error(ErrorCode.SUB_MENU_EXIST); - } - - govMenuService.delete(id, tokenDto); - - return new Result(); - } - - - /** - * 获取菜单列表 - * @param type 类型 - * @return Result> - */ - @GetMapping("list") - public Result> list(Integer type){ - List list = govMenuService.getMenuList(type); - - return new Result>().ok(list); - } - - /** - * 导航 - * @param tokenDto token - * @return List - */ - @GetMapping("nav") - public Result> nav(@LoginUser TokenDto tokenDto){ - List list = govMenuService.getUserMenuNavList(tokenDto); - return new Result>().ok(list); - } - - /** - * 权限标识 - * @param tokenDto token - * @return Set - */ - @GetMapping("permissions") - public Result> permissions(@LoginUser TokenDto tokenDto){ - Set set = govMenuService.getUserPermissions(tokenDto); - return new Result>().ok(set); - } - - /** - * 角色菜单权限 - * @param tokenDto token - * @return - */ - @GetMapping("select") - public Result> select(@LoginUser TokenDto tokenDto){ - List list = govMenuService.getUserMenuList(tokenDto, null); - - return new Result>().ok(list); - } - - /** - * @param tokenDto - * @return com.epmet.commons.tools.utils.Result - * @Author yinzuomei - * @Description 运营端用户退出系统，清空菜单和操作权限 - * @Date 2020/5/21 18:07 - **/ - @GetMapping("cleargovuseraccess") - public Result clearGovUserAccess(@LoginUser TokenDto tokenDto) { - govMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); - return new Result(); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java deleted file mode 100644 index 72193db454..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovResourceController.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.GovResourceDTO; -import com.epmet.service.GovResourceService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 资源管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@RestController -@RequestMapping("govresource") -public class GovResourceController { - - @Autowired - private GovResourceService govResourceService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = govResourceService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - GovResourceDTO data = govResourceService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody GovResourceDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - govResourceService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody GovResourceDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - govResourceService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - govResourceService.delete(ids); - return new Result(); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java deleted file mode 100644 index 7a1ded893c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleController.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.GovRoleDTO; -import com.epmet.service.GovRoleMenuService; -import com.epmet.service.GovRoleService; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 角色管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@RestController -@RequestMapping("govrole") -public class GovRoleController { - - @Autowired - private GovRoleService govRoleService; - @Autowired - private GovRoleMenuService govRoleMenuService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = govRoleService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - GovRoleDTO data = govRoleService.get(id); - - //查询角色对应的菜单 - List menuIdList = govRoleMenuService.getMenuIdList(id); - data.setMenuIdList(menuIdList); - - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody GovRoleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - govRoleService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody GovRoleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - govRoleService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - govRoleService.delete(ids); - return new Result(); - } - - - @GetMapping("list") - @ApiOperation("列表") - public Result> list(){ - List data = govRoleService.list(new HashMap<>(1)); - - return new Result>().ok(data); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java deleted file mode 100644 index 8b8a7d8aed..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleMenuController.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.GovRoleMenuDTO; -import com.epmet.service.GovRoleMenuService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 角色菜单关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@RestController -@RequestMapping("govrolemenu") -public class GovRoleMenuController { - - @Autowired - private GovRoleMenuService govRoleMenuService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = govRoleMenuService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - GovRoleMenuDTO data = govRoleMenuService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody GovRoleMenuDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - govRoleMenuService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody GovRoleMenuDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - govRoleMenuService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - govRoleMenuService.delete(ids); - return new Result(); - } - - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java deleted file mode 100644 index fcd5733a4d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/GovRoleUserController.java +++ /dev/null @@ -1,132 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.GovRoleUserDTO; -import com.epmet.service.GovRoleUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - - -/** - * 角色用户关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@RestController -@RequestMapping("govroleuser") -public class GovRoleUserController { - - @Autowired - private GovRoleUserService govRoleUserService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = govRoleUserService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - GovRoleUserDTO data = govRoleUserService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody GovRoleUserDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - govRoleUserService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody GovRoleUserDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - govRoleUserService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - govRoleUserService.delete(ids); - return new Result(); - } - - - /** - * 获取权限id列表 - * @param id 用户id - * @return List - * @author zhaoqifeng - */ - @GetMapping("getRoleIdList/{id}") - public Result>getRoleIdList(@PathVariable("id") String id) { - List list = govRoleUserService.getRoleIdList(id); - return new Result>().ok(list); - } - - /** - * 保存更新权限 - * @param userId 用户id - * @param roleIdList 权限列表 - * @author zhaoqifeng - */ - @PostMapping("saveOrUpdateRole") - public Result saveOrUpdate(@RequestParam("userId") String userId, @RequestBody List roleIdList) { - govRoleUserService.saveOrUpdate(userId, roleIdList); - return new Result(); - } - - /** - * 根据用户id，删除角色用户关系 - * @param id 用户id - * @return Result - */ - @PostMapping("deleteByUserId") - public Result deleteByUserId(String id) { - govRoleUserService.deleteByUserId(id); - return new Result(); - } - - /** - * 根据用户ids，删除角色用户关系 - * @param ids 用户ids - * @return Result - */ - @PostMapping("deleteByUserIds") - public Result deleteByUserIds(@RequestBody String[] ids) { - govRoleUserService.deleteByUserIds(ids); - return new Result(); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java deleted file mode 100644 index c261428139..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/LbController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.commons.util.InetUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class LbController { - - @Autowired - private InetUtils inetUtils; - - @PostMapping("get-host") - public Result getHost() { - String ipAddress = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); - return new Result().ok(ipAddress); - } - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java deleted file mode 100644 index 5b7c01e23e..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/RoleController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.result.RoleOperationResultDTO; -import com.epmet.service.RoleOperationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("role") -public class RoleController { - - @Autowired - private RoleOperationService roleOperationService; - - /** - * 查询角色对应的操作列表 - * @param roleId - * @return - */ - @PostMapping("operations/{roleId}") - public Result> listOperationsByRoleId(@PathVariable("roleId") String roleId) { - List roleOperationResultDTOS = roleOperationService.listOperationsByRoleId(roleId); - return new Result>().ok(roleOperationResultDTOS); - } - - /** - * 批量为角色ID初始化操作权限列表 - * @param formDTO - * @return - */ - @PostMapping("initdefaultoperationsforroles") - public Result initDefaultOperationsForRoles(@RequestBody InitDefaultOperationsFormDTO formDTO) { - List roles = formDTO.getRoles(); - roleOperationService.initDefaultOperationsForRoles(roles); - return new Result(); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java deleted file mode 100644 index b8ab2dbda6..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/controller/TestController.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.annotation.ExternalRequestAuth; -import com.epmet.service.TestService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("test") -public class TestController { - - @Autowired - private TestService testService; - - @ExternalRequestAuth - @GetMapping("test") - public void test() { - System.out.println("TestController -> test()"); - testService.test(); - } - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java deleted file mode 100644 index acd505c019..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovLanguageDao.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.GovLanguageEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 国际化 - * - * @author Mark sunlightcs@gmail.com - */ -@Mapper -public interface GovLanguageDao extends BaseDao { - - GovLanguageEntity getLanguage(GovLanguageEntity entity); - - void updateLanguage(GovLanguageEntity entity); - - void insertOperLanguageEntity(GovLanguageEntity entity); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java deleted file mode 100644 index 1e36bff758..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovMenuDao.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.GovMenuEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 菜单管理 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Mapper -public interface GovMenuDao extends BaseDao { - - GovMenuEntity getById(@Param("id") String id, @Param("language") String language); - - /** - * 查询所有菜单列表 - * - * @param type 菜单类型 - * @param language 语言 - */ - List getMenuList(@Param("type") Integer type, @Param("language") String language); - - /** - * 查询用户菜单列表 - * - * @param userId 用户ＩＤ - * @param type 菜单类型 - * @param language 语言 - */ - List getUserMenuList(@Param("userId") String userId, @Param("type") Integer type, @Param("language") String language); - - - /** - * 根据父菜单，查询子菜单 - * @param pid 父菜单ID - */ - List getListPid(String pid); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java deleted file mode 100644 index 4970d56e9c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovResourceDao.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.GovResourceEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 资源管理 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Mapper -public interface GovResourceDao extends BaseDao { - /** - * 根据资源编码，删除对应的资源 - * @param code 资源编码 - */ - void deleteByCode(String code); - - /** - * 获取资源列表 - * @param menuId 菜单ID - */ - List getMenuResourceList(String menuId); - - /** - * 获取所有资源列表 - */ - List getResourceList(); - - /** - * 获取用户资源列表 - * @param userId 用户ID - */ - List getUserResourceList(@Param("userId") String userId); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java deleted file mode 100644 index 768fc42792..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleDao.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.GovRoleEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 角色管理 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Mapper -public interface GovRoleDao extends BaseDao { - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java deleted file mode 100644 index dc0559acb3..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.GovRoleMenuEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 角色菜单关系 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Mapper -public interface GovRoleMenuDao extends BaseDao { - - /** - * 根据角色ID，获取菜单ID列表 - */ - List getMenuIdList(String roleId); - - /** - * 根据角色id，删除角色菜单关系 - * @param roleId 角色id - */ - void deleteByRoleId(String roleId); - - /** - * 根据菜单id，删除角色菜单关系 - * @param menuId 菜单id - */ - void deleteByMenuId(String menuId); - - - /** - * 根据角色ids，删除角色菜单关系 - * @param roleIds 角色ids - */ - void deleteByRoleIds(String[] roleIds); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java deleted file mode 100644 index bf400e0584..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/GovRoleUserDao.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.GovRoleUserEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 角色用户关系 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Mapper -public interface GovRoleUserDao extends BaseDao { - - /** - * 根据角色ids，删除角色用户关系 - * @param roleIds 角色ids - */ - void deleteByRoleIds(String[] roleIds); - - /** - * 根据用户ids，删除角色用户关系 - * @param userIds 用户ids - */ - void deleteByUserIds(String[] userIds); - - /** - * 根据角色id，删除角色用户关系 - * @param roleId 角色id - */ - void deleteByRoleId(String roleId); - - /** - * 根据用户id，删除角色用户关系 - * @param userId 用户id - */ - void deleteByUserId(String userId); - - /** - * 角色ID列表 - * @param userId 用户ID - * - * @return - */ - List getRoleIdList(String userId); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java deleted file mode 100644 index 6b34908dde..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationDao.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperationEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 操作类型表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-30 - */ -@Mapper -public interface OperationDao extends BaseDao { - - List listAllOperationEntities(); - - List listAllValidOperationEntities(); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java deleted file mode 100644 index 98a455f052..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDao.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.RoleOpeScopeResultDTO; -import com.epmet.entity.OperationScopeEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.context.annotation.Scope; - -import java.util.List; -import java.util.Set; - -/** - * 权限范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Mapper -public interface OperationScopeDao extends BaseDao { - - /** - * 查询角色的操作key对应操作范围列表 - * @param roleId 角色id - * @param operationKey 操作key - * @return - */ - Set listOperationScopesByRoleId(@Param("roleId") String roleId, - @Param("operationKey") String operationKey); - - /** - * 查询角色所有operation及其范围 - * @param roleId - */ - List listAllRoleOperationScopesByRoleId(String roleId); - - String getDefaultScopeKeyForOperation(@Param("operationKey") String operationKey); - - String getScopeIndexByScopeKey(@Param("scopeKey") String scopeKey); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java deleted file mode 100755 index 2c9a049e83..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; -import com.epmet.dto.result.OperationScopeDefaultResultDTO; -import com.epmet.entity.OperationScopeDefaultEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 默认操作范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-17 - */ -@Mapper -public interface OperationScopeDefaultDao extends BaseDao { - List listAllValid(); - - /** - * 根据角色key和操作key查询默认操作权限列表 - * @param roleKey - * @return - */ - List listDefaultOpeScopes(@Param("roleKey") String roleKey); - - /** - * 查询操作的默认范围 - * @param roleKey - * @param operationKey - * @return - */ - List listOpeDefaultScopes4Config( - @Param("roleKey") String roleKey, - @Param("operationKey") String operationKey); - - List listOpeDefaultScopesByRoleAndOpeKey( - @Param("roleKey") String roleKey, - @Param("operationKey") String operationKey); - - int delete( - @Param("roleKey") String roleKey, - @Param("operationKey") String operationKey, - @Param("scopeKey") String scopeKey); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java deleted file mode 100644 index 46a159e3b6..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDao.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.AccessConfigOpesResultDTO; -import com.epmet.dto.result.RoleOperationResultDTO; -import com.epmet.entity.RoleOperationEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -@Mapper -public interface RoleOperationDao extends BaseDao { - - List listOperationsByRoleId(@Param("roleId") String roleId); - - List listOpesForAccessConfig(@Param("roleId") String roleId); - - void deleteRoleOpe(@Param("roleId") String roleId, @Param("opeKey") String opeKey); - - RoleOperationEntity getRoleOpe(@Param("roleId") String roleId, @Param("opeKey") String opeKey); - - int enableRoleOpe(@Param("roleId") String roleId, @Param("opeKey") String opeKey); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java deleted file mode 100755 index 19ccbf901e..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; -import com.epmet.dto.result.RoleOperationDefaultResultDTO; -import com.epmet.entity.RoleOperationDefaultEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.HashMap; -import java.util.List; - -/** - * 角色默认的可操作功能列表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-21 - */ -@Mapper -public interface RoleOperationDefaultDao extends BaseDao { - - /** - * 查询可用 - * @return - */ - List listAllValid(); - - /** - * 查询某个roleKey的所有默认操作权限 - * @param roleKey - * @return - */ - List listByRoleKey(@Param("roleKey") String roleKey); - - List listRoleDefaultOpsByRoleKey(@Param("roleKey") String roleKey); - - int deleteByRoleKeyAndOpeKey( - @Param("roleKey") String roleKey, - @Param("operationKey") String operationKey); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java deleted file mode 100644 index 3199a78e3d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/dao/RoleScopeDao.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.AccessConfigScopeResultDTO; -import com.epmet.entity.RoleScopeEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Set; - -/** - * 角色能操作哪些范围 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Mapper -public interface RoleScopeDao extends BaseDao { - - /** - * 权限配置：列出可选项 - * @param roleId - * @param operationKey - * @return - */ - List listScopeOptionsForAccessConfig(@Param("roleId") String roleId, @Param("operationKey") String operationKey); - - /** - * - * @param roleId - * @param operationKey - * @return - */ - List listScopeEntities(@Param("roleId") String roleId, @Param("operationKey") String operationKey); - - /** - * 使用roleId+OperationKey+ScopeKey删除 - * @param roleId - * @param operationKey - * @param scopeKeys2Remove - * @return - */ - int deleteByRoleIdAndOpeKey(@Param("roleId") String roleId, - @Param("operationKey") String operationKey, - @Param("scopeKeys2Remove") Set scopeKeys2Remove); - - /** - * 启用 - * @param roleId - * @param operationKey - * @param scopeKey - * @return - */ - int enableByRoleIdAndOpeKey(@Param("roleId") String roleId, - @Param("operationKey") String operationKey, - @Param("scopeKey") String scopeKey); - - /** - * 使用RoleId + operationKey + scopeKey - * @param roleId - * @param operationKey - * @param scopeKey - */ - RoleScopeEntity getByRoleIdAndOpeKey(@Param("roleId") String roleId, - @Param("operationKey") String operationKey, - @Param("scopeKey") String scopeKey); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java deleted file mode 100644 index ee84f846d9..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovLanguageEntity.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - * 国际化 - * - * @author Mark sunlightcs@gmail.com - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("gov_language") -public class GovLanguageEntity implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 表名 - */ - private String tableName; - /** - * 表主键 - */ - private String tableId; - /** - * 字段名 - */ - private String fieldName; - /** - * 字段值 - */ - private String fieldValue; - /** - * 语言 - */ - private String language; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java deleted file mode 100644 index fcb8a5fa38..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovMenuEntity.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 菜单管理 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("gov_menu") -public class GovMenuEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; - - /** - * 上级ID，一级菜单为0 - */ - private String pid; - /** - * 菜单名称 - */ - @TableField(exist = false) - private String name; - /** - * 菜单URL - */ - private String url; - /** - * 类型 0：菜单 1：按钮 - */ - private Integer type; - /** - * 菜单图标 - */ - private String icon; - /** - * 权限标识，如：sys:menu:save - */ - private String permissions; - /** - * 排序 - */ - private Integer sort; - /** - * 上级菜单名称 - */ - @TableField(exist = false) - private String parentName; - - /** - * 是否显示，1：显示 0不显示 - */ - private Integer showFlag; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java deleted file mode 100644 index 1d5d716c22..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovResourceEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 资源管理 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("gov_resource") -public class GovResourceEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; - - /** - * 资源编码，如菜单ID - */ - private String resourceCode; - /** - * 资源名称 - */ - private String resourceName; - /** - * 资源URL - */ - private String resourceUrl; - /** - * 请求方式（如：GET、POST、PUT、DELETE） - */ - private String resourceMethod; - /** - * 菜单标识 0：非菜单资源 1：菜单资源 - */ - private Integer menuFlag; - /** - * 认证等级 0：权限认证 1：登录认证 2：无需认证 - */ - private Integer authLevel; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java deleted file mode 100644 index 4bc4575836..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 角色管理 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("gov_role") -public class GovRoleEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; - - /** - * 角色名称 - */ - private String name; - /** - * 备注 - */ - private String remark; - /** - * 部门ID - */ - @TableField(fill = FieldFill.INSERT) - private Long deptId; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java deleted file mode 100644 index 6ea4d1f2a5..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 角色菜单关系 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("gov_role_menu") -public class GovRoleMenuEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; - /** - * 角色ID - */ - private String roleId; - /** - * 菜单ID - */ - private String menuId; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java deleted file mode 100644 index 599ca7f3e2..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 角色用户关系 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("gov_role_user") -public class GovRoleUserEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - /** - * 用户ID - */ - private String userId; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java deleted file mode 100644 index e599d8c28f..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 操作类型表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-30 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("operation") -public class OperationEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String operationKey; - - /** - * - */ - private String operationName; - - /** - * 操作简介 - */ - private String brief; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java deleted file mode 100755 index 6ec89eb12b..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 默认操作范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-17 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("operation_scope_default") -public class OperationScopeDefaultEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - private String roleKey; - - /** - * 操作key - */ - private String operationKey; - - /** - * 范围key - */ - private String scopeKey; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java deleted file mode 100644 index 2c7223d97d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/OperationScopeEntity.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 权限范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("operation_scope") -public class OperationScopeEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 范围key - */ - private String scopeKey; - - /** - * 范围名称 - */ - private String scopeName; - - private String scopeIndex; - private String series; - private Integer sort; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java deleted file mode 100755 index 8ea82b13b9..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("role_operation_default") -public class RoleOperationDefaultEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 角色KEY - */ - private String roleKey; - - /** - * 操作key - */ - private String operationKey; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java deleted file mode 100644 index 96f70de1be..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleOperationEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("role_operation") -public class RoleOperationEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java deleted file mode 100644 index 2c3c6f21dc..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/entity/RoleScopeEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 角色能操作哪些范围 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("role_scope") -public class RoleScopeEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - - /** - * 操作key - */ - private String operationKey; - - /** - * 范围Key - */ - private String scopeKey; - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java deleted file mode 100644 index 4b0c4ee373..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/excel/RoleOperationExcel.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -@Data -public class RoleOperationExcel { - - @Excel(name = "") - private String id; - - @Excel(name = "角色ID") - private String roleId; - - @Excel(name = "操作key") - private String operationKey; - - @Excel(name = "是否删除，0：未删除，1：已删除") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建者id") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新者id") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java deleted file mode 100644 index d88b8358a3..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.epmet.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.GovStaffRoleDTO; -import com.epmet.dto.OperUserDTO; -import com.epmet.dto.form.LatestGridFormDTO; -import com.epmet.dto.form.StaffGridVisitedFormDTO; -import com.epmet.dto.form.StaffRoleFormDTO; -import com.epmet.dto.result.CustomerGridByUserIdResultDTO; -import com.epmet.dto.result.LatestCustomerResultDTO; -import com.epmet.feign.fallback.EpmetUserFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - - -/** - * @Description - * @Author sun - */ -//, url = "localhost:8087" -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class) -public interface EpmetUserFeignClient { - /** - * 获取最近一次登录的客户信息 - * - * @param userId - * @return - */ - @GetMapping("/epmetuser/staffagencyvisited/getlatestcustomer/{userId}") - Result getLatestCustomer(@PathVariable("userId") String userId); - - /** - * @Description 查询工作人员上次登录的网格 - * @Param customerId ; staffId - * @return Result - * @Author wangc - * @Date 2020.04.23 10:44 - **/ - @PostMapping(value = "/epmetuser/staffgridvisited/getstafflatestgrid") - Result getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO); - - /** - * @param staffGridVisitedFormDTO - * @return com.epmet.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存网格访问记录 - * @Date 2020/4/23 13:27 - **/ - @PostMapping(value = "/epmetuser/staffgridvisited/savestaffgridvisitedrecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result saveStaffGridVisitedRecord(@RequestBody StaffGridVisitedFormDTO staffGridVisitedFormDTO); - /** - * 查询工作人员的角色 - * @return - */ - @PostMapping("/epmetuser/staffrole/staffroles") - Result> getRolesOfStaff(StaffRoleFormDTO staffRoleFormDTO); - - /** - * - * 根据id查询运营人员详情 - * - * @param operUserId oper_user表主键 - * @return com.epmet.commons.tools.utils.Result> - * @author zhaoqifeng - * @date 2020/3/19 09:28 - **/ - @GetMapping("/operuser/queryOperUserDtoById/{operUserId}") - Result info(@PathVariable("operUserId") String operUserId); -} - diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java deleted file mode 100644 index c9f2e3eada..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.epmet.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.feign.fallback.GovOrgFeignClientFallBack; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -/** - * @Description - * @Author sun - */ -//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092") -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) -public interface GovOrgFeignClient { - - /** - * 根据Id查询agency - * @param agencyId - * @return - */ - @PostMapping("/gov/org/agency/agencybyid/{agencyId}") - Result getAgencyById(@PathVariable("agencyId") String agencyId); - - /** - * 根据staffId查询所属的组织机构 - * @param staffId - * @return - */ - @PostMapping("/gov/org/agency/agencybystaff/{staffId}") - Result getAgencyByStaff(@PathVariable("staffId") String staffId); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java deleted file mode 100644 index cd39c87452..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java +++ /dev/null @@ -1,49 +0,0 @@ -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.GovStaffRoleDTO; -import com.epmet.dto.OperUserDTO; -import com.epmet.dto.form.LatestGridFormDTO; -import com.epmet.dto.form.StaffGridVisitedFormDTO; -import com.epmet.dto.form.StaffRoleFormDTO; -import com.epmet.dto.result.CustomerGridByUserIdResultDTO; -import com.epmet.dto.result.LatestCustomerResultDTO; -import com.epmet.feign.EpmetUserFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Description - * @Author sun - */ -@Component -public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { - - @Override - public Result getLatestCustomer(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestCustomer", userId); - } - - @Override - public Result> getRolesOfStaff(StaffRoleFormDTO staffRoleFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRolesOfStaff"); - } - - @Override - public Result info(String operUserId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "info", operUserId); - } - - @Override - public Result getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffLatestGrid",latestGridFormDTO); - } - @Override - public Result saveStaffGridVisitedRecord(StaffGridVisitedFormDTO staffGridVisitedFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffGridVisitedRecord", staffGridVisitedFormDTO); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java deleted file mode 100644 index f418de95e0..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ /dev/null @@ -1,31 +0,0 @@ -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.CustomerAgencyDTO; -import com.epmet.dto.form.LatestGridFormDTO; -import com.epmet.dto.result.CustomerGridByUserIdResultDTO; -import com.epmet.dto.result.LatestCustomerResultDTO; -import com.epmet.feign.GovOrgFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Description - * @Author sun - */ -@Component -public class GovOrgFeignClientFallBack implements GovOrgFeignClient { - - @Override - public Result getAgencyById(String agencyId) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyById", agencyId); - } - - @Override - public Result getAgencyByStaff(String staffId) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaff", staffId); - } -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java deleted file mode 100644 index 8f9595582b..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovLanguageRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 国际化 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Component -public class GovLanguageRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java deleted file mode 100644 index 361d6c3014..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovMenuRedis.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisKeys; -import com.epmet.commons.tools.redis.RedisUtils; -import com.epmet.commons.tools.utils.HttpContextUtils; -import com.epmet.dto.GovMenuDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Set; - -/** - * 菜单管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Component -public class GovMenuRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(String userId, String app, String client) { - redisUtils.deleteByPattern(RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage())); - redisUtils.delete(RedisKeys.getUserPermissionsKey(userId, app, client)); - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - - public void setUserMenuNavList(String userId, String app, String client, List menuList){ - String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage()); - redisUtils.set(key, menuList); - } - - public List getUserMenuNavList(String userId, String app, String client){ - String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage()); - return (List)redisUtils.get(key); - } - - public void setUserPermissions(String userId, String app, String client, Set permsSet){ - String key = RedisKeys.getUserPermissionsKey(userId, app, client); - redisUtils.set(key, permsSet); - } - - public Set getUserPermissions(String userId, String app, String client){ - String key = RedisKeys.getUserPermissionsKey(userId, app, client); - return (Set)redisUtils.get(key); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java deleted file mode 100644 index e21bd5095c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovResourceRedis.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisKeys; -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 资源管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Component -public class GovResourceRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete() { - String key = RedisKeys.getSysResourceKey(); - - redisUtils.delete(key); - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java deleted file mode 100644 index c778d22c7d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 角色菜单关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Component -public class GovRoleMenuRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java deleted file mode 100644 index 3e87e447dd..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 角色管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Component -public class GovRoleRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java deleted file mode 100644 index 7a7aad6c8c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 角色用户关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Component -public class GovRoleUserRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java deleted file mode 100644 index af82f0f8b5..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.epmet.redis; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.TypeReference; -import com.epmet.commons.tools.redis.RedisKeys; -import com.epmet.commons.tools.redis.RedisUtils; -import com.epmet.dto.result.RoleOpeScopeResultDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Set; - -/** - * 角色的操作权限对应的操作范围Redis - */ -@Component -public class RoleOpeScopeRedis { - - @Autowired - private RedisUtils redisUtils; - - /** - * 缓存角色操作范围 - * @param roleId - * @param opeKey - * @param scopes - */ - public void setRoleOpeScopes(String roleId, String opeKey, Set scopes) { - String roleOpeScopesKey = RedisKeys.getRoleOpeScopesKey(roleId, opeKey); - redisUtils.set(roleOpeScopesKey, scopes); - } - - /** - * 缓存角色所有的操作范围 - * @param roleId - * @param scopes - */ - public void setRoleAllOpeScopes(String roleId, List scopes) { - String roleAllOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId); - redisUtils.setString(roleAllOpeScopesKey, JSON.toJSONString(scopes)); - } - - /** - * 查询角色操作范围 - * @param roleId - * @param opeKey - * @return - */ - public Set getRoleOpeScopes(String roleId, String opeKey) { - String roleOpeScopesKey = RedisKeys.getRoleOpeScopesKey(roleId, opeKey); - return (Set)redisUtils.get(roleOpeScopesKey); - } - - /** - * 查询角色所有操作范围 - * @param roleId - * @return - */ - public List getRoleAllOpeScopes(String roleId) { - String roleOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId); - String stringValue = redisUtils.getString(roleOpeScopesKey); - return JSON.parseObject(stringValue, new TypeReference>(){}); - } - - /** - * 删除缓存 - * @param roleId - */ - public void delRoleAllOpeScopes(String roleId) { - redisUtils.delete(RedisKeys.getRoleAllOpeScopesKey(roleId)); - } - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java deleted file mode 100644 index 508f3ad45f..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessConfigService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.epmet.service; - -import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO; -import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; -import com.epmet.dto.result.AccessConfigOpesResultDTO; -import com.epmet.dto.result.AccessConfigOptionsResultDTO; -import com.epmet.dto.result.RoleOperationDefaultResultDTO; - -import java.util.List; -import java.util.Set; - -public interface AccessConfigService { - List listOpesByRole(String roleId); - - void saveRoleOpes(String roleId, List opes); - - AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey); - - void saveConfig(String roleId, String operationKey, Set scopeKeys); - - List listRoleDefaultOpsByRoleKey(String roleKey); - - void saveRoleDefaultOperations(String roleKey, List operationKeys); - - List listOpeDefaultScopes4Role(String roleKey, String operationKey); - - void saveOpeDefaultScopes(String roleKey, String operationKey, List scopeKeys); - - void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java deleted file mode 100644 index 7b365fa21b..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/AccessService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.epmet.service; - -import com.epmet.dto.form.GetSQLFilterFormDTO; -import com.epmet.dto.result.LoginUserDetailsResultDTO; -import com.epmet.dto.result.RoleOpeScopeResultDTO; - -import java.util.List; -import java.util.Set; - -public interface AccessService { - - /** - * 查询登陆用户登陆信息 - * @return - */ - LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId); - - /** - * 查询角色所有operation及其范围(缓存) - * @param roleId - * @return - */ - List listAllRoleOperationScopesByRoleId(String roleId); - - /** - * 角色 - * @param operationKey - * @param userId - * @return - */ - Boolean hasPermission(String operationKey, String userId, String app, String client); - - /** - * 生成sql过滤脚本 - * @param form - */ - String getSqlFilterSegment(GetSQLFilterFormDTO form); - - /** - * 列出角色的功能权限 - * @return - */ - Set listOperationPermissions(String staffId, String currAgencyId); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java deleted file mode 100644 index 1f4a5e65e3..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovLanguageService.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.GovLanguageDTO; -import com.epmet.entity.GovLanguageEntity; - -import java.util.List; -import java.util.Map; - -/** - * 国际化 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -public interface GovLanguageService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return GovLanguageDTO - * @author generator - * @date 2020-03-18 - */ - GovLanguageDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void save(GovLanguageDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void update(GovLanguageDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-18 - */ - void delete(String[] ids); - - /** - * 保存或更新 - * @param tableName 表名 - * @param tableId 表主键 - * @param fieldName 字段名 - * @param fieldValue 字段值 - * @param language 语言 - */ - void saveOrUpdate(String tableName, String tableId, String fieldName, String fieldValue, String language); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java deleted file mode 100644 index b5c0cf12a3..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovMenuService.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.dto.GovMenuDTO; -import com.epmet.entity.GovMenuEntity; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * 菜单管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -public interface GovMenuService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return GovMenuDTO - * @author generator - * @date 2020-03-18 - */ - GovMenuDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void save(GovMenuDTO dto, TokenDto tokenDto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void update(GovMenuDTO dto, TokenDto tokenDto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-18 - */ - void delete(String[] ids); - - /** - * 删除 - * - * @param id id - * @author generator - * @date 2020-03-18 - */ - void delete(String id, TokenDto tokenDto); - - /** - * 用户菜单列表 - * - * @param tokenDto 用户信息 - * @param type 菜单类型 - * @return java.util.List - */ - List getUserMenuList(TokenDto tokenDto, Integer type); - - /** - * 菜单列表 - * - * @param type 菜单类型 - */ - List getMenuList(Integer type); - - /** - * 用户菜单导航 - * @param tokenDto 用户信息 - * @return java.util.List - */ - List getUserMenuNavList(TokenDto tokenDto); - - /** - * 获取用户权限标识 - * @param tokenDto 用户信息 - * @return java.util.Set - */ - Set getUserPermissions(TokenDto tokenDto); - - /** - * 根据父菜单，查询子菜单 - * @param pid 父菜单ID - */ - List getListPid(String pid); - - void clearOperUserAccess(String app, String client, String userId); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java deleted file mode 100644 index 8b6b8f5e6d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovResourceService.java +++ /dev/null @@ -1,110 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.GovResourceDTO; -import com.epmet.dto.result.MenuResourceDTO; -import com.epmet.entity.GovResourceEntity; - -import java.util.List; -import java.util.Map; - -/** - * 资源管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -public interface GovResourceService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return GovResourceDTO - * @author generator - * @date 2020-03-18 - */ - GovResourceDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void save(GovResourceDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void update(GovResourceDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-18 - */ - void delete(String[] ids); - - /** - * 保存菜单资源 - * @param menuId 菜单ID - * @param menuName 菜单名称 - * @param resourceList 资源列表 - */ - void saveMenuResource(String menuId, String menuName, List resourceList); - - /** - * 获取菜单资源列表 - * @param menuId 菜单ID - */ - List getMenuResourceList(String menuId); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java deleted file mode 100644 index 7b0d2af34a..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleMenuService.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.GovRoleMenuDTO; -import com.epmet.entity.GovRoleMenuEntity; - -import java.util.List; -import java.util.Map; - -/** - * 角色菜单关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -public interface GovRoleMenuService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return GovRoleMenuDTO - * @author generator - * @date 2020-03-18 - */ - GovRoleMenuDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void save(GovRoleMenuDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void update(GovRoleMenuDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-18 - */ - void delete(String[] ids); - - /** - * 根据角色ID，获取菜单ID列表 - */ - List getMenuIdList(String roleId); - - /** - * 保存或修改 - * @param roleId 角色ID - * @param menuIdList 菜单ID列表 - */ - void saveOrUpdate(String roleId, List menuIdList); - - /** - * 根据角色id，删除角色菜单关系 - * @param roleId 角色id - */ - void deleteByRoleId(String roleId); - - /** - * 根据角色ids，删除角色菜单关系 - * @param roleIds - */ - void deleteByRoleIds(String[] roleIds); - - /** - * 根据菜单id，删除角色菜单关系 - * @param menuId 菜单id - */ - void deleteByMenuId(String menuId); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java deleted file mode 100644 index 4fbf7e0f58..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.GovRoleDTO; -import com.epmet.entity.GovRoleEntity; - -import java.util.List; -import java.util.Map; - -/** - * 角色管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -public interface GovRoleService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return GovRoleDTO - * @author generator - * @date 2020-03-18 - */ - GovRoleDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void save(GovRoleDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void update(GovRoleDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-18 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java deleted file mode 100644 index ff67c7d239..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/GovRoleUserService.java +++ /dev/null @@ -1,133 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.GovRoleUserDTO; -import com.epmet.entity.GovRoleUserEntity; - -import java.util.List; -import java.util.Map; - -/** - * 角色用户关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -public interface GovRoleUserService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return GovRoleUserDTO - * @author generator - * @date 2020-03-18 - */ - GovRoleUserDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void save(GovRoleUserDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-18 - */ - void update(GovRoleUserDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-18 - */ - void delete(String[] ids); - - /** - * 保存或修改 - * @param userId 用户ID - * @param roleIdList 角色ID列表 - */ - void saveOrUpdate(String userId, List roleIdList); - - /** - * 根据角色id，删除角色用户关系 - * @param roleId 角色id - */ - void deleteByRoleId(String roleId); - - /** - * 根据用户id，删除角色用户关系 - * @param userId 用户id - */ - void deleteByUserId(String userId); - - /** - * 角色ID列表 - * @param userId 用户ID - * @return List - */ - List getRoleIdList(String userId); - - /** - * 根据角色ids，删除角色用户关系 - * @param roleIds 角色ids - */ - void deleteByRoleIds(String[] roleIds); - - /** - * 根据用户ids，删除角色用户关系 - * @param userIds 用户ids - */ - void deleteByUserIds(String[] userIds); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java deleted file mode 100644 index cb24b913c0..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationScopeService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.OperationScopeDTO; -import com.epmet.entity.OperationScopeEntity; - -import java.util.List; -import java.util.Map; - -/** - * 权限范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -public interface OperationScopeService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-04-24 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-04-24 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return OperationScopeDTO - * @author generator - * @date 2020-04-24 - */ - OperationScopeDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-04-24 - */ - void save(OperationScopeDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-04-24 - */ - void update(OperationScopeDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-04-24 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java deleted file mode 100644 index edfaa41473..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/OperationService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.epmet.service; - -import com.epmet.entity.OperationEntity; - -import java.util.ArrayList; -import java.util.List; - -public interface OperationService { - - List listAllOperations(); - - void createBatch(ArrayList operations2Create); - void updateBatch(ArrayList operations2Update); -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java deleted file mode 100644 index 109cdf7a51..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleOperationService.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.RoleOperationDTO; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.result.RoleOperationResultDTO; -import com.epmet.entity.RoleOperationEntity; - -import java.util.List; -import java.util.Map; - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -public interface RoleOperationService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-04-22 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-04-22 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return RoleOperationDTO - * @author generator - * @date 2020-04-22 - */ - RoleOperationDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-04-22 - */ - void save(RoleOperationDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-04-22 - */ - void update(RoleOperationDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-04-22 - */ - void delete(String[] ids); - - /** - * 查询角色对应的操作列表 - * @param roleId - * @return - */ - List listOperationsByRoleId(String roleId); - - void initDefaultOperationsForRoles(List roles); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java deleted file mode 100644 index 34cdd6e07f..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/RoleScopeService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.RoleScopeDTO; -import com.epmet.entity.RoleScopeEntity; - -import java.util.List; -import java.util.Map; - -/** - * 角色能操作哪些范围 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -public interface RoleScopeService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-04-24 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-04-24 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return RoleScopeDTO - * @author generator - * @date 2020-04-24 - */ - RoleScopeDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-04-24 - */ - void save(RoleScopeDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-04-24 - */ - void update(RoleScopeDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-04-24 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java deleted file mode 100644 index 587690221c..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/TestService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.epmet.service; - -public interface TestService { - - void test(); - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java deleted file mode 100644 index 06f391eada..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.epmet.service.impl; - -import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.*; -import com.epmet.dto.result.*; -import com.epmet.entity.OperationScopeDefaultEntity; -import com.epmet.entity.RoleOperationDefaultEntity; -import com.epmet.entity.RoleOperationEntity; -import com.epmet.entity.RoleScopeEntity; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.redis.RoleOpeScopeRedis; -import com.epmet.service.AccessConfigService; -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; -import org.springframework.util.CollectionUtils; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -public class AccessConfigServiceImpl implements AccessConfigService { - - protected static final Logger logger = LoggerFactory.getLogger(AccessConfigServiceImpl.class); - - @Autowired - private RoleOpeScopeRedis roleOpeScopeRedis; - - @Autowired - private RoleOperationDao roleOperationDao; - - @Autowired - private RoleOperationDefaultDao roleOperationDefaultDao; - - @Autowired - private RoleScopeDao roleScopeDao; - - @Autowired - private OperationScopeDefaultDao operationScopeDefaultDao; - - @Autowired - private EpmetUserOpenFeignClient epmetUserOpenFeignClient; - - @Override - public List listOpesByRole(String roleId) { - return roleOperationDao.listOpesForAccessConfig(roleId); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveRoleOpes(String roleId, List opes) { - List operationsDB = roleOperationDao.listOperationsByRoleId(roleId); - Set opeKeysDB = operationsDB.stream().map(opeDB -> opeDB.getOperationKey()).collect(Collectors.toSet()); - Set opeKeysForm = opes.stream().map(opeForm -> opeForm.getOperationKey()).collect(Collectors.toSet()); - - for (String s : opeKeysDB) { - if (!opeKeysForm.contains(s)) { - // 说明这个已经被取消 - roleOperationDao.deleteRoleOpe(roleId, s); - } - } - - for (String s : opeKeysForm) { - if (!opeKeysDB.contains(s)) { - // 说明这个是新勾选的 - if (roleOperationDao.getRoleOpe(roleId, s) != null) { - if (roleOperationDao.enableRoleOpe(roleId, s) == 0) { - logger.error("权限配置:启用权限失败，roleId:{}", roleId); - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } - continue; - } - - RoleOperationEntity newRoleOpe = new RoleOperationEntity(); - newRoleOpe.setRoleId(roleId); - newRoleOpe.setOperationKey(s); - roleOperationDao.insert(newRoleOpe); - } - } - - // 失效Redis缓存 - roleOpeScopeRedis.delRoleAllOpeScopes(roleId); - } - - @Override - public AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey) { - List scopeOptions = roleScopeDao.listScopeOptionsForAccessConfig(roleId, operationKey); - //List settingOptions = accessSettingDao.listSettingOptionsForAccessConfig(roleId, operationKey); - AccessConfigOptionsResultDTO options = new AccessConfigOptionsResultDTO(); - options.setScopeOptions(scopeOptions); - //options.setSettingOptions(settingOptions); - return options; - } - - @Override - @Transactional - public void saveConfig(String roleId, String operationKey, Set scopeKeys) { - List scopesDB = roleScopeDao.listScopeEntities(roleId, operationKey); - // 数据库中已有的scopeKey列表 - Set scopeKeysDB = scopesDB.stream().map(scope -> scope.getScopeKey()).collect(Collectors.toSet()); - - Set scopeKeys2Add = scopeKeys.stream().filter(scopeKey -> !scopeKeysDB.contains(scopeKey)).collect(Collectors.toSet()); - Set scopeKeys2Remove = scopeKeysDB.stream().filter(scopeKeyDB -> !scopeKeys.contains(scopeKeyDB)).collect(Collectors.toSet()); - - // 添加/重新启用 - if (!CollectionUtils.isEmpty(scopeKeys2Add)) { - scopeKeys2Add.forEach(scopeKey -> { - RoleScopeEntity rsDB = roleScopeDao.getByRoleIdAndOpeKey(roleId, operationKey, scopeKey); - if (rsDB != null) { - roleScopeDao.enableByRoleIdAndOpeKey(roleId, operationKey, scopeKey); - } else { - RoleScopeEntity rs2Add = new RoleScopeEntity(); - rs2Add.setRoleId(roleId); - rs2Add.setOperationKey(operationKey); - rs2Add.setScopeKey(scopeKey); - roleScopeDao.insert(rs2Add); - } - }); - } - - // 删除 - if (!CollectionUtils.isEmpty(scopeKeys2Remove)) { - roleScopeDao.deleteByRoleIdAndOpeKey(roleId, operationKey, scopeKeys2Remove); - } - - // 清空redis缓存 - roleOpeScopeRedis.delRoleAllOpeScopes(roleId); - } - - @Override - public List listRoleDefaultOpsByRoleKey(String roleKey) { - return roleOperationDefaultDao.listRoleDefaultOpsByRoleKey(roleKey); - } - - /** - * - * @param roleKey - * @param operationKeys - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void saveRoleDefaultOperations(String roleKey, List operationKeys) { - - List opesExists = roleOperationDefaultDao.listByRoleKey(roleKey); - Set opeKeysExists = opesExists.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet()); - - // 过滤出删掉的 - Set deletedOpes = opeKeysExists.stream().filter(oke -> !operationKeys.contains(oke)).collect(Collectors.toSet()); - // 过滤出新增的 - Set newOpes = operationKeys.stream().filter(okn -> !opeKeysExists.contains(okn)).collect(Collectors.toSet()); - - for (String deletedOpe : deletedOpes) { - roleOperationDefaultDao.deleteByRoleKeyAndOpeKey(roleKey, deletedOpe); - } - - for (String newOpe : newOpes) { - RoleOperationDefaultEntity entity = new RoleOperationDefaultEntity(); - entity.setRoleKey(roleKey); - entity.setOperationKey(newOpe); - roleOperationDefaultDao.insert(entity); - } - } - - /** - * 查询默认的 - * @param roleKey - * @param operationKey - * @return - */ - @Override - public List listOpeDefaultScopes4Role(String roleKey, String operationKey) { - return operationScopeDefaultDao.listOpeDefaultScopes4Config(roleKey, operationKey); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void saveOpeDefaultScopes(String roleKey, String operationKey, List submitScopeKeys) { - List exists = operationScopeDefaultDao.listOpeDefaultScopesByRoleAndOpeKey(roleKey, operationKey); - - Set existsScopeKeys = exists.stream().map(ope -> ope.getScopeKey()).collect(Collectors.toSet()); - - // 删掉的 - Set deleteds = existsScopeKeys.stream().filter(esk -> !submitScopeKeys.contains(esk)).collect(Collectors.toSet()); - // 新增的 - Set addeds = submitScopeKeys.stream().filter(ssk -> !existsScopeKeys.contains(ssk)).collect(Collectors.toSet()); - - for (String scopeKey : deleteds) { - operationScopeDefaultDao.delete(roleKey, operationKey, scopeKey); - } - - for (String scopeKey : addeds) { - OperationScopeDefaultEntity entity = new OperationScopeDefaultEntity(); - entity.setOperationKey(operationKey); - entity.setRoleKey(roleKey); - entity.setScopeKey(scopeKey); - operationScopeDefaultDao.insert(entity); - } - } - - /** - * @Description 给角色添加操作权限和操作范围 - * @return - * @author wxz - * @date 2020.11.17 17:41 - */ - @Override - public void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys) { - Result> rolesResult = epmetUserOpenFeignClient.listRolesByRoleKey(roleKey); - if (!rolesResult.success()) { - String msg = "调用user服务，根据key查询角色列表失败"; - throw new RenException(EpmetErrorCode.USER_LIST_ROLES_BY_KEY_FAIL.getCode(), msg, msg, - RenException.MessageMode.CODE_INTERNAL_EXTERNAL.CODE_INTERNAL_EXTERNAL); - } - - List roles = rolesResult.getData(); - List roleIds2Add = roles.stream().map(GovStaffRoleResultDTO::getRoleId).collect(Collectors.toList()); - addOpeAndScopes4Role(roleIds2Add, operationKey, scopeKeys); - } - - /** - * @Description 将默认的角色操作和范围同步给具体的角色 - * @return - * @author wxz - * @date 2020.11.17 17:38 - */ - @Transactional(rollbackFor = Exception.class) - public void addOpeAndScopes4Role(List roleIds, String operationKey, List scopeKeys) { - for (String roleId : roleIds) { - // 只给没有添加该权限的用户赋予该权限，已经添加了和添加了又取消的不操作 - RoleOperationEntity roleOpe = roleOperationDao.getRoleOpe(roleId, operationKey); - boolean needRefreshCache = false; - if (roleOpe == null) { - // 没有该操作，则添加 - RoleOperationEntity roleOperation = new RoleOperationEntity(); - roleOperation.setOperationKey(operationKey); - roleOperation.setRoleId(roleId); - roleOperationDao.insert(roleOperation); - needRefreshCache = true; - } - for (String scopeKey : scopeKeys) { - // 没有的话则添加 - RoleScopeEntity roleScopeInDb = roleScopeDao.getByRoleIdAndOpeKey(roleId, operationKey, scopeKey); - if (roleScopeInDb == null) { - RoleScopeEntity roleScopeEntity = new RoleScopeEntity(); - roleScopeEntity.setOperationKey(operationKey); - roleScopeEntity.setRoleId(roleId); - roleScopeEntity.setScopeKey(scopeKey); - roleScopeDao.insert(roleScopeEntity); - needRefreshCache = true; - } - } - - // 清空角色的权限缓存 - if (needRefreshCache) { - roleOpeScopeRedis.delRoleAllOpeScopes(roleId); - } - } - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java deleted file mode 100644 index 25afa314fa..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ /dev/null @@ -1,597 +0,0 @@ -package com.epmet.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.epmet.bean.OpeScopeFilterResultBean; -import com.epmet.commons.tools.constant.AppClientConstant; -import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.security.dto.GovTokenDto; -import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.CpUserDetailRedis; -import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.OperationScopeConstant; -import com.epmet.dao.OperationScopeDao; -import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.dto.GovStaffRoleDTO; -import com.epmet.dto.form.GetSQLFilterFormDTO; -import com.epmet.dto.form.StaffRoleFormDTO; -import com.epmet.dto.result.LoginUserDetailsResultDTO; -import com.epmet.dto.result.RoleOpeScopeResultDTO; -import com.epmet.feign.EpmetUserFeignClient; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.redis.RoleOpeScopeRedis; -import com.epmet.service.AccessService; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class AccessServiceImpl implements AccessService { - - private static Logger logger = LoggerFactory.getLogger(AccessServiceImpl.class); - - /** - * 线程变量，记录是否已经添加了至少一个过滤条件 - */ - private static final ThreadLocal hasConditions = new ThreadLocal(); - - @Autowired - private CpUserDetailRedis cpUserDetailRedis; - - @Autowired - private OperationScopeDao operationScopeDao; - - @Autowired - private RoleOpeScopeRedis roleOpeScopeRedis; - - @Autowired - private GovOrgFeignClient govOrgFeignClient; - - @Autowired - private EpmetUserFeignClient userFeignClient; - - @Autowired - private LoginUserUtil loginUserUtil; - - public static final String ORG_RELATION_SAME = "same"; - public static final String ORG_RELATION_SUB = "sub"; - public static final String ORG_RELATION_SUP = "sup"; - public static final String ORG_PATH_SEPARATOR = ":"; - - @Override - public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId) { - return cpUserDetailRedis.get(app, client, staffId, LoginUserDetailsResultDTO.class); - } - - @Override - public List listAllRoleOperationScopesByRoleId(String roleId) { - List roleAllOpeScopes = roleOpeScopeRedis.getRoleAllOpeScopes(roleId); - if (roleAllOpeScopes == null) { - roleAllOpeScopes = operationScopeDao.listAllRoleOperationScopesByRoleId(roleId); - roleOpeScopeRedis.setRoleAllOpeScopes(roleId, roleAllOpeScopes); - } - return roleAllOpeScopes; - } - - @Override - public Boolean hasPermission(String operationKey, String userId, String app, String client) { - if (!AppClientConstant.APP_GOV.equals(app)) { - // 如果不是gov，那么不判断权限，放行 - return true; - } - - LoginUserDetailsResultDTO userDetails = getLoginUserDetails(app, client, userId); - if (userDetails == null) { - return false; - } - List roleList = userDetails.getRoleList(); - if (CollectionUtils.isEmpty(roleList)) { - return false; - } - - final Set operationKeys = new HashSet<>(); - - roleList.stream().forEach(role -> { - List opeAndScopes = listAllRoleOperationScopesByRoleId(role.getId()); - operationKeys.addAll(opeAndScopes.stream().map(opeAndScope -> opeAndScope.getOperationKey()).collect(Collectors.toSet())); - }); - - if (operationKeys.contains(operationKey)) { - return true; - } - return false; - } - - @Override - public String getSqlFilterSegment(GetSQLFilterFormDTO form) { - hasConditions.set(false); - LoginUserDetailsResultDTO userDetails = getLoginUserDetails(form.getApp(), form.getClient(), form.getUserId()); - if (userDetails == null) { - logger.error("查询SQL过滤脚本:没有找到用户的登陆信息:app: {}, client: {}, userId:{}", form.getApp(), form.getClient(), form.getUserId()); - throw new RenException(EpmetErrorCode.ERR10006.getCode()); - } - - StringBuilder sb = new StringBuilder(); - - if (CollectionUtils.isEmpty(userDetails.getRoleList())) { - //logger.warn("用户{}没有配置任何角色，无法执行{}操作", form.getUserId(), form.getOperationKey()); - throw new RenException(String.format("用户%s没有配置任何角色，无法执行%s操作", form.getUserId(), form.getOperationKey())); - } - - OpeScopeFilterResultBean effectiveOpeScopes = getEffectiveOpeScopes(userDetails.getRoleList(), form.getOperationKey()); - if (effectiveOpeScopes.isAllScopes()) { - return sb.toString(); - } - - HashSet orgLevelScopes = effectiveOpeScopes.getOrgLevelScopes(); - Set switchScopes = effectiveOpeScopes.getSwitchScopes(); - - // 生成组织上下级关系系列的sql过滤片段 - if (!CollectionUtil.isEmpty(orgLevelScopes) && !orgLevelScopes.contains(OperationScopeConstant.SCOPE_ORG_ALL)) { - genOrgLevelScopeSqlFilter(sb, orgLevelScopes, userDetails.getOrgIdPath(), form.getTableAlias()); - } - - // 生成开关范围的sql过滤器 - if (!CollectionUtil.isEmpty(switchScopes)) { - genSwitchScopeSqlFilter(switchScopes, sb, form.getTableAlias(), userDetails.getUserId(), form.getGridIds(), form.getDepartmentIds()); - } - - return sb.toString(); - } - - /** - * 生成开关系列范围sql过滤片段 - * @param switchScopes - */ - private void genSwitchScopeSqlFilter(Set switchScopes, - StringBuilder sb, - String tableAlias, - String userId, - Set gridIds, - Set departmentIds) { - - if (switchScopes.contains(OperationScopeConstant.SCOPE_I_CREATED)) { - genICreatedSql(sb, userId, tableAlias); - } - - if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_GRID)) { - if (gridIds == null) { - String error = String.format("DataFilter:拼接SQL语句出错:需要in grid权限，但是代码中没有获取到gridIds"); - logger.error(error); - throw new RenException(error); - } - if (gridIds.size() != 0) { - genInGrid(sb, gridIds, tableAlias); - } - } - - if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_DEPARTMENT)) { - if (departmentIds == null) { - String error = String.format("DataFilter:拼接SQL语句出错:需要in department权限，但是代码中没有获取到, departmentIds"); - logger.error(error); - throw new RenException(error); - } - if (departmentIds.size() != 0) { - genDepartmentFilterSql(sb, departmentIds, tableAlias); - } - } - } - - /** - * sql：我发起的 - * - * @param userId - */ - private void genICreatedSql(StringBuilder sb, String userId, String tableAlias) { - if (StringUtils.isBlank(tableAlias)) { - sb.append(hasConditions.get() ? " OR " : " ").append(" CREATED_BY ='").append(userId).append("'"); - } else { - sb.append(hasConditions.get() ? " OR " : " ").append(tableAlias).append(".CREATED_BY ='").append(userId).append("'"); - } - hasConditions.set(true); - } - - /** - * 网格sql - * - * @param sb - * @param tableAlias - */ - private void genInGrid(StringBuilder sb, Set gridIds, String tableAlias) { - if (hasConditions.get()) { - // 之前没有条件 - sb.append(" OR "); - } - - // OR GRID_ID = 'XXX' OR GRID_ID = 'QQQ' OR - - for (String gridId : gridIds) { - if (StringUtils.isBlank(tableAlias)) { - sb.append(" GRID_ID = '").append(gridId).append("' OR "); - } else { - sb.append(" ").append(tableAlias).append(".GRID_ID ='").append(gridId).append("' OR "); - } - } - - int lastOrIndex = sb.lastIndexOf("OR"); - sb.replace(lastOrIndex, lastOrIndex + "OR".length(), "" ); - - hasConditions.set(true); - } - - /** - * sql语句拼接FALSE - * @param sb - */ - private void genFalseCondition(StringBuilder sb) { - if (hasConditions.get()) { - // 之前没有条件 - sb.append(" OR "); - } - - sb.append(" FALSE "); - - hasConditions.set(true); - } - - /** - * 生成部门过滤sql - * - * @param sb - */ - private void genDepartmentFilterSql(StringBuilder sb, Set deptIds, String tableAlias) { - //Result> deptListResult = govOrgFeignClient.getDepartmentListByStaffId(staffId); - if (hasConditions.get()) { - // 之前没有条件 - sb.append(" OR "); - } - - for (String deptId : deptIds) { - if (StringUtils.isBlank(tableAlias)) { - sb.append(" DEPARTMENT_ID = '").append(deptId).append("' OR "); - } else { - sb.append(" ").append(tableAlias).append(".DEPARTMENT_ID ='").append(deptId).append("' OR "); - } - } - - int lastOrIndex = sb.lastIndexOf("OR"); - sb.replace(lastOrIndex, lastOrIndex + "OR".length(), "" ); - - hasConditions.set(true); - } - - /** - * 计算有效操作范围 - */ - public OpeScopeFilterResultBean getEffectiveOpeScopes(List roles, String reqiurePermission) { - - // 根据角色列表查询操作范围列表 - Set opeAndScopesOfThisOperation = new HashSet<>(); - roles.forEach(role -> { - List opes = listAllRoleOperationScopesByRoleId(role.getId()); - if (!CollectionUtils.isEmpty(opes)) { - opes.forEach(ope -> { - if (reqiurePermission.equals(ope.getOperationKey())) { - // 拿到当前操作对应的 RoleOpeScopeResultDTO - opeAndScopesOfThisOperation.add(ope); - } - }); - } - }); - - // 过滤范围 - return filteAndGroupScopes(opeAndScopesOfThisOperation); - } - - /** - * 对范围进行过滤和分组 - * - * @param scopeDTOS - * @return - */ - private OpeScopeFilterResultBean filteAndGroupScopes(Set scopeDTOS) { - // 存储上下级关系系列范围。先放到Map是为了去重和中途判断 - HashMap orgLevelScopes = new HashMap<>(); - - // 存储开关系列范围 - Set switchScopes = new HashSet<>(); - - // 所有范围 - Boolean all = false; - - for (RoleOpeScopeResultDTO scope : scopeDTOS) { - - if (OperationScopeConstant.SCOPE_ALL.equals(scope.getScopeKey())) { - all = true; - break; - } - - if (OperationScopeConstant.SERIES_SWITCH.equals(scope.getSeries())) { - switchScopes.add(scope.getScopeKey()); - continue; - } - - String scopeIndex = scope.getScopeIndex(); - if (OperationScopeConstant.SCOPE_ORG_ALL.equals(scope.getScopeKey())) { - // 该操作具有org_all的权限，直接放入 - orgLevelScopes.put(scopeIndex, scope); - continue; - } - - String[] currArr = scopeIndex.split("_"); - if ("0".equals(currArr[1])) { - // 为0，说明没有包含关系，直接放入 - orgLevelScopes.put(scopeIndex, scope); - continue; - } - - RoleOpeScopeResultDTO tempScope = orgLevelScopes.get(currArr[0]); - if (tempScope != null) { - // 已经有ac开头的了 - String tempScopeIndex = tempScope.getScopeIndex(); - if (Integer.valueOf(currArr[1]) < Integer.valueOf(tempScopeIndex.split("_")[1])) { - orgLevelScopes.put(currArr[0], scope); - } - } else { - orgLevelScopes.put(currArr[0], scope); - } - } - HashSet scopeStrs = new HashSet<>(); - Set> entries = orgLevelScopes.entrySet(); - for (Map.Entry entry : entries) { - scopeStrs.add(entry.getValue().getScopeKey()); - } - OpeScopeFilterResultBean resultBean = new OpeScopeFilterResultBean(); - resultBean.setOrgLevelScopes(scopeStrs); - resultBean.setSwitchScopes(switchScopes); - resultBean.setAllScopes(all); - return resultBean; - } - - /** - * 生成组织上下级关系系列的sql过滤片段 - * @param sb - * @param orgIdPath - * @param tableAlias - * @return - */ - private void genOrgLevelScopeSqlFilter(StringBuilder sb, HashSet scopes, String orgIdPath, String tableAlias) { - // 取出父组织ID path 和当前组织ID - //String parentOrgIDPath = orgIdPath.substring(0, orgIdPath.lastIndexOf(orgIdPathSpliter)); - //String currOrgID = orgIdPath.substring(orgIdPath.lastIndexOf(orgIdPathSpliter) + 1); - - for (String scope : scopes) { - switch (scope) { - // 当前单位(可以用ORG_ID_PATH，也可以用ORG_ID判断) - case OperationScopeConstant.SCOPE_ORG_CURR: - if (StringUtils.isBlank(tableAlias)) { - sb.append(" ORG_ID_PATH = '").append(orgIdPath).append("' OR "); - //sb.append(" ORG_ID = '").append(currOrgID).append("' OR "); - } else { - sb.append(" ").append(tableAlias).append(".ORG_ID_PATH = '").append(orgIdPath).append("' OR "); - //sb.append(" ").append(tableAlias).append(".ORG_ID = '").append(currOrgID).append("' OR "); - } - break; - // 本单位及其子级单位 - case OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB: - if (StringUtils.isBlank(tableAlias)) { - sb.append(" ORG_ID_PATH like '").append(orgIdPath).append("%' OR "); - } else { - sb.append(" ").append(tableAlias).append(".ORG_ID_PATH like '").append(orgIdPath).append("%' OR "); - } - break; - // 本单位的子级单位 - case OperationScopeConstant.SCOPE_ORG_CURR_SUB: - if (StringUtils.isBlank(tableAlias)) { - sb.append(" ORG_ID_PATH like '").append(orgIdPath).append(":%' OR "); - } else { - sb.append(" ").append(tableAlias).append(".ORG_ID_PATH like '").append(orgIdPath).append(":%' OR "); - } - break; - //当前单位的父级单位 - case OperationScopeConstant.SCOPE_ORG_CURR_SUP: - if (StringUtils.isBlank(tableAlias)) { - sb.append(" '").append(orgIdPath).append("' like CONCAT(").append("ORG_ID_PATH,':%') OR "); - } else { - sb.append(" '").append(orgIdPath).append("' like CONCAT(").append(tableAlias).append(".ORG_ID_PATH,':%') OR "); - } - break; - // 当前单位及其父级单位 - case OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP: - if (StringUtils.isBlank(tableAlias)) { - sb.append(" '").append(orgIdPath).append("' like CONCAT(").append("ORG_ID_PATH,'%') OR "); - } else { - sb.append(" '").append(orgIdPath).append("' like CONCAT(").append(tableAlias).append(".ORG_ID_PATH,'%' ) OR "); - } - break; - case OperationScopeConstant.SCOPE_ORG_EQUAL: - // todo 同级 - //sb.append(" OR "); - break; - case OperationScopeConstant.SCOPE_ORG_EQUAL_AND_SUB: - // todo 同级及其子级 - //sb.append(" OR "); - break; - case OperationScopeConstant.SCOPE_ORG_EQUAL_SUB: - // todo 同级的子级 - //sb.append(" OR "); - break; - case OperationScopeConstant.SCOPE_ORG_EQUAL_AND_SUP: - // todo 同级及其上级 - //sb.append(" OR "); - break; - case OperationScopeConstant.SCOPE_ORG_EQUAL_SUP: - // todo 同级的上级 - //sb.append(" OR "); - break; - } - } - - sb.replace(sb.lastIndexOf("OR"), sb.lastIndexOf("OR") + 3, ""); - hasConditions.set(true); - } - - @Override - public Set listOperationPermissions(String staffId, String currAgencyId) { - - LoginUserDetailsResultDTO userDetails = getLoginUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId()); - if (userDetails == null) { - throw new RenException(EpmetErrorCode.ERR10006.getCode(), EpmetErrorCode.ERR10006.getMsg()); - } - - // 1.拿到所属组织机构信息 - String belongAgencyId = getBelongAgencyFromOrgIdPath(userDetails.getOrgIdPath()); - Result belongAgencyRst = govOrgFeignClient.getAgencyById(belongAgencyId); - if (!belongAgencyRst.success()) { - throw new RenException("查询用户的操作权限列表:调用GovOrg，根据belongAgencyId查询机构信息失败:".concat(belongAgencyRst.getInternalMsg())); - } - - CustomerAgencyDTO belongAgency = belongAgencyRst.getData(); - - //Result agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId); - //if (!agencyByStaffRst.success()) { - // logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg()); - // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - //} - //CustomerAgencyDTO belongAgency = agencyByStaffRst.getData(); - //if (belongAgency == null) { - // logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId); - // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - //} - - // 2.拿到当前所处机关单位信息 - Result currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId); - CustomerAgencyDTO currAgencyDto = currAgencyRst.getData(); - if (!currAgencyRst.success() || currAgencyDto == null) { - throw new RenException(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg())); - } - - // 获取机关单位中的角色 - // 目前一个人只在一个单位下，所以不动态查询，如果后面需要一个人在多个单位，再改这里 - //List roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId()); - List roleList = userDetails.getRoleList(); - - // 当前组织和所属组织的orgId路径,以及他们的上下级关系 - String belongOrgIdPath = getOrgIdPath(belongAgency); - String currOrgIdPath = getOrgIdPath(currAgencyDto); - String currOrgRelation = getCurrOrgRelation(belongOrgIdPath, currOrgIdPath); - - Set filtedOps = new HashSet<>(); - - if (!CollectionUtils.isEmpty(roleList)) { - roleList.forEach(role -> { - List opeAndScopeDTO = listAllRoleOperationScopesByRoleId(role.getId()); - filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO)); - }); - } - return filtedOps; - } - - /** - * 从OrgIdPath中取所属机构(即最后一截) - * @param orgIdPath - * @return - */ - private String getBelongAgencyFromOrgIdPath(String orgIdPath) { - if (!orgIdPath.contains(ORG_PATH_SEPARATOR)) { - return orgIdPath; - } - return orgIdPath.substring(orgIdPath.lastIndexOf(ORG_PATH_SEPARATOR) + 1); - } - - /** - * 获取当前所处机关与所属机关的关系 - */ - private String getCurrOrgRelation(String belongOrgPath, String currAgencyPath) { - if (belongOrgPath.equals(currAgencyPath)) { - // 当前机关即该人员所属机关 - return ORG_RELATION_SAME; - } else if (currAgencyPath.indexOf(belongOrgPath.concat(":")) > -1) { - // 说明当前所在机关是人员所属机关子级,只取出scope为sub的 - return ORG_RELATION_SUB; - } else if (belongOrgPath.indexOf(currAgencyPath.concat(":")) > -1) { - // 说明当前所在机关是人员所属机关的上级 - return ORG_RELATION_SUP; - } - return belongOrgPath; - } - - /** - * 获取组织的orgId路径 - */ - public String getOrgIdPath(CustomerAgencyDTO agency) { - // 拼接单位ID全路径 - if ("0".equals(agency.getPid())) { - // 顶级组织 - return agency.getId(); - } else { - return agency.getPids().concat(":").concat(agency.getId()); - } - } - - public List queryGovStaffRoles(String staffId, String orgId) { - List roleDTOS = new ArrayList<>(); - StaffRoleFormDTO formDTO = new StaffRoleFormDTO(); - formDTO.setStaffId(staffId); - formDTO.setOrgId(orgId); - Result> gridResult = userFeignClient.getRolesOfStaff(formDTO); - if (!CollectionUtils.isEmpty(gridResult.getData())) { - roleDTOS.addAll(gridResult.getData()); - } - return roleDTOS; - } - - /** - * 根据上下级关系过滤出要返回的权限列表 - * - * @param currOrgRelation - * @param roleOperations - * @return - */ - private HashSet filterOpesByScope(String currOrgRelation, List roleOperations) { - HashSet opeKeys = new HashSet<>(); - for (RoleOpeScopeResultDTO opeScope : roleOperations) { - String scopeKey = opeScope.getScopeKey(); - if (OperationScopeConstant.SCOPE_ORG_ALL.equals(scopeKey) || OperationScopeConstant.SCOPE_ALL.equals(scopeKey)) { - // 如果该操作的范围是org_all或者all，不需要根据上下级关系判断，直接返回即可。 - opeKeys.add(opeScope.getOperationKey()); - continue; - } - - if (!opeScope.getSeries().equals(OperationScopeConstant.SERIES_ORG_LEVEL)) { - opeKeys.add(opeScope.getOperationKey()); - continue; - } - - switch (currOrgRelation) { - case ORG_RELATION_SAME:// 就在所在机构下 - if (OperationScopeConstant.SCOPE_ORG_CURR.equals(scopeKey) - || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB.equals(scopeKey) - || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP.equals(scopeKey)) { - opeKeys.add(opeScope.getOperationKey()); - } - break; - case ORG_RELATION_SUB:// 所在机构的子级 - if (OperationScopeConstant.SCOPE_ORG_CURR_SUB.equals(scopeKey) - || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB.equals(scopeKey)) { - opeKeys.add(opeScope.getOperationKey()); - } - break; - case ORG_RELATION_SUP:// 所在机构的上级 - if (OperationScopeConstant.SCOPE_ORG_CURR_SUP.equals(scopeKey) - || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP.equals(scopeKey)) { - opeKeys.add(opeScope.getOperationKey()); - } - break; - } - } - return opeKeys; - } - -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java deleted file mode 100644 index 43e21684ef..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.GovLanguageDao; -import com.epmet.dto.GovLanguageDTO; -import com.epmet.entity.GovLanguageEntity; -import com.epmet.redis.GovLanguageRedis; -import com.epmet.service.GovLanguageService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 国际化 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Service -public class GovLanguageServiceImpl extends BaseServiceImpl implements GovLanguageService { - - @Autowired - private GovLanguageRedis govLanguageRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovLanguageDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, GovLanguageDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public GovLanguageDTO get(String id) { - GovLanguageEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, GovLanguageDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(GovLanguageDTO dto) { - GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(GovLanguageDTO dto) { - GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public void saveOrUpdate(String tableName, String tableId, String fieldName, String fieldValue, String language) { - GovLanguageEntity entity = new GovLanguageEntity(); - entity.setTableName(tableName); - entity.setTableId(tableId); - entity.setFieldName(fieldName); - entity.setFieldValue(fieldValue); - entity.setLanguage(language); - - //判断是否有数据 - if(baseDao.getLanguage(entity) == null){ - baseDao.insertOperLanguageEntity(entity); - }else { - baseDao.updateLanguage(entity); - } - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java deleted file mode 100644 index 5a6efd43f2..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ /dev/null @@ -1,247 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.Constant; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.exception.ErrorCode; -import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.HttpContextUtils; -import com.epmet.commons.tools.utils.TreeUtils; -import com.epmet.dao.GovMenuDao; -import com.epmet.dto.GovMenuDTO; -import com.epmet.entity.GovMenuEntity; -import com.epmet.enums.MenuTypeEnum; -import com.epmet.feign.EpmetUserFeignClient; -import com.epmet.redis.GovMenuRedis; -import com.epmet.service.GovLanguageService; -import com.epmet.service.GovMenuService; -import com.epmet.service.GovResourceService; -import com.epmet.service.GovRoleMenuService; -import org.apache.commons.lang3.StringUtils; -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; - -import java.util.*; - -/** - * 菜单管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Service -public class GovMenuServiceImpl extends BaseServiceImpl implements GovMenuService { - protected Logger logger = LoggerFactory.getLogger(getClass()); - @Autowired - private GovMenuRedis govMenuRedis; - @Autowired - private EpmetUserFeignClient epmetUserFeignClient; - @Autowired - private GovRoleMenuService govRoleMenuService; - @Autowired - private GovResourceService govResourceService; - @Autowired - private GovLanguageService govLanguageService; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovMenuDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, GovMenuDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public GovMenuDTO get(String id) { - GovMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage()); - - return ConvertUtils.sourceToTarget(entity, GovMenuDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(GovMenuDTO dto, TokenDto tokenDto) { - GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class); - - //保存菜单 - insert(entity); - saveLanguage(entity.getId(), "name", entity.getName()); - - //保存菜单资源 - govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList()); - - //清空当前用户，菜单导航、权限标识 - govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(GovMenuDTO dto, TokenDto tokenDto) { - GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class); - - //上级菜单不能为自身 - if(entity.getId().equals(entity.getPid())){ - throw new RenException(ErrorCode.SUPERIOR_MENU_ERROR); - } - - //更新菜单 - updateById(entity); - saveLanguage(entity.getId(), "name", entity.getName()); - - //更新菜单资源 - govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList()); - - //清空当前用户，菜单导航、权限标识 - govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String id, TokenDto tokenDto) { - //逻辑删除 - baseDao.deleteBatchIds(Collections.singletonList(id)); - //删除角色菜单关系 - govRoleMenuService.deleteByMenuId(id); - - //清空当前用户，菜单导航、权限标识 - govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); - } - - @Override - public List getUserMenuList(TokenDto tokenDto, Integer type) { - List menuList; - -// Result govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); - -// //系统管理员，拥有最高权限 -// if(govUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ - menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); -// }else { -// menuList = baseDao.getUserMenuList(tokenDto.getUserId(), type, HttpContextUtils.getLanguage()); -// } - - List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); - - return TreeUtils.buildTree(dtoList); - } - - @Override - public List getMenuList(Integer type) { - List menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); - - List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); - - return TreeUtils.buildTree(dtoList, Constant.OPER_MENU_ROOT); - } - - @Override - public List getUserMenuNavList(TokenDto tokenDto) { - List menuList = govMenuRedis.getUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); - if(menuList == null){ - menuList = getUserMenuList(tokenDto, MenuTypeEnum.MENU.value()); - - govMenuRedis.setUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), menuList); - } - - return menuList; - } - - @Override - public Set getUserPermissions(TokenDto tokenDto) { - //用户权限列表 - Set permsSet = govMenuRedis.getUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); - if(permsSet != null){ - return permsSet; - } - -// Result govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); - - //超级管理员，拥有最高权限 - List menuList; -// if(govUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ - menuList = baseDao.getMenuList(MenuTypeEnum.BUTTON.value(), HttpContextUtils.getLanguage()); -// }else{ -// menuList = baseDao.getUserMenuList(tokenDto.getUserId(), MenuTypeEnum.BUTTON.value(), HttpContextUtils.getLanguage()); -// } - - permsSet = new HashSet<>(); - for(GovMenuEntity menu : menuList){ - if(StringUtils.isNotBlank(menu.getPermissions())){ - permsSet.add(menu.getPermissions()); - } - } - - //保存到缓存 - govMenuRedis.setUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), permsSet); - - return permsSet; - } - - @Override - public List getListPid(String pid) { - List menuList = baseDao.getListPid(pid); - - return ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); - } - - @Override - public void clearOperUserAccess(String app, String client, String userId) { - //清空当前用户，菜单导航、权限标识 - govMenuRedis.delete(userId, app, client); - logger.info(String.format("运营端用户退出系统%s,清空菜单、权限成功",userId)); - } - - private void saveLanguage(String tableId, String fieldName, String fieldValue){ - govLanguageService.saveOrUpdate("gov_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage()); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java deleted file mode 100644 index 2cb1da7087..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.enums.ResourceAuthEnum; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.GovResourceDao; -import com.epmet.dto.GovResourceDTO; -import com.epmet.dto.result.MenuResourceDTO; -import com.epmet.entity.GovResourceEntity; -import com.epmet.enums.MenuFlagEnum; -import com.epmet.redis.GovResourceRedis; -import com.epmet.service.GovResourceService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 资源管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Service -public class GovResourceServiceImpl extends BaseServiceImpl implements GovResourceService { - - @Autowired - private GovResourceRedis govResourceRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovResourceDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, GovResourceDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public GovResourceDTO get(String id) { - GovResourceEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, GovResourceDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(GovResourceDTO dto) { - GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(GovResourceDTO dto) { - GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public void saveMenuResource(String menuId, String menuName, List resourceList) { - //先删除菜单资源关系 - baseDao.deleteByCode(menuId+""); - - //删除缓存 - govResourceRedis.delete(); - - //菜单没有一个资源的情况 - if(CollUtil.isEmpty(resourceList)){ - return ; - } - - //保存菜单资源关系 - for(MenuResourceDTO dto : resourceList){ - GovResourceEntity entity = new GovResourceEntity(); - entity.setResourceCode(menuId+""); - entity.setResourceName(menuName); - entity.setResourceUrl(dto.getResourceUrl()); - entity.setResourceMethod(dto.getResourceMethod()); - entity.setAuthLevel(ResourceAuthEnum.PERMISSIONS_AUTH.value()); - entity.setMenuFlag(MenuFlagEnum.YES.value()); - - //保存 - insert(entity); - } - } - - @Override - public List getMenuResourceList(String menuId) { - List entityList = baseDao.getMenuResourceList(menuId+""); - - return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java deleted file mode 100644 index ec31c69146..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.GovRoleMenuDao; -import com.epmet.dto.GovRoleMenuDTO; -import com.epmet.entity.GovRoleMenuEntity; -import com.epmet.redis.GovRoleMenuRedis; -import com.epmet.service.GovRoleMenuService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 角色菜单关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Service -public class GovRoleMenuServiceImpl extends BaseServiceImpl implements GovRoleMenuService { - - @Autowired - private GovRoleMenuRedis govRoleMenuRedis; - @Autowired - private GovRoleMenuDao govRoleMenuDao; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovRoleMenuDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, GovRoleMenuDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public GovRoleMenuDTO get(String id) { - GovRoleMenuEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, GovRoleMenuDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(GovRoleMenuDTO dto) { - GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(GovRoleMenuDTO dto) { - GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public List getMenuIdList(String roleId){ - return baseDao.getMenuIdList(roleId); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveOrUpdate(String roleId, List menuIdList) { - //先删除角色菜单关系 - deleteByRoleId(roleId); - - //角色没有一个菜单权限的情况 - if(CollUtil.isEmpty(menuIdList)){ - return ; - } - - //保存角色菜单关系 - for(String menuId : menuIdList){ - GovRoleMenuEntity govRoleMenuEntity = new GovRoleMenuEntity(); - govRoleMenuEntity.setMenuId(menuId); - govRoleMenuEntity.setRoleId(roleId); - - //保存 - insert(govRoleMenuEntity); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteByRoleId(String roleId) { - baseDao.deleteByRoleId(roleId); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteByRoleIds(String[] roleIds) { - govRoleMenuDao.deleteByRoleIds(roleIds); - } - - @Override - public void deleteByMenuId(String menuId) { - baseDao.deleteByMenuId(menuId); - } -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java deleted file mode 100644 index 5810b420e5..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.GovRoleDao; -import com.epmet.dto.GovRoleDTO; -import com.epmet.entity.GovRoleEntity; -import com.epmet.redis.GovRoleRedis; -import com.epmet.service.GovRoleMenuService; -import com.epmet.service.GovRoleService; -import com.epmet.service.GovRoleUserService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 角色管理 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Service -public class GovRoleServiceImpl extends BaseServiceImpl implements GovRoleService { - - @Autowired - private GovRoleRedis govRoleRedis; - @Autowired - private GovRoleMenuService govRoleMenuService; - @Autowired - private GovRoleUserService govRoleUserService; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovRoleDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, GovRoleDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String name = (String)params.get(FieldConstant.NAME_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name); - - return wrapper; - } - - @Override - public GovRoleDTO get(String id) { - GovRoleEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, GovRoleDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(GovRoleDTO dto) { - GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class); - insert(entity); - //保存角色菜单关系 - govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(GovRoleDTO dto) { - GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class); - updateById(entity); - //保存角色菜单关系 - govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - - govRoleMenuService.deleteByRoleIds(ids); - - govRoleUserService.deleteByRoleIds(ids); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java deleted file mode 100644 index 21b796cc3b..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.GovRoleUserDao; -import com.epmet.dto.GovRoleUserDTO; -import com.epmet.entity.GovRoleUserEntity; -import com.epmet.redis.GovRoleUserRedis; -import com.epmet.service.GovRoleUserService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 角色用户关系 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-18 - */ -@Service -public class GovRoleUserServiceImpl extends BaseServiceImpl implements GovRoleUserService { - - @Autowired - private GovRoleUserRedis govRoleUserRedis; - @Autowired - private GovRoleUserDao govRoleUserDao; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovRoleUserDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, GovRoleUserDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public GovRoleUserDTO get(String id) { - GovRoleUserEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, GovRoleUserDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(GovRoleUserDTO dto) { - GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(GovRoleUserDTO dto) { - GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveOrUpdate(String userId, List roleIdList) { - //先删除角色用户关系 - deleteByUserId(userId); - - //用户没有一个角色权限的情况 - if(CollUtil.isEmpty(roleIdList)){ - return ; - } - - //保存角色用户关系 - for(String roleId : roleIdList){ - GovRoleUserEntity govRoleUserEntity = new GovRoleUserEntity(); - govRoleUserEntity.setUserId(userId); - govRoleUserEntity.setRoleId(roleId); - - //保存 - insert(govRoleUserEntity); - } - } - - @Override - public void deleteByRoleId(String roleId) { - govRoleUserDao.deleteByRoleId(roleId); - } - - @Override - public void deleteByUserId(String userId) { - govRoleUserDao.deleteByUserId(userId); - } - - @Override - public List getRoleIdList(String userId) { - - return baseDao.getRoleIdList(userId); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteByRoleIds(String[] roleIds) { - govRoleUserDao.deleteByRoleIds(roleIds); - } - - @Override - public void deleteByUserIds(String[] userIds) { - govRoleUserDao.deleteByUserIds(userIds); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java deleted file mode 100644 index e582395fe2..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.OperationScopeDao; -import com.epmet.dto.OperationScopeDTO; -import com.epmet.entity.OperationScopeEntity; -import com.epmet.service.OperationScopeService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 权限范围表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Service -public class OperationScopeServiceImpl extends BaseServiceImpl implements OperationScopeService { - - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, OperationScopeDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, OperationScopeDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public OperationScopeDTO get(String id) { - OperationScopeEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, OperationScopeDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(OperationScopeDTO dto) { - OperationScopeEntity entity = ConvertUtils.sourceToTarget(dto, OperationScopeEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(OperationScopeDTO dto) { - OperationScopeEntity entity = ConvertUtils.sourceToTarget(dto, OperationScopeEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java deleted file mode 100644 index ca28d43d0b..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.epmet.service.impl; - -import com.epmet.dao.OperationDao; -import com.epmet.entity.OperationEntity; -import com.epmet.service.OperationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class OperationServiceImpl implements OperationService { - - @Autowired - private OperationDao operationDao; - - @Override - public List listAllOperations() { - return operationDao.listAllOperationEntities(); - } - - @Transactional - @Override - public void createBatch(ArrayList operations2Create) { - operations2Create.forEach(ope -> operationDao.insert(ope)); - } - - @Transactional - @Override - public void updateBatch(ArrayList operations2Update) { - operations2Update.forEach(ope -> operationDao.updateById(ope)); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java deleted file mode 100644 index 28943e74b8..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java +++ /dev/null @@ -1,218 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.OperationScopeDefaultDao; -import com.epmet.dao.RoleOperationDao; -import com.epmet.dao.RoleOperationDefaultDao; -import com.epmet.dao.RoleScopeDao; -import com.epmet.dto.RoleOperationDTO; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.result.OperationScopeDefaultResultDTO; -import com.epmet.dto.result.RoleOperationDefaultResultDTO; -import com.epmet.dto.result.RoleOperationResultDTO; -import com.epmet.entity.OperationScopeDefaultEntity; -import com.epmet.entity.RoleOperationEntity; -import com.epmet.entity.RoleScopeEntity; -import com.epmet.service.RoleOperationService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.*; - -/** - * 角色能进行那些操作 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-22 - */ -@Service -public class RoleOperationServiceImpl extends BaseServiceImpl implements RoleOperationService { - - @Autowired - private RoleOperationDefaultDao roleOperationDefaultDao; - - @Autowired - private RoleOperationDao roleOperationDao; - - @Autowired - private OperationScopeDefaultDao operationScopeDefaultDao; - - @Autowired - private RoleScopeDao roleScopeDao; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, RoleOperationDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, RoleOperationDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public RoleOperationDTO get(String id) { - RoleOperationEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, RoleOperationDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(RoleOperationDTO dto) { - RoleOperationEntity entity = ConvertUtils.sourceToTarget(dto, RoleOperationEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(RoleOperationDTO dto) { - RoleOperationEntity entity = ConvertUtils.sourceToTarget(dto, RoleOperationEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public List listOperationsByRoleId(String roleId) { - return baseDao.listOperationsByRoleId(roleId); - } - - @Override - @Transactional - public void initDefaultOperationsForRoles(List roles) { - for (InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role : roles) { - String roleId = role.getRoleId(); - String roleKey = role.getRoleKey(); - List defaultOperations = roleOperationDefaultDao.listByRoleKey(roleKey); - if (!CollectionUtils.isEmpty(defaultOperations)) { - // 有的角色并没有配置默认的操作权限，应该忽略 - initDefaultOperationsForRole(roleId, defaultOperations); - initDefaultOperationScopesForRole(roleId, roleKey, defaultOperations); - } - } - } - - /** - * 为某一个角色初始化默认操作权限 - * @param roleId - * @param operations - */ - public void initDefaultOperationsForRole(String roleId, List operations) { - for (RoleOperationDefaultResultDTO operation : operations) { - RoleOperationEntity entity = new RoleOperationEntity(); - entity.setOperationKey(operation.getOperationKey()); - entity.setRoleId(roleId); - roleOperationDao.insert(entity); - } - } - - /** - * 为角色初始化操作范围 - * 传入的map为所有操作的默认操作范围，但是具体要为该角色初始化哪一些操作，是由operations参数决定的，并不是map中所有操作都会被初始化给该role - * @param roleId 角色ID - * @param operations 该角色可以做的操作列表 - */ - public void initDefaultOperationScopesForRole(String roleId, String roleKey, List operations) { - HashMap> opeScopeMap = listDefaultOpeScopesMap(roleKey); - for (RoleOperationDefaultResultDTO operation : operations) { - // 该角色，该操作的操作范围列表 - Set scopeKeys4ThisOpe = opeScopeMap.get(operation.getOperationKey()); - if (!CollectionUtils.isEmpty(scopeKeys4ThisOpe)) { - for (String scopeKey : scopeKeys4ThisOpe) { - RoleScopeEntity roleScopeEntity = new RoleScopeEntity(); - roleScopeEntity.setOperationKey(operation.getOperationKey()); - roleScopeEntity.setRoleId(roleId); - roleScopeEntity.setScopeKey(scopeKey); - roleScopeDao.insert(roleScopeEntity); - } - } - } - } - - private HashMap> listDefaultOpeScopesMap(String roleKey) { - List defaultScopes = operationScopeDefaultDao.listDefaultOpeScopes(roleKey); - return convertScopeDefaultDto2Map(defaultScopes); - } - - /** - * 将默认范围entity转换为map - * @param entities - * @return - */ - private HashMap> convertScopeDefaultEntity2Map(List entities) { - HashMap> map = new HashMap<>(); - for (OperationScopeDefaultEntity entity : entities) { - Set scopes = map.get(entity.getOperationKey()); - if (scopes == null) { - scopes = new HashSet<>(); - map.put(entity.getOperationKey(), scopes); - } - scopes.add(entity.getScopeKey()); - } - return map; - } - - /** - * 将默认范围dto转换为map - * @param dtos - * @return - */ - private HashMap> convertScopeDefaultDto2Map(List dtos) { - HashMap> map = new HashMap<>(); - for (OperationScopeDefaultResultDTO dto : dtos) { - Set scopes = map.get(dto.getOperationKey()); - if (scopes == null) { - scopes = new HashSet<>(); - map.put(dto.getOperationKey(), scopes); - } - scopes.add(dto.getScopeKey()); - } - return map; - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java deleted file mode 100644 index bff52f8d64..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.RoleScopeDao; -import com.epmet.dto.RoleScopeDTO; -import com.epmet.entity.RoleScopeEntity; -import com.epmet.service.RoleScopeService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 角色能操作哪些范围 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-04-24 - */ -@Service -public class RoleScopeServiceImpl extends BaseServiceImpl implements RoleScopeService { - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, RoleScopeDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, RoleScopeDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public RoleScopeDTO get(String id) { - RoleScopeEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, RoleScopeDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(RoleScopeDTO dto) { - RoleScopeEntity entity = ConvertUtils.sourceToTarget(dto, RoleScopeEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(RoleScopeDTO dto) { - RoleScopeEntity entity = ConvertUtils.sourceToTarget(dto, RoleScopeEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java b/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java deleted file mode 100644 index 99ba370525..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.service.impl; - -import com.epmet.commons.tools.annotation.ExternalRequestAuth; -import com.epmet.service.TestService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class TestServiceImpl implements TestService { - - @ExternalRequestAuth - @Override - public void test() { - System.out.println("TestService -> test()"); - } -} diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml b/gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml deleted file mode 100644 index ba54ae13d4..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,125 +0,0 @@ -server: - port: 9999 - servlet: - context-path: /lb - -spring: - main: - allow-bean-definition-overriding: true - application: - name: lb-server - #环境 dev|test|prod - profiles: - active: @spring.profiles.active@ - jackson: - time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss - redis: - database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ - password: @spring.redis.password@ - timeout: 30s - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - cloud: - nacos: - discovery: - server-addr: 192.168.1.130:8848 - #nacos的命名空间ID，默认是public - namespace: 6ceab336-d004-4acf-89c6-e121d06f4988 - #不把自己注册到注册中心的地址 - register-enabled: true - ip: @nacos.ip@ - config: - enabled: @nacos.config-enabled@ - server-addr: @nacos.server-addr@ - namespace: @nacos.config.namespace@ - group: @nacos.config.group@ - file-extension: yaml - #指定共享配置，且支持动态刷新 -# ext-config: -# - data-id: datasource.yaml -# group: ${spring.cloud.nacos.config.group} -# refresh: true -# - data-id: common.yaml -# group: ${spring.cloud.nacos.config.group} -# refresh: true - - # 数据迁移工具flyway - flyway: - enabled: @spring.flyway.enabled@ - locations: classpath:db/migration - url: @spring.datasource.druid.url@ - user: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - baseline-on-migrate: true - baseline-version: 0 - - -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - health: - show-details: ALWAYS - -mybatis-plus: - mapper-locations: classpath:/mapper/**/*.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.epmet.entity - global-config: - #数据库相关配置 - db-config: - #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; - id-type: ID_WORKER - #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" - field-strategy: NOT_NULL - #驼峰下划线转换 - column-underline: true - banner: false - #原生配置 - configuration: - map-underscore-to-camel-case: true - cache-enabled: false - call-setters-on-nulls: true - jdbc-type-for-null: 'null' - -feign: - hystrix: - enabled: true - client: - config: - default: - loggerLevel: BASIC - httpclient: - enabled: true - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 60000 #缺省为1000 - -ribbon: - ReadTimeout: 300000 - ConnectTimeout: 300000 - -#pageHelper分页插件 -pagehelper: - helper-dialect: mysql - reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1 - -#feign 日志需要该配置 -logging: - level: - com.epmet: debug \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql b/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql deleted file mode 100644 index 7a51a3f595..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.1__init.sql +++ /dev/null @@ -1 +0,0 @@ -select 0; \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql b/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql deleted file mode 100644 index 7933982d49..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/db/migration/V0.0.2__add.sql +++ /dev/null @@ -1,91 +0,0 @@ -CREATE TABLE `gov_language` ( - `table_name` varchar(32) NOT NULL COMMENT '表名', - `table_id` varchar(64) NOT NULL COMMENT '表主键', - `field_name` varchar(32) NOT NULL COMMENT '字段名', - `field_value` varchar(200) NOT NULL COMMENT '字段值', - `language` varchar(10) NOT NULL COMMENT '语言', - PRIMARY KEY (`table_name`,`table_id`,`field_name`,`language`) USING BTREE, - KEY `idx_table_id` (`table_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='国际化'; -CREATE TABLE `gov_menu` ( - `id` varchar(64) NOT NULL COMMENT 'id', - `pid` varchar(64) DEFAULT NULL COMMENT '上级ID，一级菜单为0', - `url` varchar(200) DEFAULT NULL COMMENT '菜单URL', - `type` tinyint(3) unsigned DEFAULT NULL COMMENT '类型 0：菜单 1：按钮', - `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', - `permissions` varchar(32) DEFAULT NULL COMMENT '权限标识，如：sys:menu:save', - `sort` int(11) DEFAULT NULL COMMENT '排序', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - `SHOW_FLAG` int(11) NOT NULL DEFAULT '1' COMMENT '是否显示，1：显示 0不显示', - PRIMARY KEY (`id`) USING BTREE, - KEY `idx_pid` (`pid`) USING BTREE, - KEY `idx_del_flag` (`DEL_FLAG`) USING BTREE, - KEY `idx_create_date` (`CREATED_TIME`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='菜单管理'; -CREATE TABLE `gov_resource` ( - `id` varchar(64) NOT NULL COMMENT 'id', - `resource_code` varchar(32) DEFAULT NULL COMMENT '资源编码，如菜单ID', - `resource_name` varchar(32) DEFAULT NULL COMMENT '资源名称', - `resource_url` varchar(100) DEFAULT NULL COMMENT '资源URL', - `resource_method` varchar(8) DEFAULT NULL COMMENT '请求方式（如：GET、POST、PUT、DELETE）', - `menu_flag` tinyint(3) unsigned DEFAULT NULL COMMENT '菜单标识 0：非菜单资源 1：菜单资源', - `auth_level` tinyint(3) unsigned DEFAULT NULL COMMENT '认证等级 0：权限认证 1：登录认证 2：无需认证', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - KEY `idx_resource_code` (`resource_code`) USING BTREE, - KEY `idx_create_date` (`CREATED_TIME`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='资源管理'; -CREATE TABLE `gov_role` ( - `id` varchar(64) NOT NULL COMMENT 'id', - `name` varchar(32) DEFAULT NULL COMMENT '角色名称', - `remark` varchar(100) DEFAULT NULL COMMENT '备注', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', - `dept_id` bigint(20) DEFAULT NULL COMMENT '部门ID', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - KEY `idx_dept_id` (`dept_id`) USING BTREE, - KEY `idx_del_flag` (`DEL_FLAG`) USING BTREE, - KEY `idx_create_date` (`CREATED_TIME`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色管理'; -CREATE TABLE `gov_role_menu` ( - `id` varchar(64) NOT NULL COMMENT 'id', - `role_id` varchar(64) DEFAULT NULL COMMENT '角色ID', - `menu_id` varchar(64) DEFAULT NULL COMMENT '菜单ID', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - KEY `idx_role_id` (`role_id`) USING BTREE, - KEY `idx_menu_id` (`menu_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色菜单关系'; -CREATE TABLE `gov_role_user` ( - `id` varchar(64) NOT NULL COMMENT 'id', - `role_id` varchar(64) DEFAULT NULL COMMENT '角色ID', - `user_id` varchar(64) DEFAULT NULL COMMENT '用户ID', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - KEY `idx_role_id` (`role_id`) USING BTREE, - KEY `idx_user_id` (`user_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色用户关系'; \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml deleted file mode 100644 index 45b1ddc4e0..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - ${appname} - - - - - - - - - debug - - - ${CONSOLE_LOG_PATTERN} - - UTF-8 - - - - - - - - ${log.path}/debug.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/debug-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - debug - ACCEPT - DENY - - - - - - - ${log.path}/info.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/info-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - info - ACCEPT - DENY - - - - - - - ${log.path}/warn.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/warn-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - warn - ACCEPT - DENY - - - - - - - ${log.path}/error.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/error-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml deleted file mode 100644 index 5b829dc734..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovLanguageDao.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - INSERT INTO `gov_language` ( `table_name`, `table_id`, `field_name`, `field_value`, `language` ) - VALUES - ( #{tableName}, #{tableId}, #{fieldName}, #{fieldValue}, #{language} ) - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml deleted file mode 100644 index 90d0b8ee92..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovMenuDao.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml deleted file mode 100644 index 8296d14065..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovResourceDao.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - delete from gov_resource where resource_code = #{value} - - - - - - - - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml deleted file mode 100644 index 2de28e07bf..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleDao.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml deleted file mode 100644 index 862679b5de..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleMenuDao.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - update gov_role_menu set del_flag = 1 where del_flag = 0 and role_id in - - #{roleId} - - - - - update gov_role_menu set del_flag = 1 where role_id = #{value} and del_flag = 0 - - - - update gov_role_menu set del_flag = 1 where menu_id = #{value} and del_flag = 0 - - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml deleted file mode 100644 index b5cb172451..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/GovRoleUserDao.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - update gov_role_user set del_flag = 1 where del_flag = 0 and role_id in - - #{roleId} - - - - - update gov_role_user set del_flag = 1 where del_flag = 0 and user_id in - - #{userId} - - - - - update gov_role_user set del_flag = 1 where role_id = #{value} and del_flag = 0 - - - - update gov_role_user set del_flag = 1 where user_id = #{value} and del_flag = 0 - - - - - diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml deleted file mode 100644 index 824b7a4feb..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationDao.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml deleted file mode 100644 index 0591776c96..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDao.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml deleted file mode 100755 index da0ae9597d..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/OperationScopeDefaultDao.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - DELETE - FROM operation_scope_default - WHERE ROLE_KEY = #{roleKey} - AND OPERATION_KEY = #{operationKey} - AND SCOPE_KEY = #{scopeKey} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml deleted file mode 100644 index 7009237115..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDao.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE role_operation - SET DEL_FLAG = 1 - WHERE ROLE_ID = #{roleId} - AND OPERATION_KEY = #{opeKey} - - - - - - - UPDATE role_operation - SET DEL_FLAG = 0 - WHERE ROLE_ID = #{roleId} - AND OPERATION_KEY = #{opeKey} - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml deleted file mode 100755 index 98cd9f675b..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleOperationDefaultDao.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - DELETE FROM role_operation_default WHERE ROLE_KEY = #{roleKey} AND OPERATION_KEY = #{operationKey} - - - - - - - - \ No newline at end of file diff --git a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml b/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml deleted file mode 100644 index 9a0337a2c7..0000000000 --- a/gov-access-lb/gov-access-lb-server/src/main/resources/mapper/RoleScopeDao.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - DELETE - FROM role_scope - WHERE ROLE_ID = #{roleId} - AND OPERATION_KEY = #{operationKey} - AND SCOPE_KEY IN - - #{scopeKey} - - - - - - DELETE - FROM role_scope - WHERE ROLE_ID = #{roleId} - AND OPERATION_KEY = #{operationKey} - AND SCOPE_KEY = #{scopeKey} - - - - - - - \ No newline at end of file diff --git a/gov-access-lb/pom.xml b/gov-access-lb/pom.xml deleted file mode 100644 index c7847e4776..0000000000 --- a/gov-access-lb/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - epmet-module - com.epmet - 2.0.0 - - 4.0.0 - - gov-access-lb - pom - - - gov-access-lb-client - gov-access-lb-server - - - - \ No newline at end of file From 89fd63701e72cddc1b33c0ef1ab2074f7ec3a89f Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 11:11:15 +0800 Subject: [PATCH 348/589] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GovAccessFeignClientFallBack.java | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java diff --git a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java deleted file mode 100644 index 4dab49c910..0000000000 --- a/gov-access-lb/gov-access-lb-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ /dev/null @@ -1,35 +0,0 @@ -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.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.feign.GovAccessFeignClient; -import org.springframework.stereotype.Component; - -import java.util.Set; - -/** - * @Description - * @Author sun - */ -@Component -public class GovAccessFeignClientFallBack implements GovAccessFeignClient { - - - @Override - public Result initDefaultOperationsForRoles(InitDefaultOperationsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "initDefaultOperationsForRoles", formDTO); - } - - @Override - public Result> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO); - } - - @Override - public Result getHost() { - return ModuleUtils.feignConError("lb-server", "getHost", null); - } -} \ No newline at end of file From 9ee059fe9aeef42180e53e418f849ef3290e1b5f Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 12:20:58 +0800 Subject: [PATCH 349/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0LbController=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LbController.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java new file mode 100644 index 0000000000..718d10929e --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java @@ -0,0 +1,23 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.commons.util.InetUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("lb") +public class LbController { + + @Autowired + private InetUtils inetUtils; + + @PostMapping("get-host") + public Result getHost() { + String ipAddress = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + return new Result().ok(ipAddress); + } + +} From 27afa69e9d5cc64b23ecce871543c0b644f2d050 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 15:19:44 +0800 Subject: [PATCH 350/589] =?UTF-8?q?loadBanancer=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/LbTestController.java | 24 +++++++++++++++++++ .../java/com/epmet/feign/LbFeignClient.java | 12 ++++++++++ .../feign/fallback/LbFeignClientFallback.java | 13 ++++++++++ 3 files changed, 49 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java new file mode 100644 index 0000000000..a7e8d14592 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java @@ -0,0 +1,24 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.LbFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("lbtest") +public class LbTestController { + + @Autowired + private LbFeignClient lbFeignClient; + + @PostMapping("get-host") + public Result getHost() { + Result host = lbFeignClient.getHost(); + return host; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java new file mode 100644 index 0000000000..b714f1abf4 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java @@ -0,0 +1,12 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.fallback.LbFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +@FeignClient(name = "gov-voice-server", fallback = LbFeignClientFallback.class) +public interface LbFeignClient { + @PostMapping("/gov/voice/lb/get-host") + Result getHost(); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java new file mode 100644 index 0000000000..1d3365ab47 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java @@ -0,0 +1,13 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.LbFeignClient; +import org.springframework.stereotype.Component; + +@Component +public class LbFeignClientFallback implements LbFeignClient { + @Override + public Result getHost() { + return new Result().error(0, "请求失败"); + } +} From 2a86b4b127e9d47ca565531a099862c718a577a6 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 1 Dec 2020 17:15:43 +0800 Subject: [PATCH 351/589] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E9=9B=85?= =?UTF-8?q?=E5=81=9C=E6=9C=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/GovVoiceApplication.java | 22 +++++++++-- .../epmet/config/GracefulShutdownTomcat.java | 37 +++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java index db1073c8e8..fadb32d058 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java @@ -1,13 +1,17 @@ package com.epmet; +import com.epmet.config.GracefulShutdownTomcat; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; /** - * * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ @@ -16,7 +20,17 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableFeignClients @EnableAsync public class GovVoiceApplication { - public static void main(String[] args) { - SpringApplication.run(GovVoiceApplication.class, args); - } + @Autowired + private GracefulShutdownTomcat gracefulShutdownTomcat; + + public static void main(String[] args) { + SpringApplication.run(GovVoiceApplication.class, args); + } + + @Bean + public ServletWebServerFactory servletContainer() { + TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); + tomcat.addConnectorCustomizers(gracefulShutdownTomcat); + return tomcat; + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java new file mode 100644 index 0000000000..4cc1d8f56a --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java @@ -0,0 +1,37 @@ +package com.epmet.config; + +import org.apache.catalina.connector.Connector; +import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.stereotype.Component; + +import java.util.concurrent.Executor; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +@Component +public class GracefulShutdownTomcat implements TomcatConnectorCustomizer, ApplicationListener { + private volatile Connector connector; + private final int waitTime = 30; + @Override + public void customize(Connector connector) { + this.connector = connector; + } + @Override + public void onApplicationEvent(ContextClosedEvent contextClosedEvent) { + this.connector.pause(); + Executor executor = this.connector.getProtocolHandler().getExecutor(); + if (executor instanceof ThreadPoolExecutor) { + try { + ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor; + threadPoolExecutor.shutdown(); + if (!threadPoolExecutor.awaitTermination(waitTime, TimeUnit.SECONDS)) { + System.out.println("Tomcat thread pool did not shut down gracefully within " + waitTime + " seconds. Proceeding with forceful shutdown"); + } + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + } + } +} \ No newline at end of file From 710708dec7377fca71969253fcf833dae7602ad1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Dec 2020 16:36:44 +0800 Subject: [PATCH 352/589] =?UTF-8?q?screen=5Fcpc=5Fbase=5Fdata=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8E=BB=E9=99=A4dateId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/evaluationindex/screen/ScreenCpcBaseDataDao.java | 3 +-- .../extract/toscreen/impl/PartyBaseInfoServiceImpl.java | 2 +- .../evaluationindex/screen/ScreenCpcBaseDataService.java | 3 +-- .../screen/impl/ScreenCpcBaseDataServiceImpl.java | 5 ++--- .../mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml | 1 - 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java index 716d9b2cfb..f33cd46393 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java @@ -69,12 +69,11 @@ public interface ScreenCpcBaseDataDao extends BaseDao { /** * @Description 删除旧的党员基本信息 * @param customerId - * @param dateId * @param orgIds * @author zxc * @date 2020/9/22 3:28 下午 */ - Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("dateId") String dateId,@Param("orgIds")List orgIds); + Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("orgIds")List orgIds); /** * @Description 查询党员信息【根据agencyId来查】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java index 90ccb5a0ed..05154bb3be 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java @@ -319,7 +319,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { } Integer delNum; do { - delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, dateId, orgIds); + delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId,orgIds); }while (delNum > NumConstant.ZERO); List> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED); partition.forEach(p -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java index 314bd3181a..de2b431ded 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java @@ -43,12 +43,11 @@ public interface ScreenCpcBaseDataService extends BaseService orgIds); + Integer deleteOldPartyBaseInfo(String customerId, List orgIds); /** * @Description 查询党员信息【根据agencyId来查】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java index 7505476087..5c0ec9a676 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java @@ -51,14 +51,13 @@ public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl orgIds) { - return baseDao.deleteOldPartyBaseInfo(customerId, dateId,orgIds); + public Integer deleteOldPartyBaseInfo(String customerId, List orgIds) { + return baseDao.deleteOldPartyBaseInfo(customerId,orgIds); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml index 9de96650b5..e059bc271e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml @@ -187,7 +187,6 @@ delete from screen_cpc_base_data where CUSTOMER_ID = #{customerId} - and DATA_END_TIME = #{dateId} and ( From ed4fac09b061fbcef55329828e758727796e1429 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 22 Dec 2020 15:15:36 +0800 Subject: [PATCH 353/589] =?UTF-8?q?=E5=8E=BB=E6=8E=89gov-voice=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E9=9B=85=E5=85=B3=E9=97=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8common=E4=B8=AD=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/GovVoiceApplication.java | 15 -------- .../epmet/config/GracefulShutdownTomcat.java | 37 ------------------- 2 files changed, 52 deletions(-) delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java index fadb32d058..b42c0088d1 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java @@ -1,14 +1,9 @@ package com.epmet; -import com.epmet.config.GracefulShutdownTomcat; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; /** @@ -20,17 +15,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableFeignClients @EnableAsync public class GovVoiceApplication { - @Autowired - private GracefulShutdownTomcat gracefulShutdownTomcat; - public static void main(String[] args) { SpringApplication.run(GovVoiceApplication.class, args); } - - @Bean - public ServletWebServerFactory servletContainer() { - TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); - tomcat.addConnectorCustomizers(gracefulShutdownTomcat); - return tomcat; - } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java deleted file mode 100644 index 4cc1d8f56a..0000000000 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/GracefulShutdownTomcat.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.epmet.config; - -import org.apache.catalina.connector.Connector; -import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextClosedEvent; -import org.springframework.stereotype.Component; - -import java.util.concurrent.Executor; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -@Component -public class GracefulShutdownTomcat implements TomcatConnectorCustomizer, ApplicationListener { - private volatile Connector connector; - private final int waitTime = 30; - @Override - public void customize(Connector connector) { - this.connector = connector; - } - @Override - public void onApplicationEvent(ContextClosedEvent contextClosedEvent) { - this.connector.pause(); - Executor executor = this.connector.getProtocolHandler().getExecutor(); - if (executor instanceof ThreadPoolExecutor) { - try { - ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor; - threadPoolExecutor.shutdown(); - if (!threadPoolExecutor.awaitTermination(waitTime, TimeUnit.SECONDS)) { - System.out.println("Tomcat thread pool did not shut down gracefully within " + waitTime + " seconds. Proceeding with forceful shutdown"); - } - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } - } - } -} \ No newline at end of file From 1c8e3b720427a18133de5a03b06966042ce91e4f Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 23 Dec 2020 13:25:23 +0800 Subject: [PATCH 354/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/TestController.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java new file mode 100644 index 0000000000..1009352893 --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -0,0 +1,31 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import org.apache.commons.io.FileUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +@RestController +@RequestMapping("test") +public class TestController { + + @PostMapping("local-upload") + public Result localUpload(@RequestPart("file") MultipartFile file) { + + final File tempFile = new File("/opt/upload_files/temp"); + + try(InputStream inputStream = file.getInputStream()) { + FileUtils.copyInputStreamToFile(inputStream, tempFile); + } catch (IOException e) { + e.printStackTrace(); + } + return new Result(); + } +} From 21012be2d4a839aa512d84126a6a9bcaeb13efe2 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 23 Dec 2020 14:11:21 +0800 Subject: [PATCH 355/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/TestController.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java index 1009352893..4df11b32fe 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -1,21 +1,23 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.service.OssService; import org.apache.commons.io.FileUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; @RestController @RequestMapping("test") public class TestController { + @Autowired + private OssService ossService; + @PostMapping("local-upload") public Result localUpload(@RequestPart("file") MultipartFile file) { @@ -28,4 +30,17 @@ public class TestController { } return new Result(); } + + @PostMapping("upload2aliyun") + public Result upload2aliyun() { + try (final FileInputStream fis = new FileInputStream("/opt/upload_files/temp")) { + final MockMultipartFile mockMultipartFile = new MockMultipartFile("temp", fis); + return ossService.uploadImg(mockMultipartFile); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return new Result(); + } } From aaa677c551980a29cc576e38415384bfd6273254 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 23 Dec 2020 14:19:31 +0800 Subject: [PATCH 356/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/TestController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java index 4df11b32fe..8fc2ab2771 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -19,9 +19,9 @@ public class TestController { private OssService ossService; @PostMapping("local-upload") - public Result localUpload(@RequestPart("file") MultipartFile file) { + public Result localUpload(@RequestPart("file") MultipartFile file, @RequestParam("fileName") String fileName) { - final File tempFile = new File("/opt/upload_files/temp"); + final File tempFile = new File("/opt/upload_files/" + fileName); try(InputStream inputStream = file.getInputStream()) { FileUtils.copyInputStreamToFile(inputStream, tempFile); @@ -32,9 +32,9 @@ public class TestController { } @PostMapping("upload2aliyun") - public Result upload2aliyun() { - try (final FileInputStream fis = new FileInputStream("/opt/upload_files/temp")) { - final MockMultipartFile mockMultipartFile = new MockMultipartFile("temp", fis); + public Result upload2aliyun(@RequestParam("fileName") String fileName) { + try (final FileInputStream fis = new FileInputStream("/opt/upload_files/" + fileName)) { + final MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fis); return ossService.uploadImg(mockMultipartFile); } catch (FileNotFoundException e) { e.printStackTrace(); From 67a9316831e7f125a2b23f2f0f7a704804fc2e25 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 30 Dec 2020 14:56:28 +0800 Subject: [PATCH 357/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/impl/TopicShareLinkRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java index 4163761b96..1c76e10cda 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java @@ -233,7 +233,7 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl Date: Mon, 4 Jan 2021 17:35:49 +0800 Subject: [PATCH 358/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java index 8fc2ab2771..8289c4a5bf 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -35,7 +35,7 @@ public class TestController { public Result upload2aliyun(@RequestParam("fileName") String fileName) { try (final FileInputStream fis = new FileInputStream("/opt/upload_files/" + fileName)) { final MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fis); - return ossService.uploadImg(mockMultipartFile); + return ossService.uploadImg(mockMultipartFile, null); } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { From c480dcb0f34b9fa0f9784e5d573175f9a6e023bb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 13 Jan 2021 10:17:42 +0800 Subject: [PATCH 359/589] =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/feign/ResiGroupOpenFeignClient.java | 12 ------ .../ResiGroupOpenFeignClientFallback.java | 6 --- .../service/impl/ResiTopicServiceImpl.java | 37 ------------------- 3 files changed, 55 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index 8c192f6dcf..0d93d8888b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -3,7 +3,6 @@ package com.epmet.resi.group.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO; @@ -15,16 +14,13 @@ import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.result.*; import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; -import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import java.util.HashMap; import java.util.List; -import org.springframework.http.MediaType; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -197,12 +193,4 @@ public interface ResiGroupOpenFeignClient { @PostMapping("resi/group/topic/sendevent") Result sendEvent(@RequestBody TopicEventFormDTO param); - /** - * @Description 发送内容更新类的微信订阅 - * @return void - * @Author liushaowen - * @Date 2021/1/12 11:22 - */ - @PostMapping("resi/group/topic/sendwxmpupdatesubscribe") - void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index edabc5fa5b..3b0a14800e 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -138,10 +138,4 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param); } - - @Override - public void sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO fromDTO) { - - } - } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 3852939f4a..e50d1cec1c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1973,43 +1973,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl list = resiTopicAttachmentDao.selectTopicAttachmentList(formDTO.getTopicId()); - if(list.size() docList = new LinkedList<>(); - LinkedList voiceList = new LinkedList<>(); - LinkedList videoList = new LinkedList<>(); - list.forEach(l->{ - TopicFileResultDTO dto = new TopicFileResultDTO(); - dto.setUrl(l.getAttachmentUrl()); - dto.setDuration(l.getDuration()); - if(TopicConstant.FILE_DOC.equals(l.getAttachmentType())){ - docList.add(dto); - } - if(TopicConstant.FILE_VOICE.equals(l.getAttachmentType())){ - voiceList.add(dto); - } - if(TopicConstant.FILE_VIDEO.equals(l.getAttachmentType())){ - videoList.add(dto); - } - }); - resultDTO.setDocList(docList); - resultDTO.setVoiceList(voiceList); - resultDTO.setVideoList(videoList); - return resultDTO; - } /** * @Description 根据事件枚举发送积分事件 From f0aed8ef4c91c3bcaeb098b132ace91395f2193a Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 21 Jan 2021 15:52:22 +0800 Subject: [PATCH 360/589] =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java | 2 +- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ec6d1eb485..98c23d744a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -210,7 +210,7 @@ public class UserBaseInfoRedis { //此时orientCache中包概括要更新的属性以及之前有切不更新的属性 currentCache = orientCache; } - RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId()); + RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId()); //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士) if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ currentCache.setCustomerId(relation.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 9c973e7b78..e5e7678835 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -271,10 +271,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 25 Feb 2021 17:18:48 +0800 Subject: [PATCH 361/589] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=B8=8D=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java index 8f8e59cd11..a6d7e065dd 100644 --- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java +++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java @@ -104,7 +104,7 @@ public class JcetApiService extends AbstractApiService { * @return * @throws UnsupportedEncodingException */ - private Map getHeaders(Object contentObject, String appKey, String appSecret) throws UnsupportedEncodingException { + private Map getHeaders(Object contentObject, String appKey, String appSecret) throws UnsupportedEncodingException { int bodyLength = JSON.toJSONString(contentObject).getBytes(StandardCharsets.UTF_8).length; Map headers = new HashMap(); From 56b90275b7a32c01f28c17df8c98caee395d31b1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Feb 2021 11:11:07 +0800 Subject: [PATCH 362/589] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/SsoService.java | 1 + .../com/epmet/service/impl/SsoServiceImpl.java | 2 +- .../thirdplat/apiservice/jcet/JcetApiService.java | 3 +-- .../thirdplat/apiservice/pyld/PyldApiService.java | 14 +++++++++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/SsoService.java b/epmet-auth/src/main/java/com/epmet/service/SsoService.java index d7aad9866c..65b3192c73 100644 --- a/epmet-auth/src/main/java/com/epmet/service/SsoService.java +++ b/epmet-auth/src/main/java/com/epmet/service/SsoService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.dto.form.SsoEnteOrgFormDTO; import com.epmet.dto.form.SsoLoginFormDTO; import com.epmet.dto.form.SsoLoginOperFormDTO; +import com.epmet.dto.form.SsoWorkLoginFormDTO; import com.epmet.dto.result.SsoLoginResultDTO; import com.epmet.dto.result.UserTokenResultDTO; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java index 738155d661..a3183f0c21 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java @@ -140,7 +140,7 @@ public class SsoServiceImpl implements SsoService { ThirdPlatformEnum platformEnum = ThirdPlatformEnum.getEnum(formDTO.getPlatform()); String apiService = platformEnum.getApiService(); AbstractApiService apiServiceImpl = (AbstractApiService) SpringContextUtils.getBean(apiService); - thirdUser = apiServiceImpl.getUserInfoByTicket(formDTO.getThirdToken()); + thirdUser = apiServiceImpl.getCUserInfoByTicket(formDTO.getThirdToken()); } catch (RenException e) { throw new RenException(e.getCode(), e.getMessage()); } catch (Exception e) { diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java index f3f77984c6..52e770b051 100644 --- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java +++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java @@ -17,7 +17,6 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -138,7 +137,7 @@ public class JcetApiService extends AbstractApiService { */ private Map getHeaders(int bodyLength, String appKey, String appSecret) throws UnsupportedEncodingException { - Map headers = new HashMap(); + Map headers = new HashMap(); long timestamp = System.currentTimeMillis(); headers.put(JcetConstants.PLAT_HEADER_OPEN_TIMESTAMP, timestamp); headers.put(JcetConstants.PLAT_HEADER_OPEN_APP_ID, appKey); diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java index 958fd8b1bb..3201ce1960 100644 --- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java +++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java @@ -47,7 +47,7 @@ public class PyldApiService extends AbstractApiService { * @date 2021.01.19 10:26 */ @Override - public ThirdPlatUserInfo getUserInfoByTicket(String platformToken) { + public ThirdPlatUserInfo getCUserInfoByTicket(String platformToken) { logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>"); logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口入参 platformToken:{}", platformToken); @@ -75,6 +75,18 @@ public class PyldApiService extends AbstractApiService { } + /** + * G端用户token获取用户信息 + * + * @param token + * @return + * @throws Exception + */ + @Override + public ThirdPlatUserInfo getGUserInfoBySSOToken(String token) throws Exception { + return null; + } + /** * 构建请求头信息 * From 8deb6a14fea8fcd6cc0a41471e1c6845ce9762f1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 1 Mar 2021 12:21:43 +0800 Subject: [PATCH 363/589] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/ResiTopicService.java | 8 --- .../service/impl/ResiTopicServiceImpl.java | 54 ------------------- 2 files changed, 62 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index bd0ee09762..822b4c631a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -352,14 +352,6 @@ public interface ResiTopicService extends BaseService { */ void sendWxmpUpdateSubscribe(TokenDto tokenDto, String id, String type); - /** - * @Description 根据事件枚举发送积分事件 - * @param param - * @return void - * @author wangc - * @date 2021.01.04 16:41 - */ - void sendTopicPointEventByEventType(TopicEventFormDTO param); ResiTopicDTO queryTopicInfoByIssueId(String issueId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 19268d3411..4f0190f4ab 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2176,60 +2176,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); - //话题被转为项目 话题作者 - - BasePointEventMsg pointEventMsg = new BasePointEventMsg(); - pointEventMsg.setCustomerId(group.getCustomerId()); - pointEventMsg.setUserId(topic.getCreatedBy()); - pointEventMsg.setActionFlag(MqConstant.PLUS); - pointEventMsg.setIsCommon(false); - pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_PROJECT.getEventTag()); - //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题 - String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent()); - pointEventMsg.setRemark(new StringBuilder(group.getGroupName()).append("小组中发布的") - .append( - StringUtils.isBlank(content) || - StringUtils.equals("语音话题",content) ? "语音话题" : - "话题\"" + - content - .substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN) - + (NumConstant.TEN > content.length() ? "\"" : "…\"") - ).append("被转为项目").toString()); - pointEventMsgList.add(pointEventMsg); - mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); - if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ - log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(param)); - } - } - } @Override public ResiTopicDTO queryTopicInfoByIssueId(String issueId) { From 2fcc48e21d775c5667ae3d4df7da18a9dbb962aa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 1 Mar 2021 19:14:24 +0800 Subject: [PATCH 364/589] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?= =?UTF-8?q?=E3=80=81=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BA=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ScreenWorkRecordOrgDailyServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java index 60cd057d9c..0474d32f2e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java @@ -134,6 +134,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl customerIds=new ArrayList<>(); Result> result=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId()); + // log.info("result: "+JSON.toJSONString(result)); if (result.success() && CollectionUtils.isNotEmpty(result.getData())) { customerIds.addAll(result.getData()); } @@ -144,23 +145,24 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl currentAgency = baseDao.selectCurrentAgency(formDTO.getAgencyId(), formDTO.getDataType(), formDTO.getCustomerId(), dateId); //下级所有组织 - List subAgencyRankList = baseDao.selectSubList( - CollectionUtils.isNotEmpty(agencyInfoDTO.getSubAgencyIds()) ? agencyInfoDTO.getSubAgencyIds() : new ArrayList<>(), + List subAgencyRankList = CollectionUtils.isNotEmpty(agencyInfoDTO.getSubAgencyIds()) ? baseDao.selectSubList( + agencyInfoDTO.getSubAgencyIds(), formDTO.getDataType(), formDTO.getCustomerId(), - dateId); + dateId) : new ArrayList<>(); //直属网格 - List subGridList = baseDao.selectSubGridList( - CollectionUtils.isNotEmpty(agencyInfoDTO.getSubGridIds()) ? agencyInfoDTO.getSubGridIds() : new ArrayList<>(), + List subGridList = CollectionUtils.isNotEmpty(agencyInfoDTO.getSubGridIds()) ? baseDao.selectSubGridList( + agencyInfoDTO.getSubGridIds(), formDTO.getDataType(), formDTO.getCustomerId(), - dateId); + dateId) : new ArrayList<>(); returnDto.getSubRankList().addAll(subAgencyRankList); returnDto.getSubRankList().addAll(subGridList); From a6cb06aae6967d64c4af561d70d354ff047bf64a Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 3 Mar 2021 18:36:09 +0800 Subject: [PATCH 365/589] =?UTF-8?q?=E6=AF=8F=E5=B0=8F=E6=97=B6=E5=B0=86?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=A1=A8=E5=86=B3=E6=95=B0=E5=AD=97=E4=BB=8E?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=90=8C=E6=AD=A5=E5=88=B0db=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/IssueVoteDetailDao.java | 10 +++++ .../com/epmet/redis/IssueVoteDetailRedis.java | 24 +++++++++++ .../impl/IssueVoteStatisticalServiceImpl.java | 43 ++++++++----------- .../resources/mapper/IssueVoteDetailDao.xml | 14 ++++++ 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java index 622a68e6cd..af596a22a7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java @@ -20,6 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IssueVoteDetailDTO; import com.epmet.dto.form.VoteFormDTO; +import com.epmet.dto.form.VoteRedisFormDTO; import com.epmet.dto.result.IssueAttitudeCountResultDTO; import com.epmet.dto.result.MyPartIssuesResultDTO; import com.epmet.entity.IssueVoteDetailEntity; @@ -95,4 +96,13 @@ public interface IssueVoteDetailDao extends BaseDao { * @Date 2020/11/18 14:35 **/ IssueVoteDetailDTO selectUserIssueDet(@Param("userId") String userId, @Param("issueId") String issueId); + + /** + * @Description 统计出一个议题的所有支持数和反对数 + * @param issueId + * @return com.epmet.dto.form.VoteRedisFormDTO + * @author wangc + * @date 2021.03.03 18:09 + */ + VoteRedisFormDTO selectInfo4Cache( @Param("issueId") String issueId); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java index 268ddfbf88..41b0c4c6d2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java @@ -29,14 +29,20 @@ import com.epmet.feign.ResiGroupFeignClient; import com.epmet.service.IssueService; import com.epmet.service.IssueVoteDetailService; import com.epmet.utils.ModuleConstants; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import java.lang.reflect.Field; +import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE; @@ -59,6 +65,9 @@ public class IssueVoteDetailRedis { @Autowired private IssueService issueService; + @Autowired + private RedisTemplate redisTemplate; + @Autowired private IssueVoteDetailService issueVoteDetailService; @@ -66,7 +75,22 @@ public class IssueVoteDetailRedis { } + public void deleteBatch(List issueIds){ + if(CollectionUtils.isEmpty(issueIds)) return ; + Set keys = issueIds.stream().map(id -> { + return IssueConstant.REDIS_KEY + id; + }).collect(Collectors.toSet()); + + redisTemplate.executePipelined((RedisCallback) connection ->{ + keys.forEach( ser -> {connection.del(redisTemplate.getKeySerializer().serialize(ser));}); + return null; + }); + } + + public void delete(String issueId){ + redisUtils.delete(IssueConstant.REDIS_KEY +issueId); + } public void set(VoteRedisFormDTO vote){ String key = IssueConstant.REDIS_KEY +vote.getIssueId(); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index fc8a5138de..6597ac6578 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -267,7 +267,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet()); - List gridIds = issues.stream().map(IssueDTO::getGridId).collect(Collectors.toList()); + List gridIds = issues.stream().map(IssueDTO::getGridId).distinct().collect(Collectors.toList()); CommonGridIdListFormDTO gridIdList = new CommonGridIdListFormDTO(); gridIdList.setGridIds(gridIds); Result votableCountResult = resiGroupFeignClient.votableCounts(gridIdList); @@ -287,9 +287,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl existedIds = new HashSet<>(); - existedIds.addAll(ids); - existedIds.retainAll(statisiticalIds); + Set existedIds = new HashSet<>(statisiticalIds); + //更新 //对ids进行更新 - 从缓存中拿取 List listToUpdate = new ArrayList<>(); @@ -304,8 +303,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl NumConstant.ZERO) { //新增 List toInsert = new ArrayList<>(); - - List summaryList = issueVoteDetailDao.getVotingSummaryList(ids); + Map issueGridMap = issues.stream().collect(Collectors.toMap(IssueDTO::getId,IssueDTO::getGridId,(o, n) -> o)); + List summaryList = issueVoteDetailDao.getVotingSummaryList(notExistedIds); Map> summaryMap = summaryList.stream().collect(Collectors.groupingBy(IssueAttitudeCountResultDTO::getIssueId)); for (Map.Entry> entry : summaryMap.entrySet()) { @@ -322,19 +321,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl setToInsert = toInsert.stream().map(IssueVoteStatisticalDTO::getIssueId).collect(Collectors.toSet()); + /* Set setToInsert = toInsert.stream().map(IssueVoteStatisticalDTO::getIssueId).collect(Collectors.toSet()); Set issuesNeverVotedIds = new HashSet(); issuesNeverVotedIds.addAll(ids); @@ -372,30 +367,27 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl redundantIds = new HashSet(); - redundantIds.addAll(statisiticalIds); - redundantIds.removeAll(ids); + //Set redundantIds = new HashSet(); + //redundantIds.addAll(statisiticalIds); + //redundantIds.removeAll(ids); //将redundantIds的议题统计信息删除 //因为statisiticalIds是通过ids查询出，因此不会出现这种情况 } else { //数据吻合，全部更新 List listToUpdate = new ArrayList<>(); - Map> gridIssueMap = - issues.stream().collect(Collectors.groupingBy(IssueDTO::getGridId)); - setVotableCountsAndUpdateCache(listToUpdate,issues,votableCountMap); // listToUpdate批量更新 @@ -517,9 +509,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl + + \ No newline at end of file From afbc9e0a9dc3969ca104d1bb92ed82b18db1b742 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 3 Mar 2021 18:37:00 +0800 Subject: [PATCH 366/589] =?UTF-8?q?=E6=AF=8F=E5=B0=8F=E6=97=B6=E5=B0=86?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=A1=A8=E5=86=B3=E6=95=B0=E5=AD=97=E4=BB=8E?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=90=8C=E6=AD=A5=E5=88=B0db=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BB=BB=E5=8A=A1=E5=8A=A0=E4=B8=8A=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 6597ac6578..417ad90a75 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -256,6 +256,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl Date: Mon, 8 Mar 2021 18:31:41 +0800 Subject: [PATCH 367/589] =?UTF-8?q?Revert=20"=E5=89=8D=E7=AB=AF=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=8A=A0=E5=AF=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 607e6a1e --- .../epmet/controller/GovWebController.java | 32 +-- epmet-auth/src/main/resources/bootstrap.yml | 21 +- .../commons/tools/utils/RSASignature.java | 251 ------------------ .../scan/common/util/RSASignature.java | 152 +++++++++++ 4 files changed, 158 insertions(+), 298 deletions(-) delete mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/RSASignature.java create mode 100644 epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java index d0afcf3c32..e096c6a65a 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java @@ -1,22 +1,19 @@ package com.epmet.controller; -import com.epmet.commons.tools.utils.RSASignature; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.GovWebLoginFormDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.GovWebService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - /** - * @author sun * @Description PC工作端-登陆服务 + * @author sun */ @RestController @RequestMapping("govweb") @@ -24,10 +21,7 @@ public class GovWebController { @Autowired private GovWebService govWebService; - @Value("${epmet.login.publicKey}") - private String publicKey; - @Value("${epmet.login.privateKey}") - private String privateKey; + /** * @param formDTO @@ -38,30 +32,8 @@ public class GovWebController { @PostMapping("login") public Result workLogin(@RequestBody GovWebLoginFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - - try { - if (formDTO.getPassword().length() > 50) { - String newPassword = RSASignature.decryptByPrivateKey(formDTO.getPassword(), privateKey); - formDTO.setPassword(newPassword); - } - - } catch (Exception e) { - e.printStackTrace(); - } return new Result().ok(govWebService.login(formDTO)); } - /** - * desc: 获取前端密码加密 公钥 - * - * @return com.epmet.commons.tools.utils.Result - * @author LiuJanJun - * @date 2021/3/8 5:07 下午 - */ - @PostMapping("getKey") - public Result getResiWxPhone() { - return new Result().ok(publicKey); - } - } diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index ce7eb5edd5..25b9a31702 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -136,25 +136,12 @@ shutdown: # 调用第三方平台相关参数 thirdplat: - jcetCend: - domain: @thirdplat.jcet.c.domain@ - appkey: @thirdplat.jcet.c.appkey@ - appsecret: @thirdplat.jcet.c.appsecret@ - jcetGend: - domain: @thirdplat.jcet.g.domain@ - appkey: @thirdplat.jcet.g.appkey@ - appsecret: @thirdplat.jcet.g.appsecret@ + jcet: + domain: @thirdplat.jcet.domain@ + appkey: @thirdplat.jcet.appkey@ + appsecret: @thirdplat.jcet.appsecret@ pyld: domain: https://epmet-ext9.elinkservice.cn/platform appId: 7a5aec009ba4eba8e254ee64fe3775e1 appKey: 14faef9af508d1c253b720ea5a43f9de appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595 - -epmet: - login: - publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKjgDaHWqWgquoatbC4zzQCgqE8C425VIOyzJVVgH1HUYCHpuNUnGCv3HBAl2RsziWQqQgd1xxl0C3a5J4J69o8CAwEAAQ== - privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAqOANodapaCq6hq1sLjPNAKCoTwLjblUg7LMlVWAfUdRgIem41ScYK/ccECXZGzOJZCpCB3XHGXQLdrkngnr2jwIDAQABAkAyYaWvgrtHuHetdk+v+QRQC54q9FGluP/5nfilX+f4IUf8j92o/ZohTtmJn9qcDiAP4wxCLIsfy4IW3psST78BAiEA0A/E0WvtI7spWnjfw+wMDhdVMIbIJvDbj/cqMwRZInUCIQDPyO2sbXpwDjmAvyn0jpGJJxU5POWYdI37rTf9fScMcwIhAMkWNHbjBHKANVuHb10ACjakPmWEHnXkW5AspdBg53TxAiARPbzq99KXBbcjxbj3f/T3inSqYTEz60f0wDTLJd1dnQIhAIFe6Jd1TduIxGk1PDh/b/3q0jNGgVXkFnUBnKWDaL9N - # third服务的相关配置 - third: - urlPrefix: @epmet.third.urlprefix@ - diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/RSASignature.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/RSASignature.java deleted file mode 100644 index ac051e7093..0000000000 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/RSASignature.java +++ /dev/null @@ -1,251 +0,0 @@ -package com.epmet.commons.tools.utils; - -import javax.crypto.Cipher; -import java.security.*; -import java.security.spec.PKCS8EncodedKeySpec; -import java.security.spec.X509EncodedKeySpec; -import java.util.Base64; - -/** - * @author jianjun liu - * @date 2020-06-05 16:48 - **/ - -public class RSASignature { - - - //非对称密钥算法 - private static final String KEY_ALGORITHM = "RSA"; - //密钥长度，在512到65536位之间，建议不要太长，否则速度很慢，生成的加密数据很长 - private static final int KEY_SIZE = 512; - //字符编码 - private static final String CHARSET = "UTF-8"; - - /** - * 生成密钥对 - * - * @return KeyPair 密钥对 - */ - public static KeyPair getKeyPair() throws Exception { - return getKeyPair(null); - } - - /** - * 生成密钥对 - * - * @param password 生成密钥对的密码 - * @return - * @throws Exception - */ - public static KeyPair getKeyPair(String password) throws Exception { - //实例化密钥生成器 - KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_ALGORITHM); - //初始化密钥生成器 - if (password == null) { - keyPairGenerator.initialize(KEY_SIZE); - } else { - SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG"); - secureRandom.setSeed(password.getBytes(CHARSET)); - keyPairGenerator.initialize(KEY_SIZE, secureRandom); - } - //生成密钥对 - return keyPairGenerator.generateKeyPair(); - } - - /** - * 取得私钥 - * - * @param keyPair 密钥对 - * @return byte[] 私钥 - */ - public static byte[] getPrivateKeyBytes(KeyPair keyPair) { - return keyPair.getPrivate().getEncoded(); - } - - /** - * 取得Base64编码的私钥 - * - * @param keyPair 密钥对 - * @return String Base64编码的私钥 - */ - public static String getPrivateKey(KeyPair keyPair) { - return Base64.getEncoder().encodeToString(getPrivateKeyBytes(keyPair)); - } - - /** - * 取得公钥 - * - * @param keyPair 密钥对 - * @return byte[] 公钥 - */ - public static byte[] getPublicKeyBytes(KeyPair keyPair) { - return keyPair.getPublic().getEncoded(); - } - - /** - * 取得Base64编码的公钥 - * - * @param keyPair 密钥对 - * @return String Base64编码的公钥 - */ - public static String getPublicKey(KeyPair keyPair) { - return Base64.getEncoder().encodeToString(getPublicKeyBytes(keyPair)); - } - - /** - * 私钥加密 - * - * @param data 待加密数据 - * @param privateKey 私钥字节数组 - * @return byte[] 加密数据 - */ - public static byte[] encryptByPrivateKey(byte[] data, byte[] privateKey) throws Exception { - //实例化密钥工厂 - KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); - //生成私钥 - PrivateKey key = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKey)); - //数据加密 - Cipher cipher = Cipher.getInstance(KEY_ALGORITHM); - cipher.init(Cipher.ENCRYPT_MODE, key); - return cipher.doFinal(data); - } - - /** - * 私钥加密 - * - * @param data 待加密数据 - * @param privateKey Base64编码的私钥 - * @return String Base64编码的加密数据 - */ - public static String encryptByPrivateKey(String data, String privateKey) throws Exception { - byte[] key = Base64.getDecoder().decode(privateKey); - return Base64.getEncoder().encodeToString(encryptByPrivateKey(data.getBytes(CHARSET), key)); - } - - /** - * 公钥加密 - * - * @param data 待加密数据 - * @param publicKey 公钥字节数组 - * @return byte[] 加密数据 - */ - public static byte[] encryptByPublicKey(byte[] data, byte[] publicKey) throws Exception { - //实例化密钥工厂 - KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); - //生成公钥 - PublicKey key = keyFactory.generatePublic(new X509EncodedKeySpec(publicKey)); - //数据加密 - Cipher cipher = Cipher.getInstance(KEY_ALGORITHM); - cipher.init(Cipher.ENCRYPT_MODE, key); - return cipher.doFinal(data); - } - - /** - * 公钥加密 - * - * @param data 待加密数据 - * @param publicKey Base64编码的公钥 - * @return String Base64编码的加密数据 - */ - public static String encryptByPublicKey(String data, String publicKey) throws Exception { - byte[] key = Base64.getDecoder().decode(publicKey); - return Base64.getEncoder().encodeToString(encryptByPublicKey(data.getBytes(CHARSET), key)); - } - - /** - * 私钥解密 - * - * @param data 待解密数据 - * @param privateKey 私钥字节数组 - * @return byte[] 解密数据 - */ - public static byte[] decryptByPrivateKey(byte[] data, byte[] privateKey) throws Exception { - //实例化密钥工厂 - KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); - //生成私钥 - PrivateKey key = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKey)); - //数据解密 - Cipher cipher = Cipher.getInstance(KEY_ALGORITHM); - cipher.init(Cipher.DECRYPT_MODE, key); - return cipher.doFinal(data); - } - - /** - * 私钥解密 - * - * @param data Base64编码的待解密数据 - * @param privateKey Base64编码的私钥 - * @return String 解密数据 - */ - public static String decryptByPrivateKey(String data, String privateKey) throws Exception { - byte[] key = Base64.getDecoder().decode(privateKey); - return new String(decryptByPrivateKey(Base64.getDecoder().decode(data), key), CHARSET); - } - - /** - * 公钥解密 - * - * @param data 待解密数据 - * @param publicKey 公钥字节数组 - * @return byte[] 解密数据 - */ - public static byte[] decryptByPublicKey(byte[] data, byte[] publicKey) throws Exception { - //实例化密钥工厂 - KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); - //产生公钥 - PublicKey key = keyFactory.generatePublic(new X509EncodedKeySpec(publicKey)); - //数据解密 - Cipher cipher = Cipher.getInstance(KEY_ALGORITHM); - cipher.init(Cipher.DECRYPT_MODE, key); - return cipher.doFinal(data); - } - - /** - * 公钥解密 - * - * @param data Base64编码的待解密数据 - * @param publicKey Base64编码的公钥 - * @return String 解密数据 - */ - public static String decryptByPublicKey(String data, String publicKey) throws Exception { - byte[] key = Base64.getDecoder().decode(publicKey); - return new String(decryptByPublicKey(Base64.getDecoder().decode(data), key), CHARSET); - } - - /** - * 测试加解密方法 - * - * @param args - * @throws Exception - */ - public static void main(String[] args) throws Exception { - //生成密钥对，一般生成之后可以放到配置文件中 - KeyPair keyPair = RSASignature.getKeyPair(); - //公钥 - String publicKey = RSASignature.getPublicKey(keyPair); - //私钥 - String privateKey = RSASignature.getPrivateKey(keyPair); - - System.out.println("公钥：\n" + publicKey); - System.out.println("私钥：\n" + privateKey); - - String data = "RSA 加解密测试!"; - { - System.out.println("\n===========私钥加密，公钥解密=============="); - String s1 = RSASignature.encryptByPrivateKey(data, privateKey); - System.out.println("加密后的数据:" + s1); - String s2 = RSASignature.decryptByPublicKey(s1, publicKey); - System.out.println("解密后的数据:" + s2 + "\n\n"); - } - - { - System.out.println("\n===========公钥加密，私钥解密=============="); - String s1 = RSASignature.encryptByPublicKey(data, publicKey); - System.out.println("加密后的数据:" + s1); - String s2 = RSASignature.decryptByPrivateKey(s1, privateKey); - System.out.println("解密后的数据:" + s2 + "\n\n"); - } - - } - -} diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java new file mode 100644 index 0000000000..4b45f8ce2e --- /dev/null +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java @@ -0,0 +1,152 @@ +package com.epmet.openapi.scan.common.util; + +import org.apache.commons.codec.binary.Base64; +import org.bouncycastle.util.encoders.UrlBase64; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.crypto.Cipher; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.security.KeyFactory; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Signature; +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; + +/** + * @author jianjun liu + * @date 2020-06-05 16:48 + **/ + +public class RSASignature { + private static final Logger LOGGER = LoggerFactory.getLogger(RSASignature.class); + public static final String KEY_ALGORITHM = "RSA"; + public static final String SIGNATURE_ALGORITHM = "SHA1WithRSA"; + public static final String ENCODING = "utf-8"; + public static final String X509 = "X.509"; + + /** + * 获取私钥 + * + * @param key + * @return + * @throws Exception + */ + public static PrivateKey getPrivateKey(String key) throws Exception { + byte[] keyBytes = Base64.decodeBase64(key.getBytes(ENCODING)); + PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + PrivateKey privateKey = keyFactory.generatePrivate(keySpec); + return privateKey; + } + + /** + * 获取公钥 + * + * @param key + * @return + * @throws Exception + */ + public static PublicKey getPublicKey(String key) throws Exception { + byte[] keyBytes = Base64.decodeBase64(key.getBytes(ENCODING)); + CertificateFactory certificateFactory = CertificateFactory.getInstance(X509); + InputStream in = new ByteArrayInputStream(keyBytes); + Certificate certificate = certificateFactory.generateCertificate(in); + PublicKey publicKey = certificate.getPublicKey(); + return publicKey; + } + + /** + * 使用公钥对明文进行加密，返回BASE64编码的字符串 + * + * @param publicKey + * @param plainText + * @return + */ + public static String encrypt(String publicKey, String plainText) { + try { + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + byte[] encodedKey = Base64.decodeBase64(publicKey.getBytes(ENCODING)); + PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey)); + Cipher cipher = Cipher.getInstance(KEY_ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, pubKey); + byte[] enBytes = cipher.doFinal(plainText.getBytes()); + return new String(Base64.encodeBase64(enBytes)); + } catch (Exception e) { + LOGGER.error("rsa encrypt exception: {}", e.getMessage(), e); + } + return null; + } + + /** + * 使用私钥对明文密文进行解密 + * + * @param privateKey + * @param enStr + * @return + */ + public static String decrypt(String privateKey, String enStr) { + try { + PrivateKey priKey = getPrivateKey(privateKey); + Cipher cipher = Cipher.getInstance(KEY_ALGORITHM); + cipher.init(Cipher.DECRYPT_MODE, priKey); + byte[] deBytes = cipher.doFinal(Base64.decodeBase64(enStr)); + return new String(deBytes); + } catch (Exception e) { + LOGGER.error("rsa decrypt exception: {}", e.getMessage(), e); + } + return null; + } + + /** + * RSA私钥签名 + * + * @param content 待签名数据 + * @param privateKey 私钥 + * @return 签名值 + */ + public static String signByPrivateKey(String content, String privateKey) { + try { + PrivateKey priKey = getPrivateKey(privateKey); + Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM); + signature.initSign(priKey); + signature.update(content.getBytes(ENCODING)); + byte[] signed = signature.sign(); + return new String(UrlBase64.encode(signed), ENCODING); + } catch (Exception e) { + LOGGER.error("sign error, content: {}", content, e); + } + return null; + } + + /** + * 公钥验签 + * + * @param content + * @param sign + * @param publicKey + * @return + */ + public static boolean verifySignByPublicKey(String content, String sign, String publicKey) { + try { + KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM); + byte[] encodedKey = Base64.decodeBase64(publicKey.getBytes(ENCODING)); + PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey)); + + Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM); + signature.initVerify(pubKey); + signature.update(content.getBytes(ENCODING)); + + return signature.verify(UrlBase64.decode(sign.getBytes(ENCODING))); + + } catch (Exception e) { + LOGGER.error("verify sign error, content: {}, sign: {}", content, sign, e); + } + return false; + } + +} From a37bf1029275ec3d4fa6098d715f8e1606d03e80 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 11 Mar 2021 13:53:01 +0800 Subject: [PATCH 368/589] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=92=8C=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E7=99=BB=E9=99=86=E7=9A=84=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/LoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index 27f7e71fe5..569ef87c85 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -295,7 +295,7 @@ public class LoginServiceImpl implements LoginService { if (!flag) { logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone())); //2020-05-21去除验证码校验 - return new Result().error(EpmetErrorCode.ERR10019.getCode()); + //return new Result().error(EpmetErrorCode.ERR10019.getCode()); } //2、账号是否存在 //获取用户信息 From d6159da68247f94a361557a2f920960912205c28 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 16 Mar 2021 13:49:59 +0800 Subject: [PATCH 369/589] merge --- .../evaluationindex/screen/ScreenProjectDataService.java | 3 +-- .../screen/impl/ScreenProjectDataServiceImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java index 4dde9178e6..b6f2c25c15 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java @@ -95,7 +95,7 @@ public interface ScreenProjectDataService extends BaseService param); + void collect(ScreenCollFormDTO param); /** @@ -124,5 +124,4 @@ public interface ScreenProjectDataService extends BaseService meta,List orient); - void collect(ScreenCollFormDTO param); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java index e55e84b1fb..501bfa2c43 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; 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.constant.DataSourceConstant; @@ -29,12 +30,10 @@ import com.epmet.dao.evaluationindex.screen.*; import com.epmet.dto.screen.ScreenProjectDataDTO; import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO; import com.epmet.dto.screencoll.ScreenCollFormDTO; -import com.epmet.entity.evaluationindex.screen.*; -import com.epmet.service.evaluationindex.screen.*; -import org.apache.commons.collections4.ListUtils; import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity; import com.epmet.entity.evaluationindex.screen.ScreenProjectImgDataEntity; import com.epmet.service.evaluationindex.screen.ScreenProjectDataService; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; From a43dec39d7e8e665003d40c6dafcab90610301d8 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 20 Mar 2021 01:56:40 +0800 Subject: [PATCH 370/589] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/redis/IssueProjectTagDictRedis.java | 12 ++++++++++++ .../epmet/service/impl/ProjectTagsServiceImpl.java | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java index 7e4d3b456a..dac93747f7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java @@ -358,6 +358,18 @@ public class IssueProjectTagDictRedis { redisUtils.zSetAdd(key,o); } + /** + * @Description 给客户下的分类/标签批量增加/减少热度 + * param : + * key : 0 代表减一 1 代表加一 + * value : + * key : 某一客户下分类/标签的redisKey + * value : 需要修改的分类/标签 + * @param param + * @return void + * @author wangc + * @date 2021.03.20 01:04 + */ public void batchIncrScore(Map>> param){ if(CollectionUtils.isEmpty(param)) return; redisTemplate.executePipelined((RedisCallback) connection -> { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java index 4154c9bd24..87edc5e00b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -142,8 +143,9 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl replaceNews = new LinkedList<>(newIds); differentSet.setPlus(newIds.removeAll(orientIds) ? newIds : null); - differentSet.setMinus(orientIds.removeAll(newIds) ? orientIds : null); + differentSet.setMinus(orientIds.removeAll(replaceNews) ? orientIds : null); } Result result = issueClient.updateCitations(differentSet); if(!result.success()) throw new RenException(result.getInternalMsg()); From f8bec68b4e10b255b85423e02a57d24fa48070ea Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 20 Mar 2021 02:16:17 +0800 Subject: [PATCH 371/589] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java index dac93747f7..997dfc8451 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java @@ -98,6 +98,7 @@ public class IssueProjectTagDictRedis { } IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null); + //是否传入的类别Id中只包含"其他"分类，因为自定义分类和默认分类排序规则不一样 boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false); Map> result = new HashMap<>(); From 8ed45e0ed0714f111729158f43ae73a9f3771bc1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 20 Mar 2021 02:38:36 +0800 Subject: [PATCH 372/589] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/redis/IssueProjectTagDictRedis.java | 7 +++---- .../java/com/epmet/controller/ProjectTagsController.java | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java index 997dfc8451..0be8c5106d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java @@ -128,10 +128,9 @@ public class IssueProjectTagDictRedis { result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult); } - //默认、自定义标签，只要有一个是空就触发补偿 + //查询结果是空就触发补偿 //不信任缓存数据 - if(!CollectionUtils.isEmpty(result) && !CollectionUtils.isEmpty(result.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME)) - && !CollectionUtils.isEmpty(result.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))) + if(!CollectionUtils.isEmpty(result)) return result; @@ -155,7 +154,7 @@ public class IssueProjectTagDictRedis { * @Description FIXME 该方法保留，默认查询缓存，默认和自定义两种标签均按热度排序 * FIXME 如果缓存中没有相关数据，则进行补偿，返回的数据为：1、默认标签(分类排序) 2、自定义标签(热度排序) * FIXME 补偿机制均是在缓存中存储热度得分，因此在业务改变之前不要调用该方法 - * category为空，则补偿全部，返回默认标签和自定义标签 + * category为空，返回默认标签和自定义标签 * category仅包含"其他"这个分类的Id时，同上 * category不为空且不只有"其他"这个分类的Id时，则返回集合中的类别标签以及自定义标签 * 默认标签不按照热度排序，自定义标签按照热度排序 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java index 80fad9fab5..870c50be7d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java @@ -64,6 +64,14 @@ public class ProjectTagsController { return new Result().ok(data); } + /** + * @Description 保存项目与标签的关联并更新标签热度 + * @param dto + * @param token + * @return com.epmet.commons.tools.utils.Result + * @author wangc + * @date 2021.03.20 02:34 + */ @PostMapping("save") public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){ dto.setCustomerId(token.getCustomerId()); From 41e37f6a69aedd52ddcd84657558c23c35948c5a Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 22 Mar 2021 08:59:35 +0800 Subject: [PATCH 373/589] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=9F=A5=E8=AF=A2=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E9=A1=B9=E7=9B=AE=E5=8D=8F=E5=8A=A9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/ThirdOpenFeignClient.java | 11 +++++ .../ThirdOpenFeignClientFallback.java | 6 +++ .../controller/ThirdPlatformController.java | 2 +- .../dto/form/ThirdPlatformConfigFormDTO.java | 9 +++- .../result/ThirdPlatformConfigResultDTO.java | 21 +++++++++ .../CustomerProjectParameterController.java | 22 +++++++++- .../CustomerProjectParameterService.java | 3 ++ .../CustomerProjectParameterServiceImpl.java | 44 ++++++++++++++++++- 8 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java index 2459873c91..144000cc8a 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.ThirdPlatformFormDTO; +import com.epmet.dto.result.ThirdplatformResultDTO; import com.epmet.feign.fallback.ThirdOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -23,4 +24,14 @@ public interface ThirdOpenFeignClient { @PostMapping("/third/thirdplatform/customer/saveorupdate-selected-platforms") Result saveOrUpdateSelectedPlatformsInfo(@RequestBody List input); + /** + * 根据客户id和动作，列出客户在指定动作下可用的第三方平台 + * 用途：工作端，运营端配置界面 + * + * @param input + * @return + */ + @PostMapping("/third/thirdplatform/customer/list-available-platforms-by-action") + Result> listAvailablePlatformsByCustomerAndAction(@RequestBody ThirdPlatformFormDTO input); + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java index abd22929ee..9322354512 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java @@ -4,6 +4,7 @@ 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.form.ThirdPlatformFormDTO; +import com.epmet.dto.result.ThirdplatformResultDTO; import com.epmet.feign.ThirdOpenFeignClient; import org.springframework.stereotype.Component; @@ -15,4 +16,9 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient { public Result saveOrUpdateSelectedPlatformsInfo(List input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveOrUpdateSelectedPlatformsInfo", input); } + + @Override + public Result> listAvailablePlatformsByCustomerAndAction(ThirdPlatformFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "listAvailablePlatformsByCustomerAndAction", input); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java index 9288625bee..7a630a4347 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java @@ -24,7 +24,7 @@ public class ThirdPlatformController { private ThirdPlatformService thirdPlatformService; /** - * 根据客户id和动作，列出客户登记可用的第三方平台 + * 根据客户id和动作，列出客户在指定动作下可用的第三方平台 * 用途：工作端，运营端配置界面 * * @param input diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java index 519c1a1371..d816340cc6 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java @@ -12,10 +12,15 @@ public class ThirdPlatformConfigFormDTO { public interface SaveThirdplatformConfig { } - @NotBlank(message = "客户ID不能为空", groups = {SaveThirdplatformConfig.class}) + public interface LoadThirdplatformConfig { } + + @NotBlank(message = "客户ID不能为空", groups = { + SaveThirdplatformConfig.class, + LoadThirdplatformConfig.class}) private String customerId; - @NotBlank(message = "项目协助发送开关状态不能为空", groups = {SaveThirdplatformConfig.class}) + @NotBlank(message = "项目协助发送开关状态不能为空", groups = { + SaveThirdplatformConfig.class}) private String sendProjectSwitch; private List customerSelectedPlatformList; diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java new file mode 100644 index 0000000000..95669e988e --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ThirdPlatformConfigResultDTO { + + private String sendProjectSwitch; + private List customerSelectedPlatformList = new ArrayList(); + + @Data + public static class CustomerSelectedPlatform { + private String customerId; + private String platformId; + private String platformName; + private String icon; + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java index aeb93e41c8..16f3cee2e8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java @@ -25,17 +25,18 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.constant.ParameterKeyConstant; import com.epmet.dto.CustomerProjectParameterDTO; import com.epmet.dto.form.ParameterFormDTO; import com.epmet.dto.form.ThirdPlatformConfigFormDTO; import com.epmet.dto.result.ParameterResultDTO; +import com.epmet.dto.result.ThirdPlatformConfigResultDTO; import com.epmet.excel.CustomerProjectParameterExcel; import com.epmet.service.CustomerProjectParameterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotBlank; import java.util.List; import java.util.Map; @@ -152,6 +153,12 @@ public class CustomerProjectParameterController { return new Result(); } + /** + * @Description 保存项目第三方平台的配置 + * @return + * @author wxz + * @date 2021.03.19 17:10 + */ @PostMapping("save-thirdplatform-config") public Result saveThirdplatformConfig(@RequestBody ThirdPlatformConfigFormDTO input) { ValidatorUtils.validateEntity(input, ThirdPlatformConfigFormDTO.SaveThirdplatformConfig.class); @@ -161,4 +168,17 @@ public class CustomerProjectParameterController { customerProjectParameterService.saveThirdplatformConfig(customerId, sendProjectSwitch, platformList); return new Result(); } + + /** + * @Description 保存项目第三方平台的配置 + * @return + * @author wxz + * @date 2021.03.19 17:10 + */ + @PostMapping("load-thirdplatform-config") + public Result loadThirdplatformConfig(@RequestBody ThirdPlatformConfigFormDTO input) { + ValidatorUtils.validateEntity(input, ThirdPlatformConfigFormDTO.LoadThirdplatformConfig.class); + ThirdPlatformConfigResultDTO resultDTO = customerProjectParameterService.loadThirdplatformConfig(input.getCustomerId(), ParameterKeyConstant.THIRD_PLATFORM_PROJECT_SEND); + return new Result().ok(resultDTO); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java index 4f1d6e9ea8..e7473100f0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java @@ -23,6 +23,7 @@ import com.epmet.dto.CustomerProjectParameterDTO; import com.epmet.dto.form.ParameterFormDTO; import com.epmet.dto.form.ThirdPlatformConfigFormDTO; import com.epmet.dto.result.ParameterResultDTO; +import com.epmet.dto.result.ThirdPlatformConfigResultDTO; import com.epmet.entity.CustomerProjectParameterEntity; import java.util.List; @@ -173,4 +174,6 @@ public interface CustomerProjectParameterService extends BaseService platformList); + + ThirdPlatformConfigResultDTO loadThirdplatformConfig(String customerId, String parameterKey); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java index ab36ac3469..3595f23a94 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java @@ -21,9 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ParameterKeyConstant; import com.epmet.constant.ThirdPlatformActions; import com.epmet.dao.CustomerProjectParameterDao; @@ -32,6 +34,8 @@ import com.epmet.dto.form.ParameterFormDTO; import com.epmet.dto.form.ThirdPlatformConfigFormDTO; import com.epmet.dto.form.ThirdPlatformFormDTO; import com.epmet.dto.result.ParameterResultDTO; +import com.epmet.dto.result.ThirdPlatformConfigResultDTO; +import com.epmet.dto.result.ThirdplatformResultDTO; import com.epmet.entity.CustomerProjectParameterEntity; import com.epmet.feign.ThirdOpenFeignClient; import com.epmet.redis.CustomerProjectParameterRedis; @@ -332,6 +336,44 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl> listResult = thirdOpenFeignClient.listAvailablePlatformsByCustomerAndAction(form); + + if (listResult == null || !listResult.success()) { + throw new RenException("调用Third服务，获取第三方平台列表失败"); + } + List platforms = listResult.getData(); + + // 2.本地查询 + CustomerProjectParameterEntity params = new CustomerProjectParameterEntity(); + params.setCustomerId(customerId); + params.setParameterKey(parameterKey); + String value = baseDao.selectParameterValueByKey(params); + value = StringUtils.isBlank(value) ? "0" : value; + + ThirdPlatformConfigResultDTO result = new ThirdPlatformConfigResultDTO(); + result.setSendProjectSwitch(value); + + platforms.forEach(p -> { + ThirdPlatformConfigResultDTO.CustomerSelectedPlatform platform = new ThirdPlatformConfigResultDTO.CustomerSelectedPlatform(); + platform.setCustomerId(customerId); + platform.setIcon(p.getIcon()); + platform.setPlatformId(p.getPlatformId()); + platform.setPlatformName(p.getPlatformName()); + result.getCustomerSelectedPlatformList().add(platform); + }); + + return result; } } \ No newline at end of file From ae9bd465ab076c59e726fc67b311bf586c7ced48 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Mar 2021 10:56:08 +0800 Subject: [PATCH 374/589] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=20=E5=B0=8F=E7=BB=84=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=9B=91=E6=8E=A7=E9=85=8D=E7=BD=AE=20=E5=88=86?= =?UTF-8?q?=E6=9E=90sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue-server/src/main/resources/bootstrap.yml | 8 ++++++++ .../gov-project-server/src/main/resources/bootstrap.yml | 8 ++++++++ .../resi-group-server/src/main/resources/bootstrap.yml | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 06974a6810..635bc8fb59 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -28,6 +28,14 @@ spring: url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ + #监控页面 + stat-view-servlet: + enabled: true + #loginUsername: admin + #loginPassword: admin + allow: + web-stat-filter: + enabled: true cloud: nacos: discovery: diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index 2db2f15416..e4fbaf5dc4 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -28,6 +28,14 @@ spring: url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ + #监控页面 + stat-view-servlet: + enabled: true + #loginUsername: admin + #loginPassword: admin + allow: + web-stat-filter: + enabled: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index 6823a772e7..455c8646fc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -31,6 +31,14 @@ spring: url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ + #监控页面 + stat-view-servlet: + enabled: true + #loginUsername: admin + #loginPassword: admin + allow: + web-stat-filter: + enabled: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 847d18bcb34bc1d3088f7cffd18e2b5d484fa5d8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Mar 2021 11:07:19 +0800 Subject: [PATCH 375/589] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=20=E5=B0=8F=E7=BB=84=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=9B=91=E6=8E=A7=E9=85=8D=E7=BD=AE=20=E5=88=86?= =?UTF-8?q?=E6=9E=90sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 7a6c236128..4509993aca 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -461,6 +461,7 @@ epmet: # 内部认证url白名单(在白名单中的，就不会再校验登录了) internalAuthUrlsWhiteList: - /epmetuser/customerstaff/customerlist + - /**/druid/** # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: From d7055697182c9d1e16fb073038526a9362981f7b Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Mar 2021 14:45:49 +0800 Subject: [PATCH 376/589] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=20=E5=B0=8F=E7=BB=84=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=9B=91=E6=8E=A7=E9=85=8D=E7=BD=AE=20=E5=88=86?= =?UTF-8?q?=E6=9E=90sql=20step2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group-server/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index 455c8646fc..d920d83ebd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -39,6 +39,7 @@ spring: allow: web-stat-filter: enabled: true + filters: stat # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From ba513891bd4bb1947197c8463696d80a42049f73 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 09:55:45 +0800 Subject: [PATCH 377/589] =?UTF-8?q?=E5=88=86=E6=9E=90sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/src/main/resources/bootstrap.yml | 1 + .../gov-project-server/src/main/resources/bootstrap.yml | 1 + .../resi-group-server/src/main/resources/bootstrap.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 635bc8fb59..8fd8432afb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -36,6 +36,7 @@ spring: allow: web-stat-filter: enabled: true + filters: stat,wall,log4j2 cloud: nacos: discovery: diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index e4fbaf5dc4..9fefdfce3f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -36,6 +36,7 @@ spring: allow: web-stat-filter: enabled: true + filters: stat,wall,log4j2 # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index d920d83ebd..d424551f5c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -39,7 +39,7 @@ spring: allow: web-stat-filter: enabled: true - filters: stat + filters: stat,wall,log4j2 # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 37d86f4acfff16747218ead4ca0363a400d0e376 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 10:19:13 +0800 Subject: [PATCH 378/589] =?UTF-8?q?=E5=88=86=E6=9E=90sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue-server/src/main/resources/bootstrap.yml | 7 ++++--- .../gov-project-server/src/main/resources/bootstrap.yml | 7 ++++--- .../resi-group-server/src/main/resources/bootstrap.yml | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 8fd8432afb..2e0eb76ccf 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -34,9 +34,10 @@ spring: #loginUsername: admin #loginPassword: admin allow: - web-stat-filter: - enabled: true - filters: stat,wall,log4j2 + web-stat-filter: + enabled: true + filters: stat,log4j2 + aop-patterns: com.epmet.service.impl.*,com.epmet.dao.* cloud: nacos: discovery: diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index 9fefdfce3f..d9fb7f15c6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -34,9 +34,10 @@ spring: #loginUsername: admin #loginPassword: admin allow: - web-stat-filter: - enabled: true - filters: stat,wall,log4j2 + web-stat-filter: + enabled: true + filters: stat,wall,log4j2 + aop-patterns: com.epmet.service.impl.*,com.epmet.dao.* # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index d424551f5c..29739d2e96 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -40,6 +40,7 @@ spring: web-stat-filter: enabled: true filters: stat,wall,log4j2 + aop-patterns: com.epmet.service.impl.*,com.epmet.dao.* # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 01a73d15bfb110d114ec5f42e8558ab679d8e228 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 10:49:42 +0800 Subject: [PATCH 379/589] =?UTF-8?q?=E5=88=86=E6=9E=90sql=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89spring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/src/main/resources/bootstrap.yml | 1 - .../gov-project-server/src/main/resources/bootstrap.yml | 1 - .../resi-group-server/src/main/resources/bootstrap.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 2e0eb76ccf..45acaa15a1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -37,7 +37,6 @@ spring: web-stat-filter: enabled: true filters: stat,log4j2 - aop-patterns: com.epmet.service.impl.*,com.epmet.dao.* cloud: nacos: discovery: diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index d9fb7f15c6..925ecc82a5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -37,7 +37,6 @@ spring: web-stat-filter: enabled: true filters: stat,wall,log4j2 - aop-patterns: com.epmet.service.impl.*,com.epmet.dao.* # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index 29739d2e96..d424551f5c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -40,7 +40,6 @@ spring: web-stat-filter: enabled: true filters: stat,wall,log4j2 - aop-patterns: com.epmet.service.impl.*,com.epmet.dao.* # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From e01615689ee234e241071ba9517f8c3189f9e31e Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 17:07:10 +0800 Subject: [PATCH 380/589] =?UTF-8?q?=E5=88=86=E6=9E=90=E4=B8=8B=E7=99=BB?= =?UTF-8?q?=E9=99=86=E6=8E=A5=E5=8F=A3=20=E5=90=84=E4=B8=AA=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E8=80=97=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index d1cc70552e..7b22870b05 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -65,12 +65,15 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { **/ @Override public UserTokenResultDTO resiLogin(LoginFormDTO formDTO) { + long start = System.currentTimeMillis(); //1.调用epmet_third服务，校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 WxLoginFormDTO resiLoginFormDTO = new WxLoginFormDTO(); resiLoginFormDTO.setAppId(formDTO.getAppId()); resiLoginFormDTO.setWxCode(formDTO.getWxCode()); UserWechatDTO userWechatDTO = this.getUserWeChat(resiLoginFormDTO); + logger.error("resiLogin getUserWeChat cost time:{}",System.currentTimeMillis()-start); + start = System.currentTimeMillis(); //2.调用epmet-user服务，新增用户信息(先判断用户是否存在，不存在则新增存在则更新) WxUserFormDTO wxUserFormDTO = new WxUserFormDTO(); wxUserFormDTO.setWechatDTO(userWechatDTO); @@ -79,6 +82,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { if (!userResult.success()) { throw new RenException(userResult.getCode()); } + logger.error("resiLogin saveWxUser cost time:{}",System.currentTimeMillis()-start); + start = System.currentTimeMillis(); UserDTO userDTO = userResult.getData(); //3.生成业务token @@ -91,7 +96,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { //5.接口返参 UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); - + logger.error("resiLogin generateToken cost time:{}",System.currentTimeMillis()-start); return userTokenResultDTO; } From 32dbd62d36da7f926cbadfb5bf3c59a91020321e Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 17:10:01 +0800 Subject: [PATCH 381/589] =?UTF-8?q?=E5=88=86=E6=9E=90=E4=B8=8B=E7=99=BB?= =?UTF-8?q?=E9=99=86=E6=8E=A5=E5=8F=A3=20=E5=90=84=E4=B8=AA=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E8=80=97=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ThirdLoginController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 00770d82bb..469385222d 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -6,6 +6,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.StaffOrgsResultDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.ThirdLoginService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -19,6 +20,7 @@ import java.util.List; * @Description 第三方-居民端、政府端登陆服务 * @author sun */ +@Slf4j @RestController @RequestMapping("thirdlogin") public class ThirdLoginController { @@ -34,8 +36,11 @@ public class ThirdLoginController { **/ @PostMapping("resilogin") public Result resiLogin(@RequestBody LoginFormDTO formDTO) { + long start = System.currentTimeMillis(); ValidatorUtils.validateEntity(formDTO); - return new Result().ok(thirdLoginService.resiLogin(formDTO)); + UserTokenResultDTO resultDTO = thirdLoginService.resiLogin(formDTO); + log.error("resilogin total cost:{}",System.currentTimeMillis()-start); + return new Result().ok(resultDTO); } /** From 6467aada6143928c382617995c5d740dea204700 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 17:40:40 +0800 Subject: [PATCH 382/589] =?UTF-8?q?Revert=20"=E5=88=86=E6=9E=90=E4=B8=8B?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=80=97=E6=97=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 32dbd62d --- .../java/com/epmet/controller/ThirdLoginController.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 469385222d..00770d82bb 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -6,7 +6,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.StaffOrgsResultDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.ThirdLoginService; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -20,7 +19,6 @@ import java.util.List; * @Description 第三方-居民端、政府端登陆服务 * @author sun */ -@Slf4j @RestController @RequestMapping("thirdlogin") public class ThirdLoginController { @@ -36,11 +34,8 @@ public class ThirdLoginController { **/ @PostMapping("resilogin") public Result resiLogin(@RequestBody LoginFormDTO formDTO) { - long start = System.currentTimeMillis(); ValidatorUtils.validateEntity(formDTO); - UserTokenResultDTO resultDTO = thirdLoginService.resiLogin(formDTO); - log.error("resilogin total cost:{}",System.currentTimeMillis()-start); - return new Result().ok(resultDTO); + return new Result().ok(thirdLoginService.resiLogin(formDTO)); } /** From 6c44ba2e45bb0b029a0902b83690b6fab62313fa Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Mar 2021 17:41:02 +0800 Subject: [PATCH 383/589] =?UTF-8?q?Revert=20"=E5=88=86=E6=9E=90=E4=B8=8B?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E8=80=97=E6=97=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e0161568 --- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 7b22870b05..d1cc70552e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -65,15 +65,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { **/ @Override public UserTokenResultDTO resiLogin(LoginFormDTO formDTO) { - long start = System.currentTimeMillis(); //1.调用epmet_third服务，校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 WxLoginFormDTO resiLoginFormDTO = new WxLoginFormDTO(); resiLoginFormDTO.setAppId(formDTO.getAppId()); resiLoginFormDTO.setWxCode(formDTO.getWxCode()); UserWechatDTO userWechatDTO = this.getUserWeChat(resiLoginFormDTO); - logger.error("resiLogin getUserWeChat cost time:{}",System.currentTimeMillis()-start); - start = System.currentTimeMillis(); //2.调用epmet-user服务，新增用户信息(先判断用户是否存在，不存在则新增存在则更新) WxUserFormDTO wxUserFormDTO = new WxUserFormDTO(); wxUserFormDTO.setWechatDTO(userWechatDTO); @@ -82,8 +79,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { if (!userResult.success()) { throw new RenException(userResult.getCode()); } - logger.error("resiLogin saveWxUser cost time:{}",System.currentTimeMillis()-start); - start = System.currentTimeMillis(); UserDTO userDTO = userResult.getData(); //3.生成业务token @@ -96,7 +91,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { //5.接口返参 UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); - logger.error("resiLogin generateToken cost time:{}",System.currentTimeMillis()-start); + return userTokenResultDTO; } From 171fbb06bb16060566f466458b3eef72ed666b8a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 31 Mar 2021 11:11:46 +0800 Subject: [PATCH 384/589] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=88=99=E6=89=80=E6=9C=89=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=83=BD=E4=B8=8D=E9=85=8D=E7=BD=AE=E8=BF=99=E4=B8=AA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java | 2 +- .../com/epmet/service/impl/GovCustomerMenuServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java index 1bd4fc67bc..e6c8ca205c 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java @@ -21,7 +21,7 @@ public class MenuConfigFormDTO implements Serializable { /** * 客户id 列表 + * 列表为空，则所有客户都不配置这个菜单了。 */ - @NotBlank(message = "客户id 列表不能为空") private List customerIds; } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java index 32cf57e0c7..8d7ef26acc 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java @@ -106,9 +106,8 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl entities = new ArrayList<>(); for (String customerId : formDTO.getCustomerIds()) { GovCustomerMenuEntity entity = new GovCustomerMenuEntity(); From ed7ff16e9c2d4b7738decfc007708d93f5f0e498 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 31 Mar 2021 14:56:02 +0800 Subject: [PATCH 385/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=A2=9E=E5=8A=A0=E4=BA=86http=20header=E7=9A=84?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=9B=20=E5=85=A5=E5=8F=82=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BD=BF=E7=94=A8JSON=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/aspect/BaseRequestLogAspect.java | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java index 4b3496ee36..bdff667e81 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java @@ -1,5 +1,6 @@ package com.epmet.commons.tools.aspect; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ThreadLocalConstant; import com.epmet.commons.tools.exception.*; @@ -14,6 +15,9 @@ import javax.servlet.http.HttpServletRequest; import java.time.Duration; import java.time.LocalDateTime; import java.util.Arrays; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * 日志切面 @@ -54,6 +58,8 @@ public abstract class BaseRequestLogAspect { // transactionSerial = UUID.randomUUID().toString(); //} + Map requestHeaders = getRequestHeaders(request); + // 将当前线程名称设置为事务流水号 if (!StringUtils.isEmpty(transactionSerial)) { Thread.currentThread().setName(transactionSerial); @@ -64,7 +70,8 @@ public abstract class BaseRequestLogAspect { try { Object[] args = point.getArgs(); ThreadLocalConstant.requestParam.set(Arrays.toString(point.getArgs())); - log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{}", transactionSerial, requestURI, method, objectsToString(args)); + log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{},请求头:{}", + transactionSerial, requestURI, method, objectsToString(args), requestHeaders); result = point.proceed(); resultInfoLog(transactionSerial, getExecPeriod(startTime), result); } catch (RenException e) { @@ -91,6 +98,23 @@ public abstract class BaseRequestLogAspect { return result; } + /** + * @Description 获取请求头信息 + * @return + * @author wxz + * @date 2021.03.31 13:59 + */ + private Map getRequestHeaders(HttpServletRequest request) { + Enumeration headerNames = request.getHeaderNames(); + HashMap headerMap = new HashMap<>(); + while (headerNames.hasMoreElements()) { + String headerName = headerNames.nextElement(); + String headerValue = request.getHeader(headerName); + headerMap.put(headerName, headerValue); + } + return headerMap; + } + /** * info日志 * @param transactionSerial @@ -225,7 +249,13 @@ public abstract class BaseRequestLogAspect { StringBuilder builder = new StringBuilder("["); for (Object object : args) { if (object != null) { - builder.append(object.toString()); + try { + // 尝试作为json解析 + String objectString = JSON.toJSONString(object); + builder.append(objectString); + } catch (Exception e) { + builder.append(object.toString()); + } builder.append(","); } } From c362d0f39b72b0cfb2da599953a12bcce0d0beaf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 20 Apr 2021 22:31:54 +0800 Subject: [PATCH 386/589] setSignTime --- .../modules/act/service/impl/ActSignInRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java index af9d938dfd..e9487dfd6f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java @@ -109,7 +109,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl Date: Wed, 21 Apr 2021 12:56:45 +0800 Subject: [PATCH 387/589] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=80=BB=E7=BB=93=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/modules/act/controller/ActSummaryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java index 0504bac3d6..01bcde1ed5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java @@ -51,7 +51,7 @@ public class ActSummaryController { **/ @PostMapping("inittem") public Result initTemplate(@RequestBody InitTemplateFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, InitTemplateFormDTO.class); + ValidatorUtils.validateEntity(formDTO, InitTemplateFormDTO.AddUserInternalGroup.class); return new Result().ok(actSummaryService.initTemplate(formDTO)); } } \ No newline at end of file From 02052580725c5e549dfd1b4fdc39578e03b050af Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 22 Apr 2021 14:38:39 +0800 Subject: [PATCH 388/589] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/resi/group/dto/group/ResiGroupDTO.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java index a2dfedb3ff..3153903240 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java @@ -125,8 +125,4 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审 */ private Date updatedTime; - /** - * 小组类型(ordinary:楼院小组 branch:支部小组) - */ - private String groupType; } From 19edd1c2c0a695a4b4df7511a3518d571bb38b05 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 22 Apr 2021 17:08:18 +0800 Subject: [PATCH 389/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/TopicDraftServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java index 1f2ff99fac..053338c330 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java @@ -785,7 +785,6 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Fri, 23 Apr 2021 13:47:05 +0800 Subject: [PATCH 390/589] =?UTF-8?q?=E5=AE=89=E5=AE=81=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0monthId,=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E7=9F=A5=E9=81=93=E6=95=B0=E6=8D=AE=E6=89=80=E5=B1=9E=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/result/GrassRootsGovernRankResultDTO.java | 5 +++++ .../screen/dto/result/GrassRootsGovernResultDTO.java | 5 +++++ .../screen/dto/result/GrassRootsOrgRankResultDTO.java | 2 ++ .../screen/dto/result/GrassRootsOrgResultDTO.java | 5 +++++ .../evaluationindex/screen/dto/result/PmTotalResultDTO.java | 5 +++++ .../screen/dto/result/ProjectProfileResultDTO.java | 2 ++ .../mapper/screenan/ScreenAnCommunityProjectProfileDao.xml | 3 ++- .../mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml | 6 ++++-- .../mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml | 6 ++++-- .../mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml | 3 ++- 10 files changed, 36 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java index ac2072d44c..624868df62 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java @@ -39,4 +39,9 @@ public class GrassRootsGovernRankResultDTO implements Serializable { * 组织名称 */ private String orgName; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java index 05b2e6c382..27be4bb8ce 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java @@ -35,4 +35,9 @@ public class GrassRootsGovernResultDTO implements Serializable { * 办结率（当前界面是社区时显示） */ private String closedProjectRatio; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java index 61b7ab9b74..e6c3ee3971 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java @@ -31,4 +31,6 @@ public class GrassRootsOrgRankResultDTO implements Serializable { * 组织名称 */ private String orgName; + + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java index d01bf5837e..8c4f0df674 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java @@ -27,4 +27,9 @@ public class GrassRootsOrgResultDTO implements Serializable { * 项目数 */ private Integer projectTotal; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java index aa5dcb67b5..2024fcd9d8 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java @@ -31,4 +31,9 @@ public class PmTotalResultDTO implements Serializable { * 议题数 */ private Integer issueTotal; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java index 9e6b2d509e..a5f3f8ce4f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java @@ -27,4 +27,6 @@ public class ProjectProfileResultDTO implements Serializable { * 级别 */ private String level; + + private String dataEndTime; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml index 10679f3f96..8718bfa0f2 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml @@ -5,7 +5,8 @@ SELECT GROUP_TOTAL, ISSUE_TOTAL, - PROJECT_TOTAL + PROJECT_TOTAL, + MONTH_ID FROM screen_an_grass_roots_org_monthly WHERE DEL_FLAG = 0 AND ORG_ID = #{agencyId} @@ -47,7 +48,8 @@ SELECT ORG_NAME, GROUP_TOTAL, ISSUE_TOTAL, - PROJECT_TOTAL + PROJECT_TOTAL, + MONTH_ID FROM screen_an_grass_roots_org_monthly WHERE DEL_FLAG = 0 AND PID = #{agencyId} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml index 58b7001046..0cb482df47 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml @@ -7,7 +7,8 @@ SELECT GROUP_MEMBER_TOTAL, TOPIC_TOTAL, TOPIC_PARTI_USER_TOTAL, - ISSUE_TOTAL + ISSUE_TOTAL, + MONTH_ID FROM screen_an_grass_roots_pm_total_monthly WHERE DEL_FLAG = '0' AND ORG_ID = #{agencyId} From 650e61f1359cba9487cdb042afd94b7aae5f6854 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 23 Apr 2021 14:05:48 +0800 Subject: [PATCH 391/589] =?UTF-8?q?=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0mon?= =?UTF-8?q?thId/dataEndTime,=E6=96=B9=E4=BE=BF=E7=9F=A5=E9=81=93=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=89=80=E5=B1=9E=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/result/FineExampleResultDTO.java | 2 ++ .../dto/result/GovernCapacityRankResultDTO.java | 2 ++ .../screen/dto/result/GovernCapacityResultDTO.java | 2 ++ .../screen/dto/result/OrgRankDataResultDTO.java | 4 ++++ .../screen/dto/result/PartyUserPointResultDTO.java | 2 ++ .../dto/result/PublicPartiProfileResultDTO.java | 4 ++++ .../screen/dto/result/TopProfileResultDTO.java | 2 ++ .../screen/impl/GrassRootsGovernServiceImpl.java | 2 ++ .../screen/impl/PartyMemberLeadServiceImpl.java | 11 ++++++----- .../mapper/screen/ScreenGovernRankDataDao.xml | 6 ++++-- .../resources/mapper/screen/ScreenOrgRankDataDao.xml | 6 ++++-- .../mapper/screen/ScreenPartyUserRankDataDao.xml | 3 ++- .../resources/mapper/screen/ScreenPioneerDataDao.xml | 6 ++++-- .../mapper/screen/ScreenUserTotalDataDao.xml | 3 ++- 14 files changed, 42 insertions(+), 13 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java index d8b33c9d12..5826f74e94 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java @@ -87,4 +87,6 @@ public class FineExampleResultDTO implements Serializable { * PLAT_JOIN PARTY_RATIO 平台参与议事的党员占比 */ private String platJoinPartyRatio = "0.00%"; + + private String dataEndTime; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java index bf6ae28829..4056d1976f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java @@ -44,4 +44,6 @@ public class GovernCapacityRankResultDTO implements Serializable { * 当前agencyName的上一级组织名称 */ private String parentAgencyName; + + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java index e749c0e218..be8c7d4398 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java @@ -46,4 +46,6 @@ public class GovernCapacityResultDTO implements Serializable { private String parentAgencyName; private String orgId; + + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java index a52b035475..7bec0ea542 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java @@ -56,4 +56,8 @@ public class OrgRankDataResultDTO implements Serializable { */ private String parentAgencyName; + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java index 3450a623a6..6e63822e65 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java @@ -28,4 +28,6 @@ public class PartyUserPointResultDTO implements Serializable { * 用户积分 * */ private Integer point; + + private String dataEndTime; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java index e95933e1c1..793306dcbc 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java @@ -49,4 +49,8 @@ public class PublicPartiProfileResultDTO implements Serializable { private String joinCompareLatestTrend = ""; + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java index 55c281db6c..5d95da3a5e 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java @@ -42,4 +42,6 @@ public class TopProfileResultDTO implements Serializable { * 项目总数 */ private Integer projectNum = 0; + + private String dataEndTime; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java index e427ad9e3b..4fc1974446 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java @@ -160,6 +160,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO)); result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO)); result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO)); + result.setMonthId(monthId); return result; } @@ -249,6 +250,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE)); rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE)); rank.setParentAgencyName(o.getParentAgencyName()); + rank.setMonthId(o.getMonthId()); result.add(rank); }); return result; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java index fce388ec23..bfb5534f01 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java @@ -82,10 +82,10 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { else {subCustomers = crmResponse.getData();} FineExampleResultDTO fineExampleResultDTO; - if(CollectionUtils.isEmpty(subCustomers)) - fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId()); - else - fineExampleResultDTO = screenPioneerDataDao.selectFineExampleByAreaCode(areaCode,customerId,subCustomers); + if(CollectionUtils.isEmpty(subCustomers)) { + fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId()); + }else { + fineExampleResultDTO = screenPioneerDataDao.selectFineExampleByAreaCode(areaCode, customerId, subCustomers); if (null == fineExampleResultDTO) { return new FineExampleResultDTO(); @@ -96,7 +96,8 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { fineExampleResultDTO.setTopicRatio(this.getRatio(fineExampleResultDTO.getTopicRatioA())); fineExampleResultDTO.setShiftProjectRatio(this.getRatio(fineExampleResultDTO.getShiftProjectRatioA())); fineExampleResultDTO.setPlatJoinPartyRatio(this.getRatio(Double.valueOf(fineExampleResultDTO.getPlatJoinPartyRatio()))); - return fineExampleResultDTO; + } + return fineExampleResultDTO; } /** diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index dd04bb5130..de42bf437a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml @@ -35,7 +35,8 @@ IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO, IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO, IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO, - pa.AGENCY_NAME AS parentAgencyName + pa.AGENCY_NAME AS parentAgencyName, + rankData.MONTH_ID as monthId FROM screen_customer_agency agency left join screen_customer_agency pa on(agency.PARENT_AREA_CODE=pa.AREA_CODE @@ -61,7 +62,8 @@ IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO, IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO, IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO, - ca.agency_name AS parentAgencyName + ca.agency_name AS parentAgencyName, + rankData.MONTH_ID as monthId FROM screen_customer_grid grid left join screen_customer_agency ca on (ca.agency_id = grid.parent_agency_id) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml index 5d2be597be..8ad76122dd 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml @@ -13,7 +13,8 @@ rankData.PROJECT_TOTAL AS projectNum, rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio, rankData.SATISFACTION_RATIO AS satisfactionRatio, - agency.AGENCY_NAME AS parentAgencyName + agency.AGENCY_NAME AS parentAgencyName, + rankData.MONTH_ID FROM screen_org_rank_data rankData LEFT JOIN screen_customer_agency agency @@ -43,7 +44,8 @@ rankData.PROJECT_TOTAL AS projectNum, rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio, rankData.SATISFACTION_RATIO AS satisfactionRatio, - agency.AGENCY_NAME AS parentAgencyName + agency.AGENCY_NAME AS parentAgencyName, + rankData.MONTH_ID FROM screen_org_rank_data rankData left join screen_customer_grid scg on( diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index 30fb7bd125..316c764b8e 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -102,7 +102,8 @@ SELECT m.USER_ID, concat( m.surname, CASE char_length( m.NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END ) AS name, - m.POINT_TOTAL AS point + m.POINT_TOTAL AS point, + m.DATA_END_TIME FROM screen_party_user_rank_data m left join screen_customer_grid scg diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml index 6534512f8a..db8c7ba349 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml @@ -17,7 +17,8 @@ publish_issue_total AS publishIssueTotal, IFNULL(publish_issue_ratio,0) AS publishIssueRatioA, PLAT_ISSUE_TOTAL AS platIssueTotal, - IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio + IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio, + DATA_END_TIME as dataEndTime FROM screen_pioneer_data WHERE @@ -44,7 +45,8 @@ CEILING(avg(data.publish_issue_total)) AS publishIssueTotal, IFNULL(avg(data.publish_issue_ratio),0) AS publishIssueRatioA, CEILING(avg(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal, - IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio + IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio, + DATA_END_TIME as dataEndTime FROM screen_pioneer_data data diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml index d2040d3e13..a51e83d66e 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml @@ -38,7 +38,8 @@ group_total AS groupNum, topic_total AS topicNum, issue_total AS issueNum, - project_total AS projectNum + project_total AS projectNum, + DATA_END_TIME as dataEndTime FROM screen_user_total_data WHERE From aeb994df7e52622abe240214efa0d7d2757c12b0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 26 Apr 2021 09:42:30 +0800 Subject: [PATCH 392/589] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 87c8afe53c..1d0e8af89b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -118,7 +118,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.validation.constraints.NotBlank; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -1953,7 +1952,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Mon, 26 Apr 2021 09:56:00 +0800 Subject: [PATCH 393/589] =?UTF-8?q?Revert=20"=E5=8E=BB=E6=8E=89=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit aeb994df --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 1d0e8af89b..87c8afe53c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -118,6 +118,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.validation.constraints.NotBlank; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -1952,7 +1953,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Mon, 26 Apr 2021 15:39:08 +0800 Subject: [PATCH 394/589] =?UTF-8?q?=E6=94=BE=E9=94=99=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiTopicServiceImpl.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 424f0ccfc8..65eb52d8d5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -118,7 +118,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.validation.constraints.NotBlank; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -797,28 +796,26 @@ public class ResiTopicServiceImpl extends BaseServiceImpl content.length() ? "\"" : "…\"")) + - "已被解决"); + "已被解决"); pointEventMsgList.add(pointEventMsg); mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); - if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ - log.error("组长解决话题事件发送失败，参数：{}",JSON.toJSONString(closeFormDTO)); + if (!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()) { + log.error("组长解决话题事件发送失败，参数：{}", JSON.toJSONString(closeFormDTO)); } - - - + } //2021.4.22 start sun 因业务调整，新增组内消息记录表，话题状态变化时相应的修改数据状态 GroupMessageEntity groupMessage = groupMessageDao.selectByMessageId(closeFormDTO.getTopicId()); - if(null != groupMessage){ + if (null != groupMessage) { groupMessage.setStatus(TopicConstant.CLOSED); groupMessageDao.updateById(groupMessage); } //2021.4.22 end sun // 发送小组成就消息 - boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode())); - if (!flag) { - log.error("发送(小组成就)系统消息到message服务失败"); - } + boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode())); + if (!flag) { + log.error("发送(小组成就)系统消息到message服务失败"); + } return new Result(); } From 6c07d68d6ca18f140179798ad8e8cfa73677aa2f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 15:34:52 +0800 Subject: [PATCH 395/589] =?UTF-8?q?=E4=BD=BF=E7=94=A8rocketmq=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/mq/GroupAchieventConsumerListener.java | 4 +++- .../java/com/epmet/mq/type1/RocketMQConsumerRegister.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java index 2f6d9594e9..21dac1cae5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java @@ -1,10 +1,12 @@ package com.epmet.mq; import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg; import com.epmet.modules.group.service.StatsAchievementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; */ @Slf4j //@Component -//@RocketMQMessageListener(topic = "group_achievement", consumerGroup = ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP) +@RocketMQMessageListener(topic = "group_achievement", consumerGroup = ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP) public class GroupAchieventConsumerListener implements RocketMQListener { @Autowired private StatsAchievementService statsAchievementService; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java index c15e0ba6b2..55396139da 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @Slf4j -@Component +//@Component public class RocketMQConsumerRegister { @Value("${rocketmq.name-server}") From 5f0fc2ca9f5badf8e3b0094d413db516c42c1cf1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 15:48:48 +0800 Subject: [PATCH 396/589] =?UTF-8?q?Revert=20"=E4=BD=BF=E7=94=A8rocketmq?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6c07d68d --- .../main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java index 55396139da..c15e0ba6b2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @Slf4j -//@Component +@Component public class RocketMQConsumerRegister { @Value("${rocketmq.name-server}") From dd662389596d3e73714e0c394f07f4d4a9106ca2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 15:49:17 +0800 Subject: [PATCH 397/589] =?UTF-8?q?=E4=BD=BF=E7=94=A8rocketmq=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/mq/GroupAchieventConsumerListener.java | 3 ++- .../main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java index 21dac1cae5..fe76ad1b1b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * desc: 小组成就mq监听 @@ -18,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; * @version: 1.0 */ @Slf4j -//@Component +@Component @RocketMQMessageListener(topic = "group_achievement", consumerGroup = ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP) public class GroupAchieventConsumerListener implements RocketMQListener { @Autowired diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java index c15e0ba6b2..55396139da 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @Slf4j -@Component +//@Component public class RocketMQConsumerRegister { @Value("${rocketmq.name-server}") From 39f3671f6a1b8d4ae37c9aa46e35be1d8fbe1431 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 16:00:36 +0800 Subject: [PATCH 398/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7rocketmq=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-commons/epmet-commons-rocketmq/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/pom.xml b/epmet-commons/epmet-commons-rocketmq/pom.xml index e61ac46c9e..8a00a78359 100644 --- a/epmet-commons/epmet-commons-rocketmq/pom.xml +++ b/epmet-commons/epmet-commons-rocketmq/pom.xml @@ -15,8 +15,8 @@ org.apache.rocketmq rocketmq-spring-boot-starter - 2.0.1 - + + 2.2.0 org.projectlombok From efb21c2aceca589a7d23f98461af7e340f899cb8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 16:08:24 +0800 Subject: [PATCH 399/589] =?UTF-8?q?Revert=20"=E5=8D=87=E7=BA=A7rocketmq?= =?UTF-8?q?=E7=89=88=E6=9C=AC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 39f3671f --- epmet-commons/epmet-commons-rocketmq/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/pom.xml b/epmet-commons/epmet-commons-rocketmq/pom.xml index 8a00a78359..e61ac46c9e 100644 --- a/epmet-commons/epmet-commons-rocketmq/pom.xml +++ b/epmet-commons/epmet-commons-rocketmq/pom.xml @@ -15,8 +15,8 @@ org.apache.rocketmq rocketmq-spring-boot-starter - - 2.2.0 + 2.0.1 + org.projectlombok From 24a80d793d290b6ffef9f78d2a353a2f6aa58de2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 16:14:32 +0800 Subject: [PATCH 400/589] =?UTF-8?q?Revert=20"=E4=BD=BF=E7=94=A8rocketmq?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6c07d68d --- .../java/com/epmet/mq/GroupAchieventConsumerListener.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java index fe76ad1b1b..2f6d9594e9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/GroupAchieventConsumerListener.java @@ -1,15 +1,12 @@ package com.epmet.mq; import com.alibaba.fastjson.JSON; -import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg; import com.epmet.modules.group.service.StatsAchievementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; /** * desc: 小组成就mq监听 @@ -19,8 +16,8 @@ import org.springframework.stereotype.Component; * @version: 1.0 */ @Slf4j -@Component -@RocketMQMessageListener(topic = "group_achievement", consumerGroup = ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP) +//@Component +//@RocketMQMessageListener(topic = "group_achievement", consumerGroup = ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP) public class GroupAchieventConsumerListener implements RocketMQListener { @Autowired private StatsAchievementService statsAchievementService; From ec233ce5dc61714c517622103a1fbcb39e901f27 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 27 Apr 2021 16:16:19 +0800 Subject: [PATCH 401/589] =?UTF-8?q?=E5=8D=87=E7=BA=A7rocketmq=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java index 55396139da..c15e0ba6b2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @Slf4j -//@Component +@Component public class RocketMQConsumerRegister { @Value("${rocketmq.name-server}") From f13fe881e5ee5429e3d7d99f69b93c6975261892 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 29 Apr 2021 17:00:36 +0800 Subject: [PATCH 402/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index b7e99d4bf9..04038d6da9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1916,10 +1916,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Fri, 14 May 2021 17:44:04 +0800 Subject: [PATCH 403/589] =?UTF-8?q?=E5=90=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectSatisfactionStatisticsEntity.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java index 319982e358..3174baa747 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java @@ -72,11 +72,6 @@ public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity { @TableField(fill = FieldFill.INSERT) private String customerId; - /** - * 应评价人数【等于实际表决人数】 - */ - private Integer shouldEvaluateCount; - public ProjectSatisfactionStatisticsEntity() { this.goodCount = NumConstant.ZERO; this.perfectCount = NumConstant.ZERO; @@ -84,10 +79,4 @@ public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity { this.shouldEvaluateCount = NumConstant.ZERO; } - public ProjectSatisfactionStatisticsEntity() { - this.goodCount = NumConstant.ZERO; - this.perfectCount = NumConstant.ZERO; - this.badCount = NumConstant.ZERO; - this.shouldEvaluateCount = NumConstant.ZERO; - } } From 405163ae6c9917d9111d41765725d2b8044901f6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 18 May 2021 16:06:33 +0800 Subject: [PATCH 404/589] =?UTF-8?q?=E5=B7=B2=E8=BD=AC=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E4=B8=8D=E5=85=81=E8=AE=B8=E5=86=8D=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=88=96=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/exception/EpmetErrorCode.java | 1 + .../topic/service/impl/ResiTopicServiceImpl.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index b7b70c5159..c2400f5788 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -150,6 +150,7 @@ public enum EpmetErrorCode { TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"), TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"), TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"), + TOPIC_SHIFT_ISSUE(9009,"该话题已转议题，不允许屏蔽活关闭"), CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"), CATEGORY_NAME(9102,"分类名称已存在，不允许重复"), diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index e6ce2039c7..4d482b9869 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -629,6 +629,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Tue, 18 May 2021 16:08:51 +0800 Subject: [PATCH 405/589] =?UTF-8?q?=E5=88=86=E6=94=AF=E9=94=99=E8=AF=AF=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/exception/EpmetErrorCode.java | 1 - .../topic/service/impl/ResiTopicServiceImpl.java | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index c2400f5788..b7b70c5159 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -150,7 +150,6 @@ public enum EpmetErrorCode { TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"), TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"), TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"), - TOPIC_SHIFT_ISSUE(9009,"该话题已转议题，不允许屏蔽活关闭"), CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"), CATEGORY_NAME(9102,"分类名称已存在，不允许重复"), diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 4d482b9869..e6ce2039c7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -629,12 +629,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Wed, 19 May 2021 18:13:15 +0800 Subject: [PATCH 406/589] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AApid=E4=B8=8D=E5=85=81=E8=AE=B8=E9=87=8D?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/AgencyController.java | 2 +- .../src/main/java/com/epmet/dao/CustomerAgencyDao.java | 4 ++-- .../main/java/com/epmet/service/CustomerAgencyService.java | 2 +- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 2 +- .../com/epmet/service/impl/CustomerAgencyServiceImpl.java | 4 ++-- .../src/main/resources/mapper/CustomerAgencyDao.xml | 4 +++- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index b0ec95dfd2..053f3427ee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -99,7 +99,7 @@ public class AgencyController { ValidatorUtils.validateEntity(formDTO, AddAgencyV2FormDTO.AreaCodeGroup.class); } //当前客户下，同级组织中，组织名称不允许重复 - customerAgencyService.checkAgencyName(formDTO.getAgencyName(),tokenDTO.getCustomerId(),formDTO.getLevel(),null); + customerAgencyService.checkAgencyName(formDTO.getAgencyName(),tokenDTO.getCustomerId(),null,formDTO.getParentAgencyId()); return new Result().ok(agencyService.addAgencyV2(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index f798c8b354..dc5518a35c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -231,6 +231,6 @@ public interface CustomerAgencyDao extends BaseDao { List checkAgencyName(@Param("agencyName") String agencyName, @Param("customerId") String customerId, - @Param("level") String level, - @Param("agencyId") String agencyId); + @Param("agencyId") String agencyId, + @Param("parentAgencyId") String parentAgencyId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 59941f1f60..fda2f4d09e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -235,5 +235,5 @@ public interface CustomerAgencyService extends BaseService **/ OrganizeTreeResultDTO organizeTree(String agencyId); - void checkAgencyName(String agencyName,String customerId,String level,String agencyId); + void checkAgencyName(String agencyName,String customerId,String agencyId,String parentAgencyId); } \ No newline at end of file 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 287dfef613..07e29b44b1 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 @@ -134,7 +134,7 @@ public class AgencyServiceImpl implements AgencyService { Result result = new Result(); CustomerAgencyEntity originalEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); //当前客户下，同级组织中，组织名称不允许重复 - customerAgencyService.checkAgencyName(formDTO.getAgencyName(),originalEntity.getCustomerId(),originalEntity.getLevel(),originalEntity.getId()); + customerAgencyService.checkAgencyName(formDTO.getAgencyName(),originalEntity.getCustomerId(),originalEntity.getId(),originalEntity.getPid()); originalEntity.setOrganizationName(formDTO.getAgencyName()); //1:更新当前组织信息 if (customerAgencyDao.updateById(originalEntity) < NumConstant.ONE) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 3753412331..f19e1a8af5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1060,8 +1060,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl entityList = baseDao.checkAgencyName(agencyName,customerId,level,agencyId); + public void checkAgencyName(String agencyName,String customerId,String agencyId,String parentAgencyId) { + List entityList = baseDao.checkAgencyName(agencyName,customerId,agencyId,parentAgencyId); if (CollectionUtils.isNotEmpty(entityList)) { throw new RenException(EpmetErrorCode.AGENCY_NAME_ALREADY_EXISTS.getCode(), EpmetErrorCode.AGENCY_NAME_ALREADY_EXISTS.getMsg()); } 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 f7dee28823..2f051d5bbe 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 @@ -432,9 +432,11 @@ ca.DEL_FLAG = '0' AND ca.CUSTOMER_ID = #{customerId} AND ca.ORGANIZATION_NAME = #{agencyName} - AND ca.`LEVEL` = #{level} AND ca.id !=#{agencyId} + + AND ca.pid =#{parentAgencyId} + \ No newline at end of file From 4578fb1baf9c5639105b79e68eebac6abd7c9ce5 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 3 Jun 2021 16:04:34 +0800 Subject: [PATCH 407/589] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 50bed534ed..1db18cea79 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-user-server:version_placeholder 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 d8cd0af54c..5050972cd8 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -154,19 +154,19 @@ - + epmet_user_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false From 5395c4b60aa03771b8ba551f28d8cbf333a33e98 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 3 Jun 2021 17:32:40 +0800 Subject: [PATCH 408/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9dev=E5=92=8Clocal?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=B0=83=E6=95=B4=E5=88=B0140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-dev.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 12 ++-- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 8 +-- .../src/main/resources/application.yml | 2 +- .../epmet/commons/tools/enums/EnvEnum.java | 2 +- .../epmet/commons/tools/utils/WebUtil.java | 2 +- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../data-aggregator-server/pom.xml | 44 ++++++------- .../deploy/docker-compose-dev.yml | 2 +- .../data-report/data-report-server/pom.xml | 20 +++--- .../deploy/docker-compose-dev.yml | 2 +- .../data-statistical-server/pom.xml | 64 +++++++++---------- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-activiti-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../common-service-server/pom.xml | 12 ++-- .../epmet-demo/epmet-demo-server/pom.xml | 6 +- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-ext/epmet-ext-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 12 ++-- .../resources/db/migration/epmet_heart.sql | 2 +- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-message-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../gov-access/gov-access-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../gov-project/gov-project-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../oper-access/oper-access-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../oper-customize-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../resi-group/resi-group-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-hall/resi-hall-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-home/resi-home-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-mine/resi-mine-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-partymember-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-voice/resi-voice-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-openapi-adv-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 8 +-- epmet-user/epmet-user-server/pom.xml | 6 +- .../src/main/resources/bootstrap.yml | 2 +- 75 files changed, 285 insertions(+), 285 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index 408ecd1fa8..ee8461e06f 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-admin-server:version_placeholder 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 c69013ccc4..4bb81421d1 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -90,18 +90,18 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -122,18 +122,18 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 1239aa8ac7..f721a6164f 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 27affb686d..7d8aefb103 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -167,12 +167,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -222,12 +222,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 76cfc7865d..cc5174da7b 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.140:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: epmet_dba password: EpmEt-dbA-UsEr #oracle配置 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java index 31d5faaa34..29a416dfea 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java @@ -15,7 +15,7 @@ public enum EnvEnum { * 环境变量枚举 */ LOCAL("local", "本地环境", "http://localhost:8080/api/"), - DEV("dev", "开发环境", "http://192.168.1.130:8080/api/"), + DEV("dev", "开发环境", "http://192.168.1.140:8080/api/"), TEST("test", "体验环境", "https://epmet-dev.elinkservice.cn/api/"), PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java index f1e2c53382..56d892202f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java @@ -36,7 +36,7 @@ public class WebUtil { * 可是，如果通过了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP值，究竟哪个才是真正的用户端的真实IP呢？ * 答案是取X-Forwarded-For中第一个非unknown的有效IP字符串。 *

- * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.130, + * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.140, * 192.168.1.100 *

* 用户真实IP为： 192.168.1.110 diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 45db293a98..625089b478 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index af02a2054c..2558c294d7 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -117,12 +117,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -242,12 +242,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml index e26e72451c..0973856c00 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-aggregator-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/data-aggregator-server:version_placeholder ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index e339e39885..a273a3a604 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -110,76 +110,76 @@ - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_common_service_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -205,76 +205,76 @@ - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_common_service_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 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 a98722271e..9f0dfb863a 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:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/data-report-server:version_placeholder ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index e29b4feea7..429d6d8982 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -135,33 +135,33 @@ - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -187,33 +187,33 @@ - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 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 818776c83a..09d626e7c5 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:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/data-statistical-server:version_placeholder 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 79d0fb2130..6a4c799cfe 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -151,91 +151,91 @@ - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_gov_voice_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr - + epmet_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -256,7 +256,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 @@ -270,91 +270,91 @@ - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_gov_voice_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr - + epmet_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -375,7 +375,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml index e79e2ccfc3..1cd58359a9 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-activiti-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-activiti-server:version_placeholder ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index e1faf30b80..a3fcef0d17 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -164,18 +164,18 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -196,18 +196,18 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 691e0700f5..7a83d38429 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index ac1a2a2010..4d6d38808c 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -104,7 +104,7 @@ - + @@ -112,12 +112,12 @@ EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -150,7 +150,7 @@ - + @@ -158,12 +158,12 @@ EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 26c8afd2fc..62701e05ad 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -110,18 +110,18 @@ - + epmet_demo_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index 2b3437321d..d9a9fdea13 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 96e1997664..77e44416a2 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -198,18 +198,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -237,18 +237,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index c9324e7eaa..8602660d10 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 0b80268b87..e9d61c6855 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -116,18 +116,18 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -157,18 +157,18 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql index dcfead8989..cb638c9c74 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql @@ -1,7 +1,7 @@ /* Navicat Premium Data Transfer - Source Server : 外网192.168.1.130 + Source Server : 外网192.168.1.140 Source Server Type : MySQL Source Server Version : 50728 Source Host : 118.190.150.119:47306 diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index de0601f085..1f21893994 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index ec12f75a35..1e61a7a7e3 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -119,18 +119,18 @@ - + epmet_job_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -154,18 +154,18 @@ - + epmet_job_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 846f37b811..4c672bbdc6 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 6af8aed5e8..db46cd844b 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -159,18 +159,18 @@ - + epmet_message_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -193,7 +193,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -208,18 +208,18 @@ - + epmet_message_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -241,7 +241,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml index d99d59a73c..4f5d73ca1a 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-dev # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 1e85dd5506..b269ad5a2b 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -124,18 +124,18 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -163,18 +163,18 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index cc0bd873d0..8a4c242e3b 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 914bd076a3..f556670bb6 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -127,18 +127,18 @@ - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -168,18 +168,18 @@ - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 535e927003..58694a45a2 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a632182918..7f45e46879 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -175,18 +175,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -214,18 +214,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 93bb414efe..df08fa34bc 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-access-server:version_placeholder 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 cb78960c44..60a356fae8 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -107,18 +107,18 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -140,18 +140,18 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index 42030e9322..6082d0021f 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-grid-server:version_placeholder 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 29518e765e..dc40415627 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -105,12 +105,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -137,12 +137,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index f953f16888..ccf13bda1a 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index d33f114297..5a7558cd4b 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -149,18 +149,18 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -175,7 +175,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 @@ -189,18 +189,18 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -215,7 +215,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 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 11c377e5dc..fb69e6294e 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:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-mine-server:version_placeholder 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 a1db3409c8..43418618c5 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -125,12 +125,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -155,12 +155,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 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 abdd0d45e1..0da84fc37e 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:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-org-server:version_placeholder 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 5c38be1f82..c1188671ae 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -143,18 +143,18 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -170,7 +170,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -185,18 +185,18 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -212,7 +212,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 2293705079..1ce320b4cd 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-project-server:version_placeholder ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c81475c4e6..34f7f97e23 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -148,18 +148,18 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -188,18 +188,18 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index be773bc448..e55caf1b80 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 58caa1237e..a6086e5b8a 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -112,18 +112,18 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -151,18 +151,18 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml index 94f4886466..97bcee075e 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/oper-access-server:version_placeholder 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 7942ba854d..d4f2f45eaa 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -100,18 +100,18 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -138,18 +138,18 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 603196b2b6..0a12a58e1e 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/oper-crm-server:version_placeholder 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 b98700ffef..13c7ef0ff8 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -145,18 +145,18 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -183,18 +183,18 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 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 9d936ebb6b..56861b1710 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:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/oper-customize-server:version_placeholder 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 03ef0be6d1..e144f0c2f9 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -111,18 +111,18 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -138,7 +138,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -153,18 +153,18 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -180,7 +180,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index dc0e3a442f..bfe0391be1 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-group-server:version_placeholder 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 45fa3f7dfb..52c92b707b 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -158,18 +158,18 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -199,7 +199,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -214,18 +214,18 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -254,7 +254,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index a487c1147c..46c73ee371 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-guide-server:version_placeholder 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 f609520583..4df4414a7a 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -121,18 +121,18 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -159,18 +159,18 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index 3e87863bb2..d5d83fb58b 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 81af7c324d..ca65519ace 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -91,12 +91,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -123,12 +123,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml index 2f8b97a10b..d576ed8a28 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 482f54ab6d..bc92edd5fd 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -105,12 +105,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -135,12 +135,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 1ef428be1a..cef4c0f867 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-mine-server:version_placeholder 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 10f96765b7..7806a37e17 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -134,12 +134,12 @@ dev 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -163,12 +163,12 @@ local 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 9013f7458b..d549dfa605 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-partymember-server:version_placeholder 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 05efd9c573..6debcb9e08 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -127,18 +127,18 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -166,18 +166,18 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml index 99ab9465a8..63cb2415e8 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 120e894854..86818815f1 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -91,12 +91,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -122,12 +122,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml index 55c505363d..79721a6cb7 100644 --- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-adv-server: container_name: epmet-openapi-adv-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-adv-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-openapi-adv-server:version_placeholder ports: - "8015:8015" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml index 1461d20edf..735cef420e 100644 --- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml +++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml @@ -82,18 +82,18 @@ - + epmet_adv_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -131,7 +131,7 @@ 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml index 4e86ab5e89..e0ebfada9a 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 04df9d3a67..5194711853 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -93,12 +93,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -124,12 +124,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 5050972cd8..7ea95ecc26 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -193,18 +193,18 @@ - + epmet_user_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index bb127328eb..667b9ba7c2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -148,7 +148,7 @@ dingTalk: secret: @dingTalk.robot.secret@ rocketmq: - name-server: 192.168.1.130:9876;192.168.1.132:9876 + name-server: 192.168.1.140:9876;192.168.1.141:9876 # 停机选项 shutdown: From c67816077a808fb7d9c7a99e8f1939c4e87edcff Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 3 Jun 2021 22:25:40 +0800 Subject: [PATCH 409/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos,dev=E5=92=8Cloc?= =?UTF-8?q?al=E7=8E=AF=E5=A2=83=E6=B3=A8=E5=86=8C=E7=9A=84namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 4 ++-- epmet-auth/pom.xml | 4 ++-- epmet-gateway/pom.xml | 4 ++-- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 4 ++-- epmet-module/data-report/data-report-server/pom.xml | 4 ++-- epmet-module/data-statistical/data-statistical-server/pom.xml | 4 ++-- epmet-module/epmet-activiti/epmet-activiti-server/pom.xml | 4 ++-- .../epmet-common-service/common-service-server/pom.xml | 4 ++-- epmet-module/epmet-demo/epmet-demo-server/pom.xml | 2 +- epmet-module/epmet-ext/epmet-ext-server/pom.xml | 4 ++-- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 4 ++-- epmet-module/epmet-job/epmet-job-server/pom.xml | 4 ++-- epmet-module/epmet-message/epmet-message-server/pom.xml | 4 ++-- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 4 ++-- epmet-module/epmet-point/epmet-point-server/pom.xml | 4 ++-- epmet-module/epmet-third/epmet-third-server/pom.xml | 4 ++-- epmet-module/gov-access/gov-access-server/pom.xml | 4 ++-- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 ++-- epmet-module/gov-issue/gov-issue-server/pom.xml | 4 ++-- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 ++-- epmet-module/gov-org/gov-org-server/pom.xml | 4 ++-- epmet-module/gov-project/gov-project-server/pom.xml | 4 ++-- epmet-module/gov-voice/gov-voice-server/pom.xml | 4 ++-- epmet-module/oper-access/oper-access-server/pom.xml | 4 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 4 ++-- epmet-module/oper-customize/oper-customize-server/pom.xml | 4 ++-- epmet-module/resi-group/resi-group-server/pom.xml | 4 ++-- epmet-module/resi-guide/resi-guide-server/pom.xml | 4 ++-- epmet-module/resi-hall/resi-hall-server/pom.xml | 4 ++-- epmet-module/resi-home/resi-home-server/pom.xml | 4 ++-- epmet-module/resi-mine/resi-mine-server/pom.xml | 4 ++-- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 4 ++-- epmet-module/resi-voice/resi-voice-server/pom.xml | 4 ++-- .../epmet-openapi-adv/epmet-openapi-adv-server/pom.xml | 4 ++-- epmet-openapi/epmet-openapi-scan/pom.xml | 4 ++-- epmet-user/epmet-user-server/pom.xml | 2 +- 36 files changed, 70 insertions(+), 70 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 4bb81421d1..ba9fcc857e 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -102,7 +102,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -134,7 +134,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 7d8aefb103..05fabd3f57 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -173,7 +173,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -228,7 +228,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 2558c294d7..7ebcad9bde 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -123,7 +123,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -248,7 +248,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index a273a3a604..9b8c6fd6bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -180,7 +180,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -275,7 +275,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 429d6d8982..f1ab408d0a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -162,7 +162,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -214,7 +214,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 6a4c799cfe..d1b4c185c8 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -236,7 +236,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -355,7 +355,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index a3fcef0d17..33d73c705d 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -176,7 +176,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -208,7 +208,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 4d6d38808c..204c98cfb0 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -118,7 +118,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -164,7 +164,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 62701e05ad..b877c0df18 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -122,7 +122,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 77e44416a2..dd2c955279 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -210,7 +210,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -249,7 +249,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index e9d61c6855..2be2091ca1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -128,7 +128,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -169,7 +169,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 1e61a7a7e3..725a7342eb 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -131,7 +131,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -166,7 +166,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index db46cd844b..9cf8dfab0e 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -171,7 +171,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -220,7 +220,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index b269ad5a2b..e3178a703e 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -136,7 +136,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -175,7 +175,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index f556670bb6..be0a6395a5 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -139,7 +139,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -180,7 +180,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 7f45e46879..bd811cf03e 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -187,7 +187,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -226,7 +226,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 60a356fae8..d1052635a9 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -119,7 +119,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -152,7 +152,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index dc40415627..ad73cacdaa 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -111,7 +111,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -143,7 +143,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 5a7558cd4b..b266f10c0c 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -161,7 +161,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -201,7 +201,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 43418618c5..325ef169c4 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -131,7 +131,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -161,7 +161,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index c1188671ae..9c353b0f90 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -155,7 +155,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -197,7 +197,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 34f7f97e23..4b1b8389fc 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -160,7 +160,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -200,7 +200,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index a6086e5b8a..8494159692 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -124,7 +124,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -163,7 +163,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index d4f2f45eaa..2e4a4304db 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -112,7 +112,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -150,7 +150,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 13c7ef0ff8..ee643299c2 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -157,7 +157,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -195,7 +195,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index e144f0c2f9..93dfea5123 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -123,7 +123,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -165,7 +165,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 52c92b707b..018f200219 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -170,7 +170,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -226,7 +226,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4df4414a7a..ab8cfe3179 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -133,7 +133,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -171,7 +171,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index ca65519ace..f3475bf89c 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -97,7 +97,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -129,7 +129,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index bc92edd5fd..fe0abc9e81 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -111,7 +111,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -141,7 +141,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 7806a37e17..3c90bc99a7 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -140,7 +140,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -169,7 +169,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 6debcb9e08..dcd85a76ce 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -139,7 +139,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -178,7 +178,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 86818815f1..132b1bb690 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -97,7 +97,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -128,7 +128,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml index 735cef420e..14d5226105 100644 --- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml +++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml @@ -94,7 +94,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -132,7 +132,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 5194711853..bd331bea99 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -99,7 +99,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -130,7 +130,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 7ea95ecc26..0139688d8e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -205,7 +205,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false From 8d0ce728b8b07b8e1f4df7a0a8eddd4808bc0b6c Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 9 Jun 2021 14:08:49 +0800 Subject: [PATCH 410/589] - --- epmet-gateway/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 2a41a386b0..dc2dd76fda 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -255,11 +255,11 @@ - http://localhost:8081 - + + lb://epmet-auth-server - http://localhost:8082 - + + lb://epmet-admin-server lb://epmet-oss-server From 2f65ed7df551dc8e70b34fb7860f4512b205422a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Jun 2021 14:08:14 +0800 Subject: [PATCH 411/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9admin=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=9A=84rocketmq=20nameserver=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 60d62dda46..b2421ae3b5 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -136,7 +136,7 @@ false - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -172,7 +172,7 @@ false - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message From 55993c48156a317a5de4130c1adae285a0f13a2f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Jun 2021 15:14:50 +0800 Subject: [PATCH 412/589] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/MyPointTaskFormDTO.java | 31 +++++++ .../dto/result/MyPointTaskResultDTO.java | 84 +++++++++++++++++++ .../epmet/controller/ResiPointController.java | 26 ++++-- .../com/epmet/dao/UserPointActionLogDao.java | 6 ++ .../service/UserPointActionLogService.java | 9 ++ .../impl/UserPointActionLogServiceImpl.java | 37 +++++++- .../db/migration/V0.0.11__point_rule_sort.sql | 27 ++++++ .../main/resources/mapper/PointRuleDao.xml | 1 + .../mapper/UserPointActionLogDao.xml | 58 +++++++++++++ 9 files changed, 272 insertions(+), 7 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java new file mode 100644 index 0000000000..16553dcc2f --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/MyPointTaskFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 积分任务列表查询入参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/6/18 13:56 + */ +@Data +public class MyPointTaskFormDTO implements Serializable { + private static final long serialVersionUID = 8274146750217261820L; + + /** + * 当前用户Id + * */ + @NotBlank(message = "tokenDto获取userId为空") + private String userId; + + @NotBlank(message = "tokenDto获取customerId为空") + private String customerId; + /** + * 未完成：unfinished；已完成：finished；全部：all + * */ + @NotBlank(message = "未完成：unfinished；已完成：finished；全部：all") + private String type; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java new file mode 100644 index 0000000000..5effadae1f --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java @@ -0,0 +1,84 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 积分任务列表查询返参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/6/18 13:58 + */ +@Data +public class MyPointTaskResultDTO implements Serializable { + + /** + * 规则名称 + * */ + private String ruleName; + + /** + * 规则描述 + * */ + private String ruleDesc; + + /** + * 加减积分描述，举例：积分+2 + * */ + private String pointDesc; + + /** + * 完成情况描述，举例：完成0/3 + * */ + private String finishTotalDesc; + + /** + * 去完成 or 已完成 + * */ + private String finishFlag; + + /** + * 楼院小组:group；爱心互助：heart; 前端根据这个key跳转到相应页面 + * */ + private String linkPage; + + + + /** + * 事件CODE 来自事件表 + */ + // @JsonIgnore + private String eventCode; + + /** + * 操作类型 加积分:add;减积分:subtract + */ + // @JsonIgnore + private String operateType; + + /** + * 积分上限 0表示不涉及积分上限； + */ + // @JsonIgnore + private Integer upLimit; + + /** + * 获得积分值 + */ + // @JsonIgnore + private Integer point; + /** + * 已完成次数 + */ + private Integer finishedCount; + + /** + * 上限次数,-1代表没有上限 + */ + private Integer upLimitCount; + /** + * 排序 + */ + private Integer sort; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 5c3b666fa1..dde8a7dc03 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -4,10 +4,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.CommonPageUserFormDTO; -import com.epmet.dto.form.CommonUserFormDTO; -import com.epmet.dto.form.ResiAroundPartyPointRankFormDTO; -import com.epmet.dto.form.ResiPointRankFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.PointVerificationLogService; import com.epmet.service.UserPointActionLogService; @@ -15,7 +12,10 @@ import com.epmet.service.UserPointStatisticalDailyService; import com.epmet.service.UserPointTotalService; import com.epmet.utils.ModuleConstant; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -156,4 +156,20 @@ public class ResiPointController { List resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO); return new Result>().ok(resultDTOS); } + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param tokenDto + * @param formDTO + * @author yinzuomei + * @description 积分任务列表 + * @Date 2021/6/18 14:19 + **/ + @PostMapping("mytasklist") + public Result> queryMyPointTaskList(@LoginUser TokenDto tokenDto,@RequestBody MyPointTaskFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(pointActionLogService.queryMyPointTaskList(formDTO)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java index a2c1963e85..1db465d453 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; import com.epmet.entity.UserPointActionLogEntity; import org.apache.ibatis.annotations.Mapper; @@ -63,4 +64,9 @@ public interface UserPointActionLogDao extends BaseDao * @return java.lang.Integer */ Integer selectIncrease(@Param("type")String type, @Param("objectId")String objectId); + + List queryMyPointTaskList(@Param("customerId")String customerId, + @Param("userId")String userId, + @Param("type")String type, + @Param("dateId")String dateId); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java index 892fd67a11..5f2d290436 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java @@ -22,6 +22,8 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.form.MyPointTaskFormDTO; +import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; import com.epmet.entity.UserPointActionLogEntity; import dto.form.SendPointFormDTO; @@ -133,4 +135,11 @@ public interface UserPointActionLogService extends BaseService + */ + List queryMyPointTaskList(MyPointTaskFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index af4b5fd499..2ab0f90528 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -35,9 +35,14 @@ import com.epmet.dto.BizPointTotalDetailDTO; import com.epmet.dto.BizPointUserTotalDetailDTO; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.form.MyPointTaskFormDTO; +import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; -import com.epmet.entity.*; +import com.epmet.entity.PointRuleEntity; +import com.epmet.entity.UserPointActionLogEntity; +import com.epmet.entity.UserPointStatisticalDailyEntity; +import com.epmet.entity.UserPointTotalEntity; import com.epmet.service.*; import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; @@ -54,7 +59,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -512,4 +516,33 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl + */ + @Override + public List queryMyPointTaskList(MyPointTaskFormDTO formDTO) { + //默认查询当天 + String dateId= DateUtils.getBeforeNDay(0); + List list=baseDao.queryMyPointTaskList(formDTO.getCustomerId(),formDTO.getUserId(),formDTO.getType(), dateId); + list.forEach(dto->{ + if(NumConstant.ZERO==dto.getUpLimit()){ + //无上限 + dto.setFinishTotalDesc("完成"+dto.getFinishedCount()); + dto.setFinishFlag("去完成"); + }else{ + dto.setFinishTotalDesc("完成".concat(String.valueOf(dto.getFinishedCount())).concat("/").concat(String.valueOf(dto.getUpLimitCount()))); + if(dto.getUpLimitCount().equals(dto.getFinishedCount())){ + dto.setFinishFlag("已完成"); + }else{ + dto.setFinishFlag("未完成"); + } + } + }); + return list; + } } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql new file mode 100644 index 0000000000..e89e9b7f80 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql @@ -0,0 +1,27 @@ +alter table point_rule_default add COLUMN SORT INT(11) COMMENT '规则显示顺序' AFTER ENABLED_FLAG ; +alter table point_rule add COLUMN SORT INT(11) COMMENT '规则显示顺序' AFTER ENABLED_FLAG ; +alter table point_rule_default add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ; +alter table point_rule add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ; + +update point_rule_default set sort='1001',LINK_PAGE='group' where EVENT_CODE='participate_one_topic' and DEL_FLAG='0'; +update point_rule_default set sort='1002',LINK_PAGE='group' where EVENT_CODE='publish_one_topic' and DEL_FLAG='0'; +update point_rule_default set sort='1003',LINK_PAGE='group' where EVENT_CODE='invite_resi_into_group' and DEL_FLAG='0'; +update point_rule_default set sort='1004',LINK_PAGE='group' where EVENT_CODE='invite_new_into_group' and DEL_FLAG='0'; +update point_rule_default set sort='1005',LINK_PAGE='group' where EVENT_CODE='leader_resolve_topic' and DEL_FLAG='0'; +update point_rule_default set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0'; +update point_rule_default set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0'; +update point_rule_default set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0'; +update point_rule_default set sort='2001',LINK_PAGE='heart' where EVENT_CODE='register_volunteer' and DEL_FLAG='0'; +update point_rule_default set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0'; + + +update point_rule set sort='1001',LINK_PAGE='group' where EVENT_CODE='participate_one_topic' and DEL_FLAG='0'; +update point_rule set sort='1002',LINK_PAGE='group' where EVENT_CODE='publish_one_topic' and DEL_FLAG='0'; +update point_rule set sort='1003',LINK_PAGE='group' where EVENT_CODE='invite_resi_into_group' and DEL_FLAG='0'; +update point_rule set sort='1004',LINK_PAGE='group' where EVENT_CODE='invite_new_into_group' and DEL_FLAG='0'; +update point_rule set sort='1005',LINK_PAGE='group' where EVENT_CODE='leader_resolve_topic' and DEL_FLAG='0'; +update point_rule set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0'; +update point_rule set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0'; +update point_rule set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0'; +update point_rule set sort='2001',LINK_PAGE='heart' where EVENT_CODE='register_volunteer' and DEL_FLAG='0'; +update point_rule set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0'; \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml index c18c78976b..f6518db3bc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml @@ -33,6 +33,7 @@ CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND FUNCTION_ID = #{functionId,jdbcType=VARCHAR} AND DEL_FLAG = '0' + order by sort asc UPDATE point_rule diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index c7c6bf89c2..3986eb6e0b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -73,4 +73,62 @@ AND OBJECT_ID = #{objectId} AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d') + + \ No newline at end of file From 17eb4412164d697d66082ad40f9bb014948180f8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 11:02:17 +0800 Subject: [PATCH 413/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/impl/CustomerAgencyServiceImpl.java | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java index b26843ac19..1285a8c625 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java @@ -119,33 +119,6 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService { return resultList; } - @Override - public List queryAgencyListByCustomerId(String customerId) { - return customerAgencyDao.queryAgencyListByCustomerId(customerId); - } - - /** - * 根据组织id查询基本信息 - * - * @param agencyId - * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity - */ - @Override - public CustomerAgencyEntity getAgencyById(String agencyId) { - return customerAgencyDao.selectById(agencyId); - } - - /** - * 查询部门所属组织信息 - * - * @param deptId - * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity - */ - @Override - public CustomerAgencyEntity getAgencyByDeptId(String deptId) { - return customerAgencyDao.selectByDeptId(deptId); - } - /** * 将孔村、榆山、锦水3个街道的组织插入到gov-org库的customer_agency * From 6e178367098e01fcb6cd5a28cb34e03733b59c91 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 7 Jul 2021 13:56:38 +0800 Subject: [PATCH 414/589] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/org/impl/CustomerGridServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java index eb59168f41..d21e91cb36 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java @@ -73,6 +73,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getCustomerStaffGridList(String customerId) { - return customerGridDao.getCustomerStaffGridList(customerId); + return baseDao.getCustomerStaffGridList(customerId); } } From 59d5d5c8c94a4ae2521b4eee8879a1014fda88be Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 12 Jul 2021 16:53:22 +0800 Subject: [PATCH 415/589] bug --- epmet-user/epmet-user-server/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 667b9ba7c2..8ea743c87e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -61,6 +61,7 @@ spring: password: @spring.datasource.druid.password@ baseline-on-migrate: true baseline-version: 0 + validate-on-migrate: false cloud: nacos: discovery: From 99a1d3b057530e72f7d0f1c9be168ff087e70b29 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 22 Jul 2021 16:23:19 +0800 Subject: [PATCH 416/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=A0=B9=E6=8D=AEcurrentAgencyId=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF,=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=8A=A5=E9=94=99=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=A9=BA=E6=9D=83=E9=99=90=E5=88=97=E8=A1=A8=E5=8D=B3?= =?UTF-8?q?=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AccessServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java index 09727f5e56..541ac5ee9e 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -439,6 +439,7 @@ public class AccessServiceImpl implements AccessService { @Override public Set listOperationPermissions(String staffId, String currAgencyId) { + Set filtedOps = new HashSet<>(); LoginUserDetailsResultDTO userDetails = getLoginUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId()); if (userDetails == null) { @@ -476,7 +477,8 @@ public class AccessServiceImpl implements AccessService { CustomerAgencyDTO currAgencyDto = currAgencyRst.getData(); if (currAgencyDto == null || currAgencyDto.getId() == null) { - throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在"); + return filtedOps; + //throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在"); } // 获取机关单位中的角色 @@ -489,8 +491,6 @@ public class AccessServiceImpl implements AccessService { String currOrgIdPath = getOrgIdPath(currAgencyDto); String currOrgRelation = getCurrOrgRelation(belongOrgIdPath, currOrgIdPath); - Set filtedOps = new HashSet<>(); - if (!CollectionUtils.isEmpty(roleList)) { roleList.forEach(role -> { List opeAndScopeDTO = listAllRoleOperationScopesByRoleId(role.getId()); From 25e9a5f04e7899af8c79820e7a5479752c0768ed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 28 Jul 2021 13:43:21 +0800 Subject: [PATCH 417/589] =?UTF-8?q?crm=E5=90=AF=E5=8A=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/OperCustomizeOpenFeignClient.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 0188b619fd..54168350ff 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -5,15 +5,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerFootBarDTO; import com.epmet.dto.form.CheckFloatFootBarFormDTO; import com.epmet.dto.form.CustomerFootBarFormDTO; -import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CustomerFunctionListFormDTO; import com.epmet.dto.result.CheckFloatFootBarResultDTO; import com.epmet.dto.result.DefaultFunctionListResultDTO; -import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallback; +import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; @@ -27,7 +22,7 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ -@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeOpenFeignClientFallback.class) +@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) From bc594314f447d21f8f6f73c78cd01ebc857c2f1d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 28 Jul 2021 13:47:05 +0800 Subject: [PATCH 418/589] =?UTF-8?q?crm=E5=90=AF=E5=8A=A8=E9=94=99=E8=AF=AF?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 54168350ff..6803e7a609 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -22,7 +22,7 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ -@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeOpenFeignClientFallbackFactory.class) +@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) From b7c337afe9ab3757bf56b50527c7fb5bebc0366a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 11:11:14 +0800 Subject: [PATCH 419/589] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/healthcheck/HealthCheckController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index 7ad372c8cc..f3bba8d5e1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -1,10 +1,14 @@ package com.epmet.healthcheck; +import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @RestController @RequestMapping("healthcheck") public class HealthCheckController { @@ -14,8 +18,9 @@ public class HealthCheckController { * @return */ @PostMapping("http") - public Result httpHealthCheck() { - return new Result(); + public Result httpHealthCheck(HttpServletRequest request) { + String serverIp = IpUtils.getIpAddr(request); + return new Result().ok(serverIp); } } From 6d43d7430e68d59a5d04844dcae80ede5258f3b1 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 12:32:41 +0800 Subject: [PATCH 420/589] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/healthcheck/HealthCheckController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index f3bba8d5e1..d03caf495f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -19,8 +19,8 @@ public class HealthCheckController { */ @PostMapping("http") public Result httpHealthCheck(HttpServletRequest request) { - String serverIp = IpUtils.getIpAddr(request); - return new Result().ok(serverIp); + String serverName = request.getServerName(); + return new Result().ok(serverName); } } From 1b28edaeee17acebb0081fc4ac766bb8dcf0a23c Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 12:45:15 +0800 Subject: [PATCH 421/589] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/healthcheck/HealthCheckController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index d03caf495f..64d7de00bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -2,6 +2,7 @@ package com.epmet.healthcheck; import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("healthcheck") +@Slf4j public class HealthCheckController { /** @@ -20,6 +22,7 @@ public class HealthCheckController { @PostMapping("http") public Result httpHealthCheck(HttpServletRequest request) { String serverName = request.getServerName(); + log.info("健康检查：serverName:{}", serverName); return new Result().ok(serverName); } From d30a52ca5e922bb8db0697dfe77d0cdea638f91e Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 13:01:22 +0800 Subject: [PATCH 422/589] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../healthcheck/HealthCheckController.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index 64d7de00bd..2f9a0d6d7a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -1,14 +1,14 @@ package com.epmet.healthcheck; -import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.UnknownHostException; @RestController @RequestMapping("healthcheck") @@ -20,10 +20,15 @@ public class HealthCheckController { * @return */ @PostMapping("http") - public Result httpHealthCheck(HttpServletRequest request) { - String serverName = request.getServerName(); - log.info("健康检查：serverName:{}", serverName); - return new Result().ok(serverName); + public Result httpHealthCheck() { + InetAddress serverIp = null; + try { + serverIp = Inet4Address.getLocalHost(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + log.info("健康检查：serverName:{}", serverIp); + return new Result().ok(serverIp); } } From 5b0f0d08fcef2f15f6c5a2b50ab38665ba5a2817 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 16:44:44 +0800 Subject: [PATCH 423/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ribbon=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/OssFeignClient.java | 13 +++++++++++- .../fallback/OssFeignClientFallback.java | 5 +++++ .../com/epmet/controller/TestController.java | 20 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java index b5c31ef82f..c6aee484ad 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java @@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; +import java.net.UnknownHostException; + /** * OSS * @@ -32,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile; @FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory = OssFeignClientFallbackFactory.class) //@FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory = -// OssFeignClientFallbackFactory.class) +// OssFeignClientFallbackFactory.class, url = "localhost:8083") public interface OssFeignClient { /** * 文件上传 @@ -64,4 +66,13 @@ public interface OssFeignClient { } } + /** + * @Description ribbon测试 + * @return + * @author wxz + * @date 2021.08.05 16:28 + */ + @PostMapping("oss/file/test-ribbon-rcv") + Result testRibbonRcv(); + } diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java index b60e59cc19..9e5a1f5eb4 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java @@ -40,4 +40,9 @@ public class OssFeignClientFallback implements OssFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadQrCodeV2", file, customerId); } + @Override + public Result testRibbonRcv() { + return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", null); + } + } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java index 8289c4a5bf..5b624a81b0 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.*; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.UnknownHostException; @RestController @RequestMapping("test") @@ -43,4 +46,21 @@ public class TestController { } return new Result(); } + + /** + * @Description ribbon测试 + * @return + * @author wxz + * @date 2021.08.05 16:28 + */ + @PostMapping("test-ribbon-rcv") + public Result testRibbonRcv() { + InetAddress localHost = null; + try { + localHost = Inet4Address.getLocalHost(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + return new Result().ok(localHost); + } } From 9bffeef2b1f70807860917dcad8d0cb7a775235c Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 17:30:01 +0800 Subject: [PATCH 424/589] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ribbon=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/TestFormDTO.java | 14 ++++++++++++++ .../main/java/com/epmet/feign/OssFeignClient.java | 6 ++++-- .../feign/fallback/OssFeignClientFallback.java | 4 +++- .../java/com/epmet/controller/TestController.java | 6 +++++- .../com/epmet/modules/test/TestController.java | 13 +++++++++++++ 5 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java new file mode 100644 index 0000000000..c78ca8d074 --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TestFormDTO { + + private Long sleepPeriod; + +} diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java index c6aee484ad..98142da53a 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java @@ -10,6 +10,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.fallback.OssFeignClientFallback; import com.epmet.feign.fallback.OssFeignClientFallbackFactory; @@ -19,6 +20,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; @@ -72,7 +74,7 @@ public interface OssFeignClient { * @author wxz * @date 2021.08.05 16:28 */ - @PostMapping("oss/file/test-ribbon-rcv") - Result testRibbonRcv(); + @PostMapping("/oss/test/test-ribbon-rcv") + Result testRibbonRcv(@RequestBody TestFormDTO input); } diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java index 9e5a1f5eb4..f5e51ee96c 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java @@ -11,9 +11,11 @@ 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.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.OssFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; /** @@ -41,7 +43,7 @@ public class OssFeignClientFallback implements OssFeignClient { } @Override - public Result testRibbonRcv() { + public Result testRibbonRcv(@RequestBody TestFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", null); } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java index 5b624a81b0..a1ebfe9f7b 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.service.OssService; import org.apache.commons.io.FileUtils; @@ -54,12 +55,15 @@ public class TestController { * @date 2021.08.05 16:28 */ @PostMapping("test-ribbon-rcv") - public Result testRibbonRcv() { + public Result testRibbonRcv(@RequestBody TestFormDTO input) { InetAddress localHost = null; try { + Thread.sleep(input.getSleepPeriod()); localHost = Inet4Address.getLocalHost(); } catch (UnknownHostException e) { e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); } return new Result().ok(localHost); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java index c86286bfc5..6e7c165532 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java @@ -2,6 +2,9 @@ package com.epmet.modules.test; import com.epmet.commons.tools.utils.HttpContextUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.TestFormDTO; +import com.epmet.feign.OssFeignClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +15,9 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("test") public class TestController { + @Autowired + private OssFeignClient ossFeignClient; + @PostMapping("get-req-info") public Result testDomain(HttpServletRequest request) { String requestServerNameAndPort = HttpContextUtils.getRequestServerNameAndPort(); @@ -27,4 +33,11 @@ public class TestController { return new Result(); } + @PostMapping("test-ribbon-sender") + public Result testRibbonSender() { + TestFormDTO form = new TestFormDTO(40000l); + Result result = ossFeignClient.testRibbonRcv(form); + return result; + } + } From 27ff8fd323666641031da13c6c5e3c9e7e2451d4 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 6 Aug 2021 09:35:50 +0800 Subject: [PATCH 425/589] - --- .../main/java/com/epmet/dto/form/TestFormDTO.java | 14 -------------- .../main/java/com/epmet/feign/OssFeignClient.java | 9 ++------- .../feign/fallback/OssFeignClientFallback.java | 8 +++----- .../java/com/epmet/controller/TestController.java | 8 +++----- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java deleted file mode 100644 index c78ca8d074..0000000000 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.epmet.dto.form; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class TestFormDTO { - - private Long sleepPeriod; - -} diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java index 98142da53a..efabecb484 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java @@ -10,9 +10,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.feign.fallback.OssFeignClientFallback; import com.epmet.feign.fallback.OssFeignClientFallbackFactory; import feign.codec.Encoder; import feign.form.spring.SpringFormEncoder; @@ -20,13 +18,10 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import java.net.UnknownHostException; - /** * OSS * @@ -74,7 +69,7 @@ public interface OssFeignClient { * @author wxz * @date 2021.08.05 16:28 */ - @PostMapping("/oss/test/test-ribbon-rcv") - Result testRibbonRcv(@RequestBody TestFormDTO input); + @PostMapping("/oss/test/test-ribbon-rcv/{sleep}") + Result testRibbonRcv(@RequestParam("sleep") Long sleep); } diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java index f5e51ee96c..06b01a6e76 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java @@ -11,11 +11,9 @@ 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.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.OssFeignClient; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.multipart.MultipartFile; /** @@ -43,8 +41,8 @@ public class OssFeignClientFallback implements OssFeignClient { } @Override - public Result testRibbonRcv(@RequestBody TestFormDTO input) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", null); + public Result testRibbonRcv(@PathVariable Long sleep) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", sleep); } } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java index a1ebfe9f7b..ab580e8bf0 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java @@ -1,8 +1,6 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.TestFormDTO; -import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.service.OssService; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -54,11 +52,11 @@ public class TestController { * @author wxz * @date 2021.08.05 16:28 */ - @PostMapping("test-ribbon-rcv") - public Result testRibbonRcv(@RequestBody TestFormDTO input) { + @PostMapping("test-ribbon-rcv/{sleep}") + public Result testRibbonRcv(@PathVariable("sleep") Long sleep) { InetAddress localHost = null; try { - Thread.sleep(input.getSleepPeriod()); + Thread.sleep(sleep); localHost = Inet4Address.getLocalHost(); } catch (UnknownHostException e) { e.printStackTrace(); From d4914e12f4a34c3ccb7a87a744e9ebba38b31307 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 23 Aug 2021 17:25:20 +0800 Subject: [PATCH 426/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/controller/EpmetUserController.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 9d7855a468..d654ab02fb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -8,12 +8,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.GridMemberStatsFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; @@ -271,13 +265,5 @@ public class EpmetUserController { return new Result().ok(epmetUserService.getStaffInfo(staffId)); } - @GetMapping("export/staffpatroll") - public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception { - ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class); - formDTO.setUserId(tokenDto.getUserId()); - //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725"); - List resultDTOS = epmetUserService.staffPatrolList(formDTO); - ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class); - } } From b9c2eb6f35fc450d0a139ad2816043d073ce02b8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 23 Aug 2021 17:29:07 +0800 Subject: [PATCH 427/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/EpmetUserOpenFeignClient.java | 9 --------- .../feign/fallback/EpmetUserOpenFeignClientFallback.java | 5 ----- 2 files changed, 14 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 6b874c73f8..7dd60fed83 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -626,13 +626,4 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/staffrole/queryRoleStaffIds") Result> queryRoleStaffIds(@RequestBody RoleStaffIdFormDTO formDTO); - - /** - * @Description 查询巡查人数 - * @Param formDTO - * @author zxc - * @date 2021/8/20 10:21 上午 - */ - @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolcount") - Result patrolCount(@RequestBody PatrolCountFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 7a0e1d9b5c..e08ad9f945 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -445,9 +445,4 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> queryRoleStaffIds(RoleStaffIdFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryRoleStaffIds", formDTO); } - - @Override - public Result patrolCount(PatrolCountFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolCount", formDTO); - } } From 7b9f9ede9027698daadd37f9757797d847430f7d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 11:06:23 +0800 Subject: [PATCH 428/589] =?UTF-8?q?=E5=88=A0=E9=99=A4test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/modules/test/TestController.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java index 6e7c165532..d57eba9d90 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java @@ -2,7 +2,6 @@ package com.epmet.modules.test; import com.epmet.commons.tools.utils.HttpContextUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.TestFormDTO; import com.epmet.feign.OssFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -33,11 +32,5 @@ public class TestController { return new Result(); } - @PostMapping("test-ribbon-sender") - public Result testRibbonSender() { - TestFormDTO form = new TestFormDTO(40000l); - Result result = ossFeignClient.testRibbonRcv(form); - return result; - } } From 716a8edf67564d8ca64a708c04d0ba9438079e6b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 15:01:38 +0800 Subject: [PATCH 429/589] ? --- .../src/main/resources/mapper/ResiEventDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 1dabf75712..41ad872a2a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -52,8 +52,7 @@ LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' - AND rea.ATTACHMENT_TYPE = 'image' - AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2)) + AND rea.ATTACHMENT_TYPE = 'image') order by rea.sort asc From 18bfe54860162d5c4256385ee4a90a6fadb57503 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 15:05:04 +0800 Subject: [PATCH 430/589] ? --- .../src/main/resources/mapper/ResiEventDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 41ad872a2a..0f74c3a701 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -50,9 +50,9 @@ )t LEFT JOIN resi_event_attachment rea - ON (rea.RESI_EVENT_ID = t.eventId - AND rea.DEL_FLAG = '0' - AND rea.ATTACHMENT_TYPE = 'image') + ON (rea.RESI_EVENT_ID = t.eventId) + where rea.DEL_FLAG = '0' + AND rea.ATTACHMENT_TYPE = 'image' order by rea.sort asc From 1acf472b3fcbd3fc87340e284cf26a288a915fa0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 26 Aug 2021 10:18:09 +0800 Subject: [PATCH 431/589] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9C=80=E5=A4=9A=E8=BE=93=E5=85=A5500=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/InfoServiceImpl.java | 20 +++++++++++-------- .../migration/V0.3.14__create_info_table.sql | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 3ec318507f..aa74cd8e2a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -107,6 +107,7 @@ public enum EpmetErrorCode { REPLY_INFO_CONTENT_NOT_NULL(8610,"回复内容不能为空"), PLEASE_CHOOSE_MEMBER(8611,"请选择成员"), INFO_GROUP_NAME_EXISTS(8612,"名称已存在"), + INFO_REPLY_CONTENT_LENGTH_LIMIT(8613,"回复内容最多输入500字"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java index 684b4ebd50..87c90c9cc7 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java @@ -17,12 +17,12 @@ package com.epmet.service.impl; -import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -99,7 +99,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem Set orgStaffIds=queryOrgStaffIds(formDTO.getCustomerId(),formDTO.getOrgList()); Set roleStaffIds=queryRoleStaffIds(formDTO.getRoleIdList(),formDTO.getCustomerId()); Set groupStaffIds = CollectionUtils.isNotEmpty(formDTO.getGroupIdList()) ? infoGroupReceiversDao.selectStaffIds(formDTO.getGroupIdList()) : Collections.EMPTY_SET; - log.info("群组选择的人："+JSON.toJSONString(groupStaffIds,true)); + //log.info("群组选择的人："+JSON.toJSONString(groupStaffIds,true)); //3、计算接收人： Set totalReceiver=new LinkedHashSet(); @@ -222,10 +222,14 @@ public class InfoServiceImpl extends BaseServiceImpl implem @Override public ReplyInfoResultDTO replyInfo(ReplyInfoFormDTO formDTO) { //1、插入回复记录、回复附件 - //内容和附件 2选一 + // 2、内容和附件 2选一 if(StringUtils.isBlank(formDTO.getContent())&&CollectionUtils.isEmpty(formDTO.getAttachmentList())){ throw new RenException(EpmetErrorCode.REPLY_INFO_CONTENT_NOT_NULL.getCode(), EpmetErrorCode.REPLY_INFO_CONTENT_NOT_NULL.getMsg()); } + // 3、回复内容不能超过500字 + if(StringUtils.isNotBlank(formDTO.getContent())&&formDTO.getContent().length()>500){ + throw new RenException(EpmetErrorCode.INFO_REPLY_CONTENT_LENGTH_LIMIT.getCode(), EpmetErrorCode.INFO_REPLY_CONTENT_LENGTH_LIMIT.getMsg()); + } InfoReplyEntity infoReplyEntity=new InfoReplyEntity(); infoReplyEntity.setInfoId(formDTO.getInfoId()); infoReplyEntity.setCustomerId(formDTO.getCustomerId()); @@ -353,11 +357,11 @@ public class InfoServiceImpl extends BaseServiceImpl implem OrgStaffFormDTO orgStaffFormDTO=new OrgStaffFormDTO(); orgStaffFormDTO.setCustomerId(customerId); for(OrgCommonDTO org:orgList){ - if("grid".equals(org.getOrgType())){ + if(OrgTypeEnum.GRID.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getGridIds().add(org.getOrgId()); - }else if("agency".equals(org.getOrgType())){ + }else if(OrgTypeEnum.AGENCY.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getAgencyIds().add(org.getOrgId()); - }else if("dept".equals(org.getOrgType())){ + }else if(OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getDeptIds().add(org.getOrgId()); } } @@ -366,7 +370,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem throw new RenException("根据组织查询工作人员异常"); } if(CollectionUtils.isEmpty(result.getData())){ - log.info("已选择的架构里没有工作人员"); + log.warn("已选择的架构里没有工作人员"); return Collections.EMPTY_SET; } return result.getData(); @@ -393,7 +397,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem throw new RenException("根据角色查询工作人员异常"); } if(CollectionUtils.isEmpty(result.getData())){ - log.info("角色下没有工作人员"); + log.warn("角色下没有工作人员"); return Collections.EMPTY_SET; } return result.getData(); diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql index 820e8ca67c..d13a3e6de3 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql @@ -127,7 +127,7 @@ CREATE TABLE `info_reply_content` ( `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名', `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', `REPLY_TYPE` varchar(64) NOT NULL COMMENT '回复的类型（文本-text、图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', - `CONTENT` varchar(255) NOT NULL COMMENT '如果是文本对应的是文字，如果是其他类型，对应的是url', + `CONTENT` varchar(512) NOT NULL COMMENT '如果是文本对应的是文字，如果是其他类型，对应的是url', `SORT` int(1) NOT NULL COMMENT '排序字段', `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b', `DURATION` int(11) unsigned DEFAULT '0' COMMENT '语音或视频时长，秒', From 3b4c455df9a07f84c018b86753e0dede9d0987f1 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 2 Sep 2021 17:12:10 +0800 Subject: [PATCH 432/589] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Ajob=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/config/ScheduleConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java index 199da6b24d..a20624fa18 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java @@ -46,6 +46,7 @@ public class ScheduleConfig { prop.put("org.quartz.jobStore.misfireThreshold", "12000"); prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); + prop.put("org.quartz.jobStore.acquireTriggersWithinLock", "true"); //PostgreSQL数据库，需要打开此注释 //prop.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate"); From d6888275d186432b33c32e1d7031abaeb2af5721 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Sep 2021 18:44:17 +0800 Subject: [PATCH 433/589] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmetuser/EpmetUserService.java | 8 ---- .../epmetuser/impl/EpmetUserServiceImpl.java | 41 ------------------- 2 files changed, 49 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 7819be0d10..9718ae57b2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,7 +1,5 @@ package com.epmet.dataaggre.service.epmetuser; -import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; -import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; @@ -149,10 +147,4 @@ public interface EpmetUserService { */ StaffDetailV2FormDTO selectByStaffId(String staffId); - /** - * @Param formDTO - * @Description 对外接口--网格员排名-巡查记录 - * @author sun - */ - List gridMemberPatrolList(GridMemberPatrolListFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 73e7a85774..92a02290bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -696,46 +696,5 @@ public class EpmetUserServiceImpl implements EpmetUserService { return result; } - /** - * @Param formDTO - * @Description 对外接口--网格员排名-巡查记录 - * @author sun - */ - @Override - public List gridMemberPatrolList(GridMemberPatrolListFormDTO formDTO) { - //1.查询当前组织及下级所有网格员维度对应最大dated数据【例查询2021年8月数据，则是查询8月对应的最大daeId那天的网格员数据】 - List resultList = dataStatsService.getGirdMemberPatrol(formDTO); - if (CollectionUtils.isEmpty(resultList)) { - return new ArrayList<>(); - } - - //2.按维度汇总当前组织及下级网格员巡查数据 - //【如果查询当前月或本年度数据，则需要排除最大dateId的数据，因为上边查的统计数据只有t-1的，巡查数据是t的，避免多计算了当天的巡查项目数和时长数】 - formDTO.setDateId(resultList.get(0).getDateId()); - List patrolList = staffPatrolRecordDao.gridMemberPatrol(formDTO); - - //3.以统计数据为准封装结果数据 - resultList.forEach(re -> patrolList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> { - re.setReportProjectCount(s.getReportProjectCount()); - re.setPatrolTotalTime((s.getTimeNum() > NumConstant.ZERO ? s.getTimeNum() / 60 : 0)); - })); - - //4.按排序字段排序并返回 - Collections.sort(resultList, new Comparator() { - @Override - public int compare(GridMemberPatrolListResultDTO o1, GridMemberPatrolListResultDTO o2) { - if ("patrolTime".equals(formDTO.getSort())) { - return o2.getPatrolTotalTime().compareTo(o1.getPatrolTotalTime()); - } else if ("dealEvent".equals(formDTO.getSort())) { - return o2.getEventCount().compareTo(o1.getEventCount()); - } else { - return o2.getReportProjectCount().compareTo(o1.getReportProjectCount()); - } - } - }); - - return resultList; - } - } From 33489a7aa1255ca24c9e4c1ea92d257f90d83aee Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 9 Sep 2021 09:28:10 +0800 Subject: [PATCH 434/589] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LoginController.java | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java index f70495eb51..05d95c9a97 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java @@ -23,6 +23,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; /** * @Description 通用登录接口 @@ -121,4 +124,86 @@ public class LoginController { } return new Result().ok(""); } + //================start test code========== + /** + * 校验签名 + */ + public static boolean checkSignature(String signature, String timestamp, String nonce) { + System.out.println("signature:" + signature + "timestamp:" + timestamp + "nonc:" + nonce); + String WECHAT_TOKEN = "1jkoyyih83nj8"; + String[] arr = new String[]{WECHAT_TOKEN, timestamp, nonce}; + // 将token、timestamp、nonce三个参数进行字典序排序 + Arrays.sort(arr); + StringBuilder content = new StringBuilder(); + for (int i = 0; i < arr.length; i++) { + content.append(arr[i]); + } + MessageDigest md = null; + String tmpStr = null; + + try { + md = MessageDigest.getInstance("SHA-1"); + // 将三个参数字符串拼接成一个字符串进行sha1加密 + byte[] digest = md.digest(content.toString().getBytes()); + tmpStr = byteToStr(digest); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + + content = null; + // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 + System.out.println(tmpStr.equals(signature.toUpperCase())); + return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; + } + + /** + * 将字节数组转换为十六进制字符串 + * + * @param byteArray + * @return + */ + private static String byteToStr(byte[] byteArray) { + String strDigest = ""; + for (int i = 0; i < byteArray.length; i++) { + strDigest += byteToHexStr(byteArray[i]); + } + return strDigest; + } + + /** + * 将字节转换为十六进制字符串 + * + * @param mByte + * @return + */ + private static String byteToHexStr(byte mByte) { + char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; + char[] tempArr = new char[2]; + tempArr[0] = Digit[(mByte >>> 4) & 0X0F]; + tempArr[1] = Digit[mByte & 0X0F]; + + String s = new String(tempArr); + return s; + } + + + /** + * 打开开发者模式签名认证 + * @param signature + * @param timestamp + * @param nonce + * @param echostr + * @return + */ + @ResponseBody + @RequestMapping(value = "/service", method = RequestMethod.GET) + public Object defaultView(String signature, String timestamp, String nonce, String echostr) { + if (echostr == null || echostr.isEmpty()) { + return nonce; + } + if (this.checkSignature(signature, timestamp, nonce)) { + return echostr; + } + return nonce; + } } From 6ef1467c4556653934e5d9f74b41726441b3f5f8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 9 Sep 2021 09:36:50 +0800 Subject: [PATCH 435/589] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 4f65034c7d..76ad4324d9 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -466,12 +466,16 @@ epmet: - /data/aggregator/** - /gov/voice/** - /resi/voice/** + - /epmet/point/** # 内部认证url白名单(在白名单中的，就不会再校验登录了) internalAuthUrlsWhiteList: - /epmetuser/customerstaff/customerlist + - /auth/wechat/** + - /**/druid/** - /gov/project/project/platformcallback - /oper/customize/customerstartpage/homestartpage + - /epmet/point/mqCallback/** # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: From 17b81e5d9d3f6b040ec2997dbd07a685b3dc0c72 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Sep 2021 16:17:22 +0800 Subject: [PATCH 436/589] test --- .../epmettduck/form/ItemResDetailFormDTO.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java index a107080eea..ee8fd8d50b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java @@ -2,8 +2,6 @@ package com.epmet.dataaggre.dto.epmettduck.form; import lombok.Data; -import javax.validation.constraints.NotBlank; - /** * @Description 问卷-数据分析-查看详情 * @Author yinzuomei @@ -12,13 +10,13 @@ import javax.validation.constraints.NotBlank; @Data public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{ - @NotBlank(message = "formItemId不能为空",groups = AddUserInternalGroup.class) - private String formItemId; - /** - * 表单项类型 - */ - @NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class) - private String type; + //@NotBlank(message = "formItemId不能为空",groups = AddUserInternalGroup.class) + //private String formItemId; + ///** + // * 表单项类型 + // */ + //@NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class) + //private String type; /** From cdcb0a3d053f00653d8bcf9f6d25c4e6f13b05f6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Sep 2021 16:25:15 +0800 Subject: [PATCH 437/589] test --- .../epmettduck/form/ItemResDetailFormDTO.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java index ee8fd8d50b..a107080eea 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java @@ -2,6 +2,8 @@ package com.epmet.dataaggre.dto.epmettduck.form; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * @Description 问卷-数据分析-查看详情 * @Author yinzuomei @@ -10,13 +12,13 @@ import lombok.Data; @Data public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{ - //@NotBlank(message = "formItemId不能为空",groups = AddUserInternalGroup.class) - //private String formItemId; - ///** - // * 表单项类型 - // */ - //@NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class) - //private String type; + @NotBlank(message = "formItemId不能为空",groups = AddUserInternalGroup.class) + private String formItemId; + /** + * 表单项类型 + */ + @NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class) + private String type; /** From 1b5f8318c4c3384a03ffeedaa0ced54464b59958 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 24 Sep 2021 19:35:58 +0800 Subject: [PATCH 438/589] =?UTF-8?q?wxz=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index c0b1e136a9..65626c09a4 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -161,7 +161,7 @@ false - true + false false From 89969b7f756d9f1c571d5569e58dbfff4b8702c3 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 24 Sep 2021 19:40:13 +0800 Subject: [PATCH 439/589] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E5=B0=91?= =?UTF-8?q?=E4=BA=86=E5=88=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fbb937f2ba..727d1536da 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 @@ -297,7 +297,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId()); deleteGridFormDTO.setUserId(tokenDto.getUserId()); if (userIdDTOS.size()==0){ From 57c4bdb324b918bddf634293b71981723346bd60 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 24 Sep 2021 19:43:32 +0800 Subject: [PATCH 440/589] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 8465f6b39f..875ef12cb3 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -134,7 +134,7 @@ false - true + false diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 65626c09a4..c0b1e136a9 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -161,7 +161,7 @@ false - false + true false From a8ff5e172a1051baa9cb263b0c31c063cfbe9039 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 24 Sep 2021 19:49:58 +0800 Subject: [PATCH 441/589] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 875ef12cb3..8465f6b39f 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -134,7 +134,7 @@ false - false + true From 92472ed994d7e8bd53457cb6b7f19cf450f50edc Mon Sep 17 00:00:00 2001 From: wxz Date: Sat, 16 Oct 2021 23:17:16 +0800 Subject: [PATCH 442/589] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=AF=91=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/ScreenCustomerAgencyEntity.java | 1 - .../entity/evaluationindex/screen/ScreenCustomerGridEntity.java | 1 - 2 files changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java index 4fc6f6bee8..475e9907bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java @@ -94,7 +94,6 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity { * 行政地区编码 */ private String areaCode; - private String code; private String sourceType; /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java index 5a2b97896a..cbe1c62956 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java @@ -39,7 +39,6 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity { * 客户id */ private String customerId; - private String code; /** * 网格id From 6a4f8f55292ec87f7891994041dd0511d457353a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Oct 2021 14:09:33 +0800 Subject: [PATCH 443/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.epmet-c?= =?UTF-8?q?ommon-tools=E6=A8=A1=E5=9D=97=E4=B8=AD=EF=BC=8C=E5=B0=86FeignCo?= =?UTF-8?q?nfig.java=E5=81=9A=E4=BA=86=E8=B0=83=E6=95=B4=EF=BC=8CRequestIn?= =?UTF-8?q?terceptor=E7=9A=84=E5=AE=9E=E4=BE=8B=E5=8C=96=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=81=9A=E4=BA=86=E8=B0=83=E6=95=B4=E3=80=82=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96epmet-common-tools=E7=9A=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E8=87=AA=E5=AE=9A=E4=B9=89RequestInterceptor=202.job?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84RequestInterceptor=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=94=9F?= =?UTF-8?q?=E6=88=90tran-serial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetBaseRequestInterceptor.java | 35 +++++++++++ .../commons/tools/feign/FeignConfig.java | 41 ++++--------- .../java/com/epmet/config/JobFeignConfig.java | 59 +++++++++++++++++++ 3 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java new file mode 100644 index 0000000000..7fb9822290 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java @@ -0,0 +1,35 @@ +package com.epmet.commons.tools.feign; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; + + +public class EpmetBaseRequestInterceptor implements RequestInterceptor { + + @Override + public void apply(RequestTemplate template) { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if (requestAttributes == null) { + return; + } + + HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); + Enumeration headerNames = request.getHeaderNames(); + if (headerNames != null) { + while (headerNames.hasMoreElements()) { + String name = headerNames.nextElement(); + Enumeration values = request.getHeaders(name); + while (values.hasMoreElements()) { + String value = values.nextElement(); + template.header(name, value); + } + } + } + } +} \ No newline at end of file diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java index c68dbc2913..ec7806a620 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -10,49 +10,32 @@ package com.epmet.commons.tools.feign; import feign.Logger; import feign.RequestInterceptor; -import feign.RequestTemplate; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Enumeration; /** * Feign调用，携带header + * 各服务可以自定义自己的RequestInterceptor，如果自定义了，此处不会再生效，会优先使用自定义的拦截器实例 * * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ @Configuration -public class FeignConfig implements RequestInterceptor { - @Override - public void apply(RequestTemplate template) { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - if (requestAttributes == null) { - return; - } - - HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); - Enumeration headerNames = request.getHeaderNames(); - if (headerNames != null) { - while (headerNames.hasMoreElements()) { - String name = headerNames.nextElement(); - Enumeration values = request.getHeaders(name); - while (values.hasMoreElements()) { - String value = values.nextElement(); - template.header(name, value); - } - } - } +public class FeignConfig { + @Bean + @ConditionalOnMissingBean + RequestInterceptor requestInterceptor() { + return new EpmetBaseRequestInterceptor(); } @Bean + @ConditionalOnMissingBean Logger.Level feignLoggerLevel() { return Logger.Level.BASIC;//控制台会输出debug日志 } + + } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java new file mode 100644 index 0000000000..d053f347cf --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.feign.EpmetBaseRequestInterceptor; +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Feign调用，携带header + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Configuration +public class JobFeignConfig { + + @Bean + RequestInterceptor requestInterceptor() { + return new JobRequestInterceptor(); + } + + class JobRequestInterceptor extends EpmetBaseRequestInterceptor { + @Override + public void apply(RequestTemplate template) { + super.apply(template); + + // job服务自己生成流水号 + template.header(AppClientConstant.TRANSACTION_SERIAL_KEY, generateTransactionSerial()); + } + + /** + * 获取事务流水号 + * + * @return + */ + public String generateTransactionSerial() { + String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n" + , "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"}; + + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 2; i++) { + sb.append(letterPool[(int) (Math.random() * 25)]); + } + + sb.append(System.currentTimeMillis()); + return sb.toString(); + } + } +} \ No newline at end of file From dd3f09bfe71093c8c88db382b32b2d74b74615d9 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 4 Nov 2021 10:31:27 +0800 Subject: [PATCH 444/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E6=89=BE?= =?UTF-8?q?=E5=9B=9E=E5=90=88=E5=B9=B6=E4=B8=A2=E5=A4=B1=E7=9A=84girdEntit?= =?UTF-8?q?y=E7=9A=84code=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/ScreenCustomerGridEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java index 4a0d8e53c8..cf6c373dca 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java @@ -92,4 +92,9 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity { * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14 */ private String upToCal; + + /** + * 地区码 + */ + private String code; } From 7eec94a97ad97c48efa2c95ffc7227b591f34f0f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 8 Nov 2021 14:49:30 +0800 Subject: [PATCH 445/589] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/CustomerAgencyService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index ec145a5dfb..4cacf505ef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -263,6 +263,4 @@ public interface CustomerAgencyService extends BaseService * @return */ AgencyTreeResultDTO getOrgTreeData(String staffId); - - List getStaffOrgListByStaffId(String staffId); } From 08a358dd712c0a3d2c72d580bc68cd39f57c725d Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 8 Nov 2021 14:53:07 +0800 Subject: [PATCH 446/589] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/CustomerAgencyService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index ec145a5dfb..b9292396d8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -255,8 +255,6 @@ public interface CustomerAgencyService extends BaseService */ AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO); - List getStaffOrgListByStaffId(String staffId); - /** * desc:获取用户所属组织的组织及网格树 * @param staffId From 89a29eb4f2cd43543e17223ba41b3b7d9de4b28c Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 8 Nov 2021 14:57:03 +0800 Subject: [PATCH 447/589] =?UTF-8?q?Revert=20"=E5=90=88=E5=B9=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 08a358dd --- .../src/main/java/com/epmet/service/CustomerAgencyService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 96932318db..4cacf505ef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -255,6 +255,8 @@ public interface CustomerAgencyService extends BaseService */ AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO); + List getStaffOrgListByStaffId(String staffId); + /** * desc:获取用户所属组织的组织及网格树 * @param staffId From cd5ab4a3a6c23e6e5f281d21eba6dd226a6dee1c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 9 Nov 2021 12:40:36 +0800 Subject: [PATCH 448/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20pc?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=99=BB=E5=BD=95=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/GovWebServiceImpl.java | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java index 965869be12..8b1a2b521a 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java @@ -3,7 +3,7 @@ package com.epmet.service.impl; import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; @@ -45,6 +45,8 @@ public class GovWebServiceImpl implements GovWebService { private CpUserDetailRedis cpUserDetailRedis; @Autowired private EpmetUserFeignClient epmetUserFeignClient; + @Autowired + private ThirdLoginServiceImpl thirdLoginService; /** * @param formDTO @@ -60,12 +62,12 @@ public class GovWebServiceImpl implements GovWebService { throw new RenException("当前接口只适用于PC工作端运营管理后台"); } //2.验证码校验 - boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha()); - if (!flag) { - logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone())); - //开启验证码校验 - throw new RenException(EpmetErrorCode.ERR10019.getCode()); - } + //boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha()); + //if (!flag) { + // logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone())); + // //开启验证码校验 + // throw new RenException(EpmetErrorCode.ERR10019.getCode()); + //} //3.校验登陆账号是否存在 //根据客户Id和手机号查询登陆用户信息(此处不需要判断登陆人是否是有效客户以及是否是客户的根管理员，前一接口获取登陆手机号对应客户列表已经判断了) GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO(); @@ -105,7 +107,11 @@ public class GovWebServiceImpl implements GovWebService { String token = jwtTokenUtils.createToken(map); logger.info("app:" + formDTO.getApp() + ";client:" + formDTO.getClient() + ";userId:" + userId + ";生成token[" + token + "]"); int expire = jwtTokenProperties.getExpire(); - TokenDto tokenDto = new TokenDto(); + + String orgIdPath = thirdLoginService.getOrgIdPath(userId); + String[] orgIdPathParts = orgIdPath.split(":"); + + GovTokenDto tokenDto = new GovTokenDto(); tokenDto.setCustomerId(formDTO.getCustomerId()); tokenDto.setApp(formDTO.getApp()); tokenDto.setClient(formDTO.getClient()); @@ -113,6 +119,13 @@ public class GovWebServiceImpl implements GovWebService { tokenDto.setToken(token); tokenDto.setUpdateTime(System.currentTimeMillis()); tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime()); + tokenDto.setAgencyId(orgIdPathParts[orgIdPathParts.length - 1]); + tokenDto.setRootAgencyId(orgIdPathParts[0]); + tokenDto.setDeptIdList(thirdLoginService.getDeptartmentIdList(userId)); + tokenDto.setGridIdList(thirdLoginService.getGridIdList(userId)); + tokenDto.setRoleList(thirdLoginService.queryGovStaffRoles(userId, orgIdPathParts[orgIdPathParts.length - 1])); + tokenDto.setOrgIdPath(orgIdPath); + cpUserDetailRedis.set(tokenDto, expire); logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss")); return token; From c9fc2aa90f76fca3a8a16da3b4f2a412c6411b47 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Nov 2021 16:15:32 +0800 Subject: [PATCH 449/589] =?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 --- .../test/read/CustomStringStringConverter.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/read/CustomStringStringConverter.java b/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/read/CustomStringStringConverter.java index 584e563a77..8f17f53f13 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/read/CustomStringStringConverter.java +++ b/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/read/CustomStringStringConverter.java @@ -2,8 +2,9 @@ package com.epmet.stats.test.read; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; /** @@ -13,7 +14,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; */ public class CustomStringStringConverter implements Converter { @Override - public Class supportJavaTypeKey() { + public Class supportJavaTypeKey() { return String.class; } @@ -34,8 +35,8 @@ public class CustomStringStringConverter implements Converter { * @return */ @Override - public String convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { + public String convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { return "自定义：" + cellData.getStringValue(); } @@ -51,9 +52,9 @@ public class CustomStringStringConverter implements Converter { * @return */ @Override - public CellData convertToExcelData(String value, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - return new CellData(value); + public WriteCellData convertToExcelData(String value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + return new WriteCellData<>(value); } } From d272d7dccf4419ef2ed4971f7b5262d80cd54fc0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 11 Nov 2021 11:56:20 +0800 Subject: [PATCH 450/589] =?UTF-8?q?=E6=9C=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/NeighborHoodServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index d7558cd110..00ea72af58 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -253,6 +253,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { if (!obj.getAgencyName().trim().equals(staffInfoCache.getAgencyName())) { numList.add(obj.getRowNum()); iterator.remove(); + continue; } //当前组织下网格名不存在的也不允许导入 AtomicBoolean br = new AtomicBoolean(true); From c018da0803921ec25ae8911a60656c9b10ae464d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 11 Nov 2021 12:01:25 +0800 Subject: [PATCH 451/589] =?UTF-8?q?=E5=88=86=E6=94=AF=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/NeighborHoodServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index 00ea72af58..d7558cd110 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -253,7 +253,6 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { if (!obj.getAgencyName().trim().equals(staffInfoCache.getAgencyName())) { numList.add(obj.getRowNum()); iterator.remove(); - continue; } //当前组织下网格名不存在的也不允许导入 AtomicBoolean br = new AtomicBoolean(true); From 466d451cd44a8a78ae91117acdc1c76f9ecab82c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 25 Nov 2021 20:37:43 +0800 Subject: [PATCH 452/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC=E8=BF=87=E7=A8=8B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8C=BA=E5=9D=97=E9=93=BE=E4=B8=8A=E9=93=BE=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/BlockChainCreateProjectFormDTO.java | 25 +++++ .../form/BlockChainProcessProjectFormDTO.java | 18 ++++ .../dto/form/BlockChainProjectFormDTO.java | 41 ++++++++ ...ainProjectProcessAssignedStaffFormDTO.java | 52 ++++++++++ .../form/BlockChainProjectProcessFormDTO.java | 50 ++++++++++ .../feign/EpmetThirdOpenFeignClient.java | 17 ++++ .../EpmetThirdOpenFeignClientFallback.java | 10 ++ .../epmet-third/epmet-third-server/pom.xml | 12 +++ .../BlockChainProjectController.java | 40 ++++++++ .../service/BlockChainUploadService.java | 19 ++++ .../impl/BlockChainUploadServiceImpl.java | 94 +++++++++++++++++++ .../impl/ProjectProcessServiceImpl.java | 19 ++++ .../service/impl/ProjectServiceImpl.java | 89 ++++++++++++++---- .../service/impl/ProjectTraceServiceImpl.java | 19 ++++ 14 files changed, 488 insertions(+), 17 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java new file mode 100644 index 0000000000..f83aad5e4e --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 区块链：创建项目form dto + */ +@Data +public class BlockChainCreateProjectFormDTO { + + @NotNull(message = "项目信息不能为空") + private BlockChainProjectFormDTO project; + + @NotNull(message = "处理进展信息不能为空") + private BlockChainProjectProcessFormDTO process; + + @NotNull(message = "指派的人员列表信息不能为空") + @NotEmpty(message = "指派的人员列表信息不能为空") + private List assignedStaffs; + +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java new file mode 100644 index 0000000000..7e910f8726 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 区块链：项目处理进展信息 + */ +@Data +public class BlockChainProcessProjectFormDTO { + + @NotNull(message = "处理进展信息不能为空") + private BlockChainProjectProcessFormDTO process; + + private List assignedStaffs; +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java new file mode 100644 index 0000000000..2477ee2f00 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +/** + * 区块链项目信息formdto + */ +@Data +public class BlockChainProjectFormDTO { + @NotBlank(message = "项目ID必填") + private String projectId; + @NotBlank(message = "客户ID必填") + private String customerId; + @NotBlank(message = "标题必填") + private String title; + @NotBlank(message = "组织ID必填") + private String agencyId; + @NotBlank(message = "项目来源必填") + private String origin; + @NotBlank(message = "项目来源ID必填") + private String originId; + @NotBlank(message = "项目状态必填") + private String status; + @NotBlank(message = "关闭状态必填") + private String closeStatus; + @NotBlank(message = "组织ID PATH必填") + private String orgIdPath; + @NotBlank(message = "定位必填") + private String locateAddress; + @NotBlank(message = "经度必填") + private String locateLongitude; + @NotBlank(message = "维度必填") + private String locateDimension; + @NotBlank(message = "创建时间必填") + private Date createdTime; + @NotBlank(message = "创建者ID必填") + private String createdBy; +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java new file mode 100644 index 0000000000..fae80e91f2 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java @@ -0,0 +1,52 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +/** + * 区块链：指派的项目处理人员 form dto + */ +@Data +public class BlockChainProjectProcessAssignedStaffFormDTO { + @NotBlank(message = "ID必填") + private String id; + + @NotBlank(message = "进展ID必填") + private String processId; + + @NotBlank(message = "项目ID必填") + private String projectId; + + @NotBlank(message = "客户ID必填") + private String customerId; + + @NotBlank(message = "组织ID必填") + private String orgId; + + @NotBlank(message = "部门ID必填") + private String departmentId; + + @NotBlank(message = "网格ID必填") + private String gridId; + + @NotBlank(message = "组织ID PATH必填") + private String orgIdPath; + + @NotBlank(message = "人员ID必填") + private String staffId; + + @NotBlank(message = "部门名称必填") + private String departmentName; + + @NotBlank(message = "是否处理必填") + private String isHandle; + + @NotBlank(message = "创建者ID必填") + private String createdBy; + + @NotBlank(message = "创建时间必填") + private Date createdTime; + +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java new file mode 100644 index 0000000000..136dec1e5e --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 区块链：项目处理form dto + */ +@Data +public class BlockChainProjectProcessFormDTO { + @NotBlank(message = "处理ID必填") + private String processId; + @NotBlank(message = "项目ID必填") + private String projectId; + @NotBlank(message = "客户ID必填") + private String customerId; + @NotBlank(message = "部门名称必填") + private String departmentName; + @NotBlank(message = "组织ID必填") + private String agencyId; + @NotBlank(message = "部门ID必填") + private String departmentId; + @NotBlank(message = "网格ID必填") + private String gridId; + @NotBlank(message = "组织ID PATH必填") + private String orgIdPath; + @NotBlank(message = "处理人员ID必填") + private String staffId; + @NotBlank(message = "操作类型必填") + private String operation; + @NotBlank(message = "操作名称必填") + private String operationName; + @NotBlank(message = "公开答复必填") + private String publicReply; + @NotBlank(message = "内部备注必填必填") + private String internalRemark; + @NotNull(message = "结束时间必填") + private Date endTime; + @NotNull(message = "是否发送到外部系统必填") + private Integer isSend; + @NotNull(message = "耗费天数必填") + private Integer costWorkDays; + @NotBlank(message = "创建者ID必填") + private String createdBy; + @NotNull(message = "创建时间必填") + private Date createdTime; +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java index f71914f828..dc5eb828df 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java @@ -54,6 +54,23 @@ public interface EpmetThirdOpenFeignClient { Result uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("customerId") String customerId, @RequestParam( "platformId") String platformId); + + /** + * 区块链：立项 + * @param input + * @return + */ + @PostMapping("/third/blockchain/project/create") + Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input); + + /** + * 区块链：处理进展 + * @param input + * @return + */ + @PostMapping("/third/blockchain/project/process") + Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input); + class MultipartSupportConfig { @Bean public Encoder feignFormEncoder() { diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java index e855799478..e257b0347b 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java @@ -49,4 +49,14 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", customerId); } + @Override + public Result blockChainCreateProject(BlockChainCreateProjectFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "createProject", input); + } + + @Override + public Result blockChainProcessProject(BlockChainProcessProjectFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "processProject", input); + } + } diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a885af4c93..84b0161a1a 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -146,6 +146,18 @@ compile + + + org.apache.rocketmq + rocketmq-client + 4.9.2 + + + org.apache.rocketmq + rocketmq-acl + 4.9.2 + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java new file mode 100644 index 0000000000..7090bc3ce0 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java @@ -0,0 +1,40 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.BlockChainCreateProjectFormDTO; +import com.epmet.dto.form.BlockChainProcessProjectFormDTO; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 区块链project相关controller + */ +@RestController +@RequestMapping("/blockchain/project") +public class BlockChainProjectController { + + /** + * 立项 + * @param input + * @return + */ + @PostMapping("create") + public Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input) { + ValidatorUtils.validateEntity(input); + return new Result(); + } + + /** + * 处理进展 + * @param input + * @return + */ + @PostMapping("process") + public Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input) { + ValidatorUtils.validateEntity(input); + return new Result(); + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java new file mode 100644 index 0000000000..a9bf0848e2 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java @@ -0,0 +1,19 @@ +package com.epmet.service; + +import com.epmet.entity.ProjectProcessEntity; +import com.epmet.entity.ProjectStaffEntity; + +import java.util.List; + +/** + * 上链service接口 + */ +public interface BlockChainUploadService { + + /** + * 数据上链 + * @param processEntity 处理进展entity + * @param assignedStaffEntities 指派给的工作人员entity + */ + void send2BlockChain(ProjectProcessEntity processEntity, List assignedStaffEntities); +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java new file mode 100644 index 0000000000..2a7f45fccb --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -0,0 +1,94 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.dao.ProjectStaffDao; +import com.epmet.dto.form.BlockChainProcessProjectFormDTO; +import com.epmet.dto.form.BlockChainProjectProcessAssignedStaffFormDTO; +import com.epmet.dto.form.BlockChainProjectProcessFormDTO; +import com.epmet.entity.ProjectProcessEntity; +import com.epmet.entity.ProjectStaffEntity; +import com.epmet.feign.EpmetThirdOpenFeignClient; +import com.epmet.service.BlockChainUploadService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 区块链上链service实现 + */ +@Service +public class BlockChainUploadServiceImpl implements BlockChainUploadService { + + @Autowired + private EpmetThirdOpenFeignClient thirdOpenFeignClient; + + @Autowired + private ProjectStaffDao projectStaffDao; + + /** + * 数据上链 + * @param processEntity 处理进展entity + * @param assignedStaffEntities 指派给的工作人员entity + */ + public void send2BlockChain(ProjectProcessEntity processEntity, List assignedStaffEntities) { + + BlockChainProjectProcessFormDTO process = new BlockChainProjectProcessFormDTO(); + process.setProcessId(processEntity.getId()); + process.setCreatedBy(processEntity.getCreatedBy()); + process.setCreatedTime(processEntity.getCreatedTime()); + String costWorkdays = processEntity.getCostWorkdays(); + process.setCostWorkDays(StringUtils.isBlank(costWorkdays) ? null : Integer.valueOf(costWorkdays)); + process.setAgencyId(processEntity.getAgencyId()); + process.setCustomerId(processEntity.getCustomerId()); + process.setDepartmentId(processEntity.getDepartmentId()); + process.setDepartmentName(processEntity.getDepartmentName()); + process.setEndTime(processEntity.getEndTime()); + process.setGridId(processEntity.getGridId()); + process.setInternalRemark(processEntity.getInternalRemark()); + process.setIsSend(processEntity.getIsSend()); + process.setOperation(processEntity.getOperation()); + process.setOperationName(processEntity.getOperationName()); + process.setOrgIdPath(processEntity.getOrgIdPath()); + process.setProjectId(processEntity.getProjectId()); + process.setPublicReply(processEntity.getPublicReply()); + process.setStaffId(processEntity.getStaffId()); + + if (assignedStaffEntities == null) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(ProjectStaffEntity::getProcessId, process.getProjectId()); + assignedStaffEntities = projectStaffDao.selectList(query); + } + + if (CollectionUtils.isEmpty(assignedStaffEntities)) { + assignedStaffEntities = new ArrayList<>(); + } + + List assignedStaffs = assignedStaffEntities.stream().map(e -> { + BlockChainProjectProcessAssignedStaffFormDTO assignedStaff = new BlockChainProjectProcessAssignedStaffFormDTO(); + assignedStaff.setStaffId(e.getStaffId()); + assignedStaff.setCreatedBy(e.getCreatedBy()); + assignedStaff.setCustomerId(e.getCustomerId()); + assignedStaff.setCreatedTime(e.getCreatedTime()); + assignedStaff.setProcessId(e.getProcessId()); + assignedStaff.setDepartmentId(e.getDepartmentId()); + assignedStaff.setDepartmentName(e.getDepartmentName()); + assignedStaff.setGridId(e.getGridId()); + assignedStaff.setId(e.getId()); + assignedStaff.setIsHandle(e.getIsHandle()); + assignedStaff.setOrgId(e.getOrgId()); + assignedStaff.setOrgIdPath(e.getOrgIdPath()); + assignedStaff.setProjectId(e.getProjectId()); + return assignedStaff; + }).collect(Collectors.toList()); + + BlockChainProcessProjectFormDTO form = new BlockChainProcessProjectFormDTO(); + form.setProcess(process); + form.setAssignedStaffs(assignedStaffs); + thirdOpenFeignClient.blockChainProcessProject(form); + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index de0a8347f4..489bb0737f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -58,6 +59,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.ProjectProcessRedis; import com.epmet.send.SendMqMsgUtil; +import com.epmet.service.BlockChainUploadService; import com.epmet.service.ProjectProcessService; import com.epmet.service.ProjectService; import com.epmet.service.ProjectStaffService; @@ -120,6 +122,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl page(Map params) { @@ -407,6 +411,13 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl()); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } } /** @@ -2140,6 +2180,14 @@ public class ProjectServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - if (!textSyncScanResult.success()) { - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); - } - } - } + //if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(formDTO.getPublicReply())) { + // TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + // TextTaskDTO taskDTO = new TextTaskDTO(); + // taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + // taskDTO.setContent(formDTO.getPublicReply()); + // textScanParamDTO.getTasks().add(taskDTO); + // Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + // if (!textSyncScanResult.success()) { + // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + // } else { + // if (!textSyncScanResult.getData().isAllPass()) { + // throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + // } + // } + //} //获取项目相关信息 ProjectEntity projectEntity = baseDao.selectById(formDTO.getProjectId()); @@ -2238,6 +2286,13 @@ public class ProjectServiceImpl extends BaseServiceImpl()); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index e8e79882f7..8bf61721f0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; @@ -91,6 +92,8 @@ public class ProjectTraceServiceImpl implements ProjectTraceS private LoginUserUtil loginUserUtil; @Autowired private ResiEventService resiEventService; + @Autowired + private BlockChainUploadService blockChainUploadService; @Override public List getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) { @@ -529,6 +532,13 @@ public class ProjectTraceServiceImpl implements ProjectTraceS log.error("项目实时统计消息发送失败"); } + // 数据上链 + try { + blockChainUploadService.send2BlockChain(processEntity, entityList); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } } /** @@ -845,6 +855,15 @@ public class ProjectTraceServiceImpl implements ProjectTraceS resiEventService.shiftProject(eventShiftProjectDTO); EventToProjectResultDTO resultDTO=new EventToProjectResultDTO(); resultDTO.setProjectId(projectEntity.getId()); + + // 数据上链 + try { + blockChainUploadService.send2BlockChain(processEntity, entityList); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } + return resultDTO; } From 353b57c56d13b5cc65780d87aa1680cd93edea89 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Nov 2021 15:17:34 +0800 Subject: [PATCH 453/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC->third->=E5=8C=BA?= =?UTF-8?q?=E5=9D=97=E9=93=BEMQ=E7=9A=84=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/BlockChainCreateProjectFormDTO.java | 1 + .../epmet-third/epmet-third-server/pom.xml | 40 +++++++++ .../java/com/epmet/EpmetThirdApplication.java | 3 + .../BlockChainProjectController.java | 7 ++ .../epmet/mq/producer/BlockChainProducer.java | 88 +++++++++++++++++++ .../mq/properties/RocketMQProperties.java | 33 +++++++ .../service/BlockChainProjectService.java | 14 +++ .../impl/BlockChainProjectServiceImpl.java | 44 ++++++++++ .../src/main/resources/bootstrap.yml | 12 +++ .../service/impl/ProjectServiceImpl.java | 30 +++---- 10 files changed, 257 insertions(+), 15 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java index f83aad5e4e..295c125f69 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java @@ -23,3 +23,4 @@ public class BlockChainCreateProjectFormDTO { private List assignedStaffs; } + diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 84b0161a1a..350b72b7b2 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -220,6 +220,16 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + + + + + true + 192.168.1.144:9876 + EpmetCloud + 12345678 @@ -260,6 +270,16 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + + + + + true + 192.168.1.144:9876 + EpmetCloud + 12345678 @@ -300,6 +320,16 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + + + + + false + + + @@ -342,6 +372,16 @@ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 + + + + + + false + + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java index f2072e4efc..3a7ba889a3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java @@ -1,11 +1,14 @@ package com.epmet; +import com.epmet.mq.properties.RocketMQProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +@EnableConfigurationProperties(RocketMQProperties.class) @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java index 7090bc3ce0..2ec27b1e27 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java @@ -4,6 +4,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.BlockChainCreateProjectFormDTO; import com.epmet.dto.form.BlockChainProcessProjectFormDTO; +import com.epmet.service.BlockChainProjectService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +18,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/blockchain/project") public class BlockChainProjectController { + @Autowired + private BlockChainProjectService blockChainProjectService; + /** * 立项 * @param input @@ -24,6 +29,7 @@ public class BlockChainProjectController { @PostMapping("create") public Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input) { ValidatorUtils.validateEntity(input); + blockChainProjectService.blockChainCreateProject(input); return new Result(); } @@ -35,6 +41,7 @@ public class BlockChainProjectController { @PostMapping("process") public Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input) { ValidatorUtils.validateEntity(input); + blockChainProjectService.blockChainProcessProject(input); return new Result(); } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java new file mode 100644 index 0000000000..1e2e368222 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java @@ -0,0 +1,88 @@ +package com.epmet.mq.producer; + +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.mq.properties.RocketMQProperties; +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.acl.common.AclClientRPCHook; +import org.apache.rocketmq.acl.common.SessionCredentials; +import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.client.producer.DefaultMQProducer; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.common.message.Message; +import org.apache.rocketmq.remoting.common.RemotingHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/11/26 12:33 下午 + * @Version 1.0 + */ +@Component +@Slf4j +public class BlockChainProducer { + + // topic + public static final String TOPIC_PROJECT = "project"; + public static final String TOPIC_AUTH = "auth"; + + // tag + public static final String TAG_SEND_PROJECT = "send_project"; + public static final String TAG_SEND_PROCESS = "send_process"; + public static final String TAG_SEND_ASSIGNED_STAFFS = "send_assigned_staffs"; + + // 组 + public static final String GROUP_EPMET_CLOUD_PROJECT_SENDER = "epmet_cloud_project_sender"; + + private DefaultMQProducer producer; + + @Autowired + private RocketMQProperties rocketMQProperties; + + @PostConstruct + private void postConstruct() { + try { + producer = new DefaultMQProducer(GROUP_EPMET_CLOUD_PROJECT_SENDER, + new AclClientRPCHook(new SessionCredentials(rocketMQProperties.getBlockChain().getAccessKey(), rocketMQProperties.getBlockChain().getSecretKey()))); + producer.setNamesrvAddr(rocketMQProperties.getBlockChain().getNameServer()); + producer.start(); + } catch (MQClientException e) { + e.printStackTrace(); + } + } + + /** + * 销毁producer + */ + @PreDestroy + private void preDestroy() { + producer.shutdown(); + } + + /** + * 发送消息 + * + * @param topic + * @param tag + */ + public void sendMsg(String topic, String tag, String content) { + try { + Message msg = new Message(topic, tag, content.getBytes(RemotingHelper.DEFAULT_CHARSET)); + SendResult sendResult = producer.send(msg); + if (SendStatus.SEND_OK == sendResult.getSendStatus() + || SendStatus.SLAVE_NOT_AVAILABLE == sendResult.getSendStatus()) { + log.info("消息发送区块链MQ成功, topic:{}, tag:{}, content:{}", topic, tag, content); + } else { + log.error("消息发送区块链MQ失败, topic:{}, tag:{}, content:{}, status: {}", topic, tag, content, sendResult.getSendStatus()); + } + } catch (Exception e) { + log.error("消息发送区块链MQ出错, topic:{}, tag:{}, content:{}, 错误信息:{]", topic, tag, content, ExceptionUtils.getErrorStackTrace(e)); + } + } + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java new file mode 100644 index 0000000000..7c2394ca7d --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java @@ -0,0 +1,33 @@ +package com.epmet.mq.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/11/26 10:03 上午 + * @Version 1.0 + */ +@ConfigurationProperties(prefix = "rocketmq") +@Data +public class RocketMQProperties { + + // 这里必须new出对象来才能成功封装 + private EpmetCloudInnerProperties epmetCloudInner = new EpmetCloudInnerProperties(); + private BlockChainProperties blockChain = new BlockChainProperties(); + + @Data + public class EpmetCloudInnerProperties { + private Boolean enable; + private String nameServer; + } + + @Data + public class BlockChainProperties { + private Boolean enable; + private String nameServer; + private String accessKey; + private String secretKey; + } +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java new file mode 100644 index 0000000000..95f1bfd151 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java @@ -0,0 +1,14 @@ +package com.epmet.service; + +import com.epmet.dto.form.BlockChainCreateProjectFormDTO; +import com.epmet.dto.form.BlockChainProcessProjectFormDTO; + +/** + * 区块链：项目service + */ +public interface BlockChainProjectService { + + void blockChainCreateProject(BlockChainCreateProjectFormDTO input); + void blockChainProcessProject(BlockChainProcessProjectFormDTO input); + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java new file mode 100644 index 0000000000..81db281da2 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java @@ -0,0 +1,44 @@ +package com.epmet.service.impl; + +import com.alibaba.fastjson.JSON; +import com.epmet.dto.form.BlockChainCreateProjectFormDTO; +import com.epmet.dto.form.BlockChainProcessProjectFormDTO; +import com.epmet.mq.producer.BlockChainProducer; +import com.epmet.mq.properties.RocketMQProperties; +import com.epmet.service.BlockChainProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/11/26 9:59 上午 + * @Version 1.0 + */ +@Service +public class BlockChainProjectServiceImpl implements BlockChainProjectService { + + @Autowired + private BlockChainProducer blockChainProducer; + + @Override + public void blockChainCreateProject(BlockChainCreateProjectFormDTO input) { + + String projectString = JSON.toJSONString(input.getProject()); + String processString = JSON.toJSONString(input.getProcess()); + String assignedStaffsString = JSON.toJSONString(input.getAssignedStaffs()); + + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROJECT, projectString); + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString); + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); + } + + @Override + public void blockChainProcessProject(BlockChainProcessProjectFormDTO input) { + String processString = JSON.toJSONString(input.getProcess()); + String assignedStaffsString = JSON.toJSONString(input.getAssignedStaffs()); + + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString); + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); + } +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 0dc793c264..1ad3de55ca 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -149,3 +149,15 @@ shutdown: graceful: enable: true #是否开启优雅停机 waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警 + +rocketmq: + # epmet-cloud集群内部用的rocketmq +# epmet-cloud-inner: +# enable: @rocketmq.epmet-cloud-inner.enable@ +# name-server: @rocketmq.epmet-cloud-inner.name-server@ + # 区块链对接用的rocketmq + block-chain: + enable: @rocketmq.block-chain.enable@ + name-server: @rocketmq.block-chain.name-server@ + access-key: @rocketmq.block-chain.access-key@ + secret-key: @rocketmq.block-chain.secret-key@ \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 24c47a4b92..19a5316d22 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2198,21 +2198,21 @@ public class ProjectServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - // if (!textSyncScanResult.success()) { - // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - // } else { - // if (!textSyncScanResult.getData().isAllPass()) { - // throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); - // } - // } - //} + if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(formDTO.getPublicReply())) { + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + taskDTO.setContent(formDTO.getPublicReply()); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } + } + } //获取项目相关信息 ProjectEntity projectEntity = baseDao.selectById(formDTO.getProjectId()); From 5c5c467986530d14eab87c0c6d4d6a924909a6a1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 26 Nov 2021 17:51:21 +0800 Subject: [PATCH 454/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=95=B0=E6=8D=AE=E4=B8=8A=E9=93=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BlockChainUploadService.java | 3 +- .../impl/BlockChainUploadServiceImpl.java | 48 +++++++++++++++---- .../impl/ProjectProcessServiceImpl.java | 4 +- .../service/impl/ProjectServiceImpl.java | 14 +++--- .../service/impl/ProjectTraceServiceImpl.java | 4 +- 5 files changed, 52 insertions(+), 21 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java index a9bf0848e2..9f53558d2d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java @@ -1,5 +1,6 @@ package com.epmet.service; +import com.epmet.entity.ProjectEntity; import com.epmet.entity.ProjectProcessEntity; import com.epmet.entity.ProjectStaffEntity; @@ -15,5 +16,5 @@ public interface BlockChainUploadService { * @param processEntity 处理进展entity * @param assignedStaffEntities 指派给的工作人员entity */ - void send2BlockChain(ProjectProcessEntity processEntity, List assignedStaffEntities); + void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java index 2a7f45fccb..88f8603b59 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -2,9 +2,8 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.dao.ProjectStaffDao; -import com.epmet.dto.form.BlockChainProcessProjectFormDTO; -import com.epmet.dto.form.BlockChainProjectProcessAssignedStaffFormDTO; -import com.epmet.dto.form.BlockChainProjectProcessFormDTO; +import com.epmet.dto.form.*; +import com.epmet.entity.ProjectEntity; import com.epmet.entity.ProjectProcessEntity; import com.epmet.entity.ProjectStaffEntity; import com.epmet.feign.EpmetThirdOpenFeignClient; @@ -35,8 +34,30 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { * @param processEntity 处理进展entity * @param assignedStaffEntities 指派给的工作人员entity */ - public void send2BlockChain(ProjectProcessEntity processEntity, List assignedStaffEntities) { + public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities) { + // 1.项目主信息 + BlockChainProjectFormDTO project = null; + + if (projectEntity != null) { + project = new BlockChainProjectFormDTO(); + project.setAgencyId(projectEntity.getAgencyId()); + project.setProjectId(projectEntity.getId()); + project.setCustomerId(projectEntity.getCustomerId()); + project.setCreatedBy(projectEntity.getCreatedBy()); + project.setCreatedTime(projectEntity.getCreatedTime()); + project.setCloseStatus(projectEntity.getClosedStatus()); + project.setLocateAddress(projectEntity.getLocateAddress()); + project.setLocateDimension(projectEntity.getLocateDimension()); + project.setLocateLongitude(projectEntity.getLocateLongitude()); + project.setOrgIdPath(projectEntity.getOrgIdPath()); + project.setOrigin(projectEntity.getOrigin()); + project.setOriginId(projectEntity.getOriginId()); + project.setStatus(projectEntity.getStatus()); + project.setTitle(projectEntity.getTitle()); + } + + // 2.项目处理进展 BlockChainProjectProcessFormDTO process = new BlockChainProjectProcessFormDTO(); process.setProcessId(processEntity.getId()); process.setCreatedBy(processEntity.getCreatedBy()); @@ -68,6 +89,7 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { assignedStaffEntities = new ArrayList<>(); } + // 3.指派人员列表 List assignedStaffs = assignedStaffEntities.stream().map(e -> { BlockChainProjectProcessAssignedStaffFormDTO assignedStaff = new BlockChainProjectProcessAssignedStaffFormDTO(); assignedStaff.setStaffId(e.getStaffId()); @@ -85,10 +107,18 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { assignedStaff.setProjectId(e.getProjectId()); return assignedStaff; }).collect(Collectors.toList()); - - BlockChainProcessProjectFormDTO form = new BlockChainProcessProjectFormDTO(); - form.setProcess(process); - form.setAssignedStaffs(assignedStaffs); - thirdOpenFeignClient.blockChainProcessProject(form); + + if (project == null) { + BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO(); + processForm.setProcess(process); + processForm.setAssignedStaffs(assignedStaffs); + thirdOpenFeignClient.blockChainProcessProject(processForm); + } else { + BlockChainCreateProjectFormDTO createForm = new BlockChainCreateProjectFormDTO(); + createForm.setProject(project); + createForm.setProcess(process); + createForm.setAssignedStaffs(assignedStaffs); + thirdOpenFeignClient.blockChainCreateProject(createForm); + } } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 489bb0737f..510de14c1a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -413,7 +413,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl()); + blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>()); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); @@ -2183,7 +2183,7 @@ public class ProjectServiceImpl extends BaseServiceImpl()); + blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>()); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index 8bf61721f0..c3b8aa856c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -534,7 +534,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS // 数据上链 try { - blockChainUploadService.send2BlockChain(processEntity, entityList); + blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); @@ -858,7 +858,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS // 数据上链 try { - blockChainUploadService.send2BlockChain(processEntity, entityList); + blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); From 56b39d08395880fa2fea48c278f3ac36a8db18bd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 7 Dec 2021 09:34:36 +0800 Subject: [PATCH 455/589] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectServiceImpl.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 36475ba740..3c70e51a3a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -71,6 +71,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; @@ -2789,4 +2790,53 @@ public class ProjectServiceImpl extends BaseServiceImpl getIntervalTimeList(String start,String end,Integer interval) { + Date startDate = convertStringToDate("HH:mm", start); + Date endDate = convertStringToDate("HH:mm", end); + List list = new ArrayList<>(); + while (startDate.getTime() <= endDate.getTime()) { + list.add(convertDateToString("HH:mm", startDate)); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startDate); + calendar.add(Calendar.MINUTE, interval); + if (calendar.getTime().getTime() > endDate.getTime()) { + if (!startDate.equals(endDate)) { + list.add(convertDateToString("HH:mm", endDate)); + } + startDate = calendar.getTime(); + } else { + startDate = calendar.getTime(); + } + + } + list.remove(list.size() - NumConstant.ONE); + list.add(list.size(),"24:00"); + return list; + } + + + public static Date convertStringToDate(String format, String dateStr) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + try { + Date date = simpleDateFormat.parse(dateStr); + return date; + } catch (ParseException e) { + e.printStackTrace(); + } + return null; + } + + public static String convertDateToString(String format, Date date) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + return simpleDateFormat.format(date); + } } \ No newline at end of file From 8cba8e02f46452b45d6c75f77c595743fbe086b1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 7 Dec 2021 10:06:13 +0800 Subject: [PATCH 456/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=8A=E9=93=BE=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=B0?= =?UTF-8?q?=E5=AF=8C=E4=B8=AD=E6=96=87=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 4 +- .../dto/form/BlockChainProjectFormDTO.java | 22 +++ ...ainProjectProcessAssignedStaffFormDTO.java | 14 +- .../form/BlockChainProjectProcessFormDTO.java | 35 ++++ .../feign/EpmetThirdOpenFeignClient.java | 8 +- .../impl/BlockChainProjectServiceImpl.java | 157 +++++++++++++++++- 6 files changed, 224 insertions(+), 16 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d180c7cab9..d2f82494a3 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -323,8 +323,8 @@ lb://gov-issue-server - - lb://gov-project-server + http://localhost:8102 + http://localhost:8103 diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java index 2477ee2f00..cdfbf27b95 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java @@ -12,30 +12,52 @@ import java.util.Date; public class BlockChainProjectFormDTO { @NotBlank(message = "项目ID必填") private String projectId; + @NotBlank(message = "客户ID必填") private String customerId; + + // 客户名称 + private String customerName; + @NotBlank(message = "标题必填") private String title; + @NotBlank(message = "组织ID必填") private String agencyId; + + // 组织名称 + private String agencyName; + @NotBlank(message = "项目来源必填") private String origin; + @NotBlank(message = "项目来源ID必填") private String originId; + @NotBlank(message = "项目状态必填") private String status; + @NotBlank(message = "关闭状态必填") private String closeStatus; + @NotBlank(message = "组织ID PATH必填") private String orgIdPath; + @NotBlank(message = "定位必填") private String locateAddress; + @NotBlank(message = "经度必填") private String locateLongitude; + @NotBlank(message = "维度必填") private String locateDimension; + @NotBlank(message = "创建时间必填") private Date createdTime; + @NotBlank(message = "创建者ID必填") private String createdBy; + + // 创建者名字 + private String createrName; } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java index fae80e91f2..f0b82e062d 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java @@ -24,12 +24,18 @@ public class BlockChainProjectProcessAssignedStaffFormDTO { @NotBlank(message = "组织ID必填") private String orgId; + + //组织名称 + private String orgName; @NotBlank(message = "部门ID必填") private String departmentId; - + @NotBlank(message = "网格ID必填") private String gridId; + + // 网格名称 + private String gridName; @NotBlank(message = "组织ID PATH必填") private String orgIdPath; @@ -37,6 +43,9 @@ public class BlockChainProjectProcessAssignedStaffFormDTO { @NotBlank(message = "人员ID必填") private String staffId; + // 指派的用户名字 + private String staffName; + @NotBlank(message = "部门名称必填") private String departmentName; @@ -49,4 +58,7 @@ public class BlockChainProjectProcessAssignedStaffFormDTO { @NotBlank(message = "创建时间必填") private Date createdTime; + // 创建者名字 + private String createrName; + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java index 136dec1e5e..a7204c3f0a 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java @@ -1,11 +1,16 @@ package com.epmet.dto.form; + import lombok.Data; + import javax.validation.constraints.NotBlank; + import javax.validation.constraints.NotNull; + import java.util.Date; + /** * 区块链：项目处理form dto */ @@ -13,38 +18,68 @@ import java.util.Date; public class BlockChainProjectProcessFormDTO { @NotBlank(message = "处理ID必填") private String processId; + @NotBlank(message = "项目ID必填") private String projectId; + @NotBlank(message = "客户ID必填") private String customerId; + @NotBlank(message = "部门名称必填") private String departmentName; + @NotBlank(message = "组织ID必填") private String agencyId; + + // 组织的ID + private String agencyName; + @NotBlank(message = "部门ID必填") private String departmentId; + @NotBlank(message = "网格ID必填") private String gridId; + + // 网格的名称 + private String gridName; + @NotBlank(message = "组织ID PATH必填") private String orgIdPath; + @NotBlank(message = "处理人员ID必填") private String staffId; + + // 工作人员名字 + private String staffName; + @NotBlank(message = "操作类型必填") private String operation; + @NotBlank(message = "操作名称必填") private String operationName; + @NotBlank(message = "公开答复必填") private String publicReply; + @NotBlank(message = "内部备注必填必填") private String internalRemark; + @NotNull(message = "结束时间必填") private Date endTime; + @NotNull(message = "是否发送到外部系统必填") private Integer isSend; + @NotNull(message = "耗费天数必填") private Integer costWorkDays; + @NotBlank(message = "创建者ID必填") private String createdBy; + + // 创建者名字 + private String createrName; + @NotNull(message = "创建时间必填") private Date createdTime; + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java index dc5eb828df..1175d37f85 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java @@ -25,10 +25,10 @@ import java.util.List; * @author zhaoqifeng * @date 2021/3/18 14:18 */ -// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class,configuration = -// EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110") -@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class, configuration = - EpmetThirdOpenFeignClient.MultipartSupportConfig.class) + @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class,configuration = + EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110") +//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class, configuration = +// EpmetThirdOpenFeignClient.MultipartSupportConfig.class) public interface EpmetThirdOpenFeignClient { /** * 请求项目协助 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java index 81db281da2..e1a7384983 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java @@ -1,14 +1,27 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; -import com.epmet.dto.form.BlockChainCreateProjectFormDTO; -import com.epmet.dto.form.BlockChainProcessProjectFormDTO; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.CustomerDTO; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.CustomerStaffDTO; +import com.epmet.dto.form.*; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OperCrmOpenFeignClient; import com.epmet.mq.producer.BlockChainProducer; import com.epmet.mq.properties.RocketMQProperties; import com.epmet.service.BlockChainProjectService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Optional; + /** * @Description 描述 * @Author wangxianzhang @@ -16,27 +29,153 @@ import org.springframework.stereotype.Service; * @Version 1.0 */ @Service -public class BlockChainProjectServiceImpl implements BlockChainProjectService { +public class BlockChainProjectServiceImpl implements BlockChainProjectService, ResultDataResolver { @Autowired private BlockChainProducer blockChainProducer; - + + @Autowired + private OperCrmOpenFeignClient operCrmOpenFeignClient; + + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; + @Override public void blockChainCreateProject(BlockChainCreateProjectFormDTO input) { - String projectString = JSON.toJSONString(input.getProject()); - String processString = JSON.toJSONString(input.getProcess()); - String assignedStaffsString = JSON.toJSONString(input.getAssignedStaffs()); + BlockChainProjectFormDTO project = input.getProject(); + BlockChainProjectProcessFormDTO process = input.getProcess(); + List assignedStaffs = input.getAssignedStaffs(); + + fill(project, process, assignedStaffs); + + String projectString = JSON.toJSONString(project); + String processString = JSON.toJSONString(process); + String assignedStaffsString = JSON.toJSONString(assignedStaffs); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROJECT, projectString); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); } + /** + * 填充数据 + * @param project + * @param process + */ + private void fill(BlockChainProjectFormDTO project, BlockChainProjectProcessFormDTO process, List assignedStaffs) { + + // 一.填充project信息 + + if (project != null) { + // 客户信息 + CustomerDTO customerDTO = new CustomerDTO(); + customerDTO.setId(project.getCustomerId()); + CustomerDTO customerInfo = getResultDataOrThrowsException(operCrmOpenFeignClient.getCustomerInfo(customerDTO), + ServiceConstant.EPMET_THIRD_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询客户信息失败"); + + // 组织信息 + CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(project.getAgencyId()), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询Agency信息失败"); + + // 用户信息 + CustomerStaffDTO customerStaffDTO = new CustomerStaffDTO(); + customerStaffDTO.setUserId(project.getCreatedBy()); + CustomerStaffDTO staffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(customerStaffDTO), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询用户信息失败"); + + project.setCustomerName(customerInfo.getCustomerName()); + project.setAgencyName(agencyInfo.getOrganizationName()); + Optional.of(staffInfo).ifPresent((staff) -> project.setCreaterName(staff.getRealName())); + } + + // 二.填充进展信息 + + if (process != null) { + + if (StringUtils.isNotBlank(process.getAgencyId())) { + // 组织信息 + CustomerAgencyDTO processAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(process.getAgencyId()), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败"); + + process.setAgencyName(processAgencyInfo.getOrganizationName()); + } + + // 网格信息 + if (StringUtils.isNotBlank(process.getGridId())) { + CustomerGridFormDTO processGridFormDTO = new CustomerGridFormDTO(); + processGridFormDTO.setGridId(process.getGridId()); + CustomerGridDTO processGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(processGridFormDTO), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败"); + + Optional.of(processGridInfo).ifPresent((grid) -> process.setGridName(grid.getGridName())); + } + + // 用户信息 + CustomerStaffDTO processCustomerStaffDTO = new CustomerStaffDTO(); + processCustomerStaffDTO.setUserId(process.getStaffId()); + CustomerStaffDTO processStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(processCustomerStaffDTO), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点用户信息失败"); + + process.setStaffName(processStaffInfo.getRealName()); + process.setCreatedBy(processStaffInfo.getRealName()); + + } + + // 三.填充指派用户信息 + if (assignedStaffs != null) { + for (BlockChainProjectProcessAssignedStaffFormDTO assignedStaff : assignedStaffs) { + // 组织信息 + if (StringUtils.isNotBlank(assignedStaff.getOrgId())) { + CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败"); + + assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName()); + } + + // 网格信息 + if (StringUtils.isNotBlank(assignedStaff.getGridId())) { + CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO(); + assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId()); + CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败"); + + Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName())); + } + + // 指派用户 + CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO(); + assignedStaffDTO.setUserId(assignedStaff.getStaffId()); + CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); + + assignedStaff.setStaffName(assignedStaffInfo.getRealName()); + + // 创建者 + CustomerStaffDTO createStaffDTO = new CustomerStaffDTO(); + createStaffDTO.setUserId(assignedStaff.getCreatedBy()); + CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); + + Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName())); + + } + } + } + @Override public void blockChainProcessProject(BlockChainProcessProjectFormDTO input) { - String processString = JSON.toJSONString(input.getProcess()); - String assignedStaffsString = JSON.toJSONString(input.getAssignedStaffs()); + + BlockChainProjectProcessFormDTO process = input.getProcess(); + List assignedStaffs = input.getAssignedStaffs(); + + fill(null, process, assignedStaffs); + + String processString = JSON.toJSONString(process); + String assignedStaffsString = JSON.toJSONString(assignedStaffs); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString); blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); From 54adaf8d205048b2a9bc97186fd152544389a793 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 7 Dec 2021 10:12:36 +0800 Subject: [PATCH 457/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 8 ++++---- .../java/com/epmet/feign/EpmetThirdOpenFeignClient.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index dd53cbd156..1169c9ca84 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -323,11 +323,11 @@ lb://gov-issue-server - http://localhost:8102 - + + lb://gov-project-server - - http://localhost:8103 + lb://common-service-server + lb://resi-home-server diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java index 1175d37f85..22a8c36c5a 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java @@ -25,10 +25,10 @@ import java.util.List; * @author zhaoqifeng * @date 2021/3/18 14:18 */ - @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class,configuration = - EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110") -//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class, configuration = -// EpmetThirdOpenFeignClient.MultipartSupportConfig.class) + //@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class,configuration = + // EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110") +@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class, configuration = + EpmetThirdOpenFeignClient.MultipartSupportConfig.class) public interface EpmetThirdOpenFeignClient { /** * 请求项目协助 From c9277843b2807a152de3e4782180dbc7b2ca7ba9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Dec 2021 11:20:30 +0800 Subject: [PATCH 458/589] /point/resi/point/pageuserpoint --- .../dto/form/IcResiPointPageFormDTO.java | 19 +++++++++++++++++ .../epmet/dto/result/ResiPointPageResDTO.java | 21 +++++++++++++++++++ .../epmet/controller/ResiPointController.java | 13 ++++++++++++ .../com/epmet/dao/UserPointActionLogDao.java | 4 ++++ .../service/UserPointActionLogService.java | 10 +++++++++ .../impl/UserPointActionLogServiceImpl.java | 19 +++++++++++++++++ .../mapper/UserPointActionLogDao.xml | 14 +++++++++++++ 7 files changed, 100 insertions(+) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java new file mode 100644 index 0000000000..d4a8fb1f89 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class IcResiPointPageFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) + private String epmetUserId; + @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) + private Integer pageSize; + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java new file mode 100644 index 0000000000..68b73f61ae --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ResiPointPageResDTO implements Serializable { + private String title; + private String id; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date dateTime; + + /** + * +100 -25 + * */ + private String point; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 795f557449..0b19244e0a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -115,6 +116,18 @@ public class ResiPointController { return new Result>().ok(pointActionLogService.getMyPointRecord(pageUserParam)); } + /** + * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录 + * + * @param formDTO + * @return + */ + @PostMapping("pageuserpoint") + public Result> pageUserPoint(@RequestBody IcResiPointPageFormDTO formDTO ){ + ValidatorUtils.validateEntity(formDTO,IcResiPointPageFormDTO.AddUserInternalGroup.class); + return new Result>().ok(pointActionLogService.pageUserPoint(formDTO)); + } + /** * @Description 查找指定用户的积分兑换记录 * @param dto diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java index 1db465d453..ae9cb21307 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java @@ -18,8 +18,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; +import com.epmet.dto.result.ResiPointPageResDTO; import com.epmet.entity.UserPointActionLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -69,4 +71,6 @@ public interface UserPointActionLogDao extends BaseDao @Param("userId")String userId, @Param("type")String type, @Param("dateId")String dateId); + + List selectPageResiPoin(IcResiPointPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java index 314b9b46db..b156816c80 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java @@ -22,9 +22,11 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.form.MyPointTaskFormDTO; import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; +import com.epmet.dto.result.ResiPointPageResDTO; import com.epmet.entity.UserPointActionLogEntity; import dto.form.SendPointFormDTO; @@ -143,4 +145,12 @@ public interface UserPointActionLogService extends BaseService */ List queryMyPointTaskList(MyPointTaskFormDTO formDTO); + + /** + * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录 + * + * @param formDTO + * @return + */ + PageData pageUserPoint(IcResiPointPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 50b854964d..c27498a82b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -36,10 +36,12 @@ import com.epmet.dto.BizPointUserTotalDetailDTO; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.form.MyPointTaskFormDTO; import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; +import com.epmet.dto.result.ResiPointPageResDTO; import com.epmet.entity.PointRuleEntity; import com.epmet.entity.UserPointActionLogEntity; import com.epmet.entity.UserPointStatisticalDailyEntity; @@ -50,6 +52,7 @@ import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; import com.epmet.utils.RuleCycleEnum; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; import dto.form.SendPointFormDTO; import lombok.extern.slf4j.Slf4j; @@ -559,4 +562,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pageUserPoint(IcResiPointPageFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getEpmetUserId())){ + return new PageData(new ArrayList<>(),NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectPageResiPoin(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); + } } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index d2a4f0f212..8996007d8a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -42,6 +42,20 @@ CREATED_TIME DESC + + + + UPDATE issue_project_category_dict SET From b21206b7990a4dc4605d95c50e66d70b5f8f95c9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 7 Dec 2021 14:06:48 +0800 Subject: [PATCH 462/589] feign --- .../com/epmet/feign/GovIssueOpenFeignClient.java | 12 ++++++++++++ .../fallback/GovIssueOpenFeignClientFallBack.java | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 5e57fa2007..5e67e24217 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -1,6 +1,8 @@ package com.epmet.feign; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; @@ -341,4 +343,14 @@ public interface GovIssueOpenFeignClient { @PostMapping("/gov/issue/issue/unresolvedlist") Result> getUnresolvedList(@RequestBody ShiftProjectListFromDTO formDTO); + + /** + * @Description 根据客户查询1级分类 + * @param tokenDto + * @author zxc + * @date 2021/12/7 2:05 下午 + */ + @PostMapping(value = "/gov/issue/issueprojectcategorydict/categorylist") + Result> selectCategoryOneLevelListByCustomerId(@LoginUser TokenDto tokenDto); + } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 8bc43defbc..bc947a7617 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -1,6 +1,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; @@ -281,4 +282,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getUnresolvedList(ShiftProjectListFromDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getUnresolvedList", formDTO); } + + @Override + public Result> selectCategoryOneLevelListByCustomerId(TokenDto tokenDto) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "selectCategoryOneLevelListByCustomerId", tokenDto); + } } From b0fad9854f9a32b60d6a29a259638f84ab524793 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 7 Dec 2021 19:12:50 +0800 Subject: [PATCH 463/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/BlockChainProcessProjectFormDTO.java | 3 + .../form/BlockChainProjectProcessFormDTO.java | 2 +- .../epmet/mq/producer/BlockChainProducer.java | 16 ++- .../impl/BlockChainProjectServiceImpl.java | 101 +++++++++++------- .../service/BlockChainUploadService.java | 2 +- .../impl/BlockChainUploadServiceImpl.java | 31 +++++- .../impl/ProjectProcessServiceImpl.java | 4 +- .../service/impl/ProjectServiceImpl.java | 14 +-- .../service/impl/ProjectTraceServiceImpl.java | 4 +- 9 files changed, 117 insertions(+), 60 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java index 7e910f8726..0cf7f1caac 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java @@ -15,4 +15,7 @@ public class BlockChainProcessProjectFormDTO { private BlockChainProjectProcessFormDTO process; private List assignedStaffs; + + // 处理人信息更新 + private BlockChainProjectProcessAssignedStaffFormDTO handledStaff; } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java index a7204c3f0a..4a21f3e3db 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java @@ -71,7 +71,7 @@ public class BlockChainProjectProcessFormDTO { private Integer isSend; @NotNull(message = "耗费天数必填") - private Integer costWorkDays; + private String costWorkDays; @NotBlank(message = "创建者ID必填") private String createdBy; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java index 1e2e368222..3ec172b7a6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java @@ -27,16 +27,26 @@ import javax.annotation.PreDestroy; @Slf4j public class BlockChainProducer { - // topic + /** + * topic + */ public static final String TOPIC_PROJECT = "project"; public static final String TOPIC_AUTH = "auth"; - // tag + /** + * tag + */ public static final String TAG_SEND_PROJECT = "send_project"; + // 发送处理进展 public static final String TAG_SEND_PROCESS = "send_process"; + // 发送流转过程中被指派的人员 public static final String TAG_SEND_ASSIGNED_STAFFS = "send_assigned_staffs"; + // 发送处理完成的人员 + public static final String TAG_SEND_HANDLED_STAFF = "send_handled_staff"; - // 组 + /** + * 组 + */ public static final String GROUP_EPMET_CLOUD_PROJECT_SENDER = "epmet_cloud_project_sender"; private DefaultMQProducer producer; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java index e1a7384983..b21b0ae5b7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java @@ -50,7 +50,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R BlockChainProjectProcessFormDTO process = input.getProcess(); List assignedStaffs = input.getAssignedStaffs(); - fill(project, process, assignedStaffs); + fill(project, process, assignedStaffs, null); String projectString = JSON.toJSONString(project); String processString = JSON.toJSONString(process); @@ -66,7 +66,8 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R * @param project * @param process */ - private void fill(BlockChainProjectFormDTO project, BlockChainProjectProcessFormDTO process, List assignedStaffs) { + private void fill(BlockChainProjectFormDTO project, BlockChainProjectProcessFormDTO process, + List assignedStaffs, BlockChainProjectProcessAssignedStaffFormDTO handledStaff) { // 一.填充project信息 @@ -128,42 +129,54 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R // 三.填充指派用户信息 if (assignedStaffs != null) { for (BlockChainProjectProcessAssignedStaffFormDTO assignedStaff : assignedStaffs) { - // 组织信息 - if (StringUtils.isNotBlank(assignedStaff.getOrgId())) { - CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败"); - - assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName()); - } - - // 网格信息 - if (StringUtils.isNotBlank(assignedStaff.getGridId())) { - CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO(); - assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId()); - CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败"); - - Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName())); - } - - // 指派用户 - CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO(); - assignedStaffDTO.setUserId(assignedStaff.getStaffId()); - CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO), - ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); - - assignedStaff.setStaffName(assignedStaffInfo.getRealName()); - - // 创建者 - CustomerStaffDTO createStaffDTO = new CustomerStaffDTO(); - createStaffDTO.setUserId(assignedStaff.getCreatedBy()); - CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO), - ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); - - Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName())); - + fillAssignedStaffInfo(assignedStaff); } } + + // 4.填充当前处理人信息 + if (handledStaff != null) { + fillAssignedStaffInfo(handledStaff); + } + } + + /** + * 填充被指派人的信息 + * @param assignedStaff + */ + private void fillAssignedStaffInfo(BlockChainProjectProcessAssignedStaffFormDTO assignedStaff) { + // 组织信息 + if (StringUtils.isNotBlank(assignedStaff.getOrgId())) { + CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败"); + + assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName()); + } + + // 网格信息 + if (StringUtils.isNotBlank(assignedStaff.getGridId())) { + CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO(); + assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId()); + CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO), + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败"); + + Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName())); + } + + // 指派用户 + CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO(); + assignedStaffDTO.setUserId(assignedStaff.getStaffId()); + CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); + + assignedStaff.setStaffName(assignedStaffInfo.getRealName()); + + // 创建者 + CustomerStaffDTO createStaffDTO = new CustomerStaffDTO(); + createStaffDTO.setUserId(assignedStaff.getCreatedBy()); + CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO), + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); + + Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName())); } @Override @@ -171,13 +184,21 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R BlockChainProjectProcessFormDTO process = input.getProcess(); List assignedStaffs = input.getAssignedStaffs(); + BlockChainProjectProcessAssignedStaffFormDTO handledStaff = input.getHandledStaff(); - fill(null, process, assignedStaffs); + fill(null, process, assignedStaffs, handledStaff); String processString = JSON.toJSONString(process); - String assignedStaffsString = JSON.toJSONString(assignedStaffs); - blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString); - blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); + + if (assignedStaffs != null && assignedStaffs.size() > 0) { + String assignedStaffsString = JSON.toJSONString(assignedStaffs); + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString); + } + + if (handledStaff != null) { + String handledStaffString = JSON.toJSONString(handledStaff); + blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_HANDLED_STAFF, handledStaffString); + } } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java index 9f53558d2d..233f4d5feb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java @@ -16,5 +16,5 @@ public interface BlockChainUploadService { * @param processEntity 处理进展entity * @param assignedStaffEntities 指派给的工作人员entity */ - void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities); + void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities, String projectStaffId); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java index 88f8603b59..0d745d23cc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -34,11 +34,11 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { * @param processEntity 处理进展entity * @param assignedStaffEntities 指派给的工作人员entity */ - public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities) { + public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities, String projectStaffId) { // 1.项目主信息 BlockChainProjectFormDTO project = null; - + if (projectEntity != null) { project = new BlockChainProjectFormDTO(); project.setAgencyId(projectEntity.getAgencyId()); @@ -62,8 +62,7 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { process.setProcessId(processEntity.getId()); process.setCreatedBy(processEntity.getCreatedBy()); process.setCreatedTime(processEntity.getCreatedTime()); - String costWorkdays = processEntity.getCostWorkdays(); - process.setCostWorkDays(StringUtils.isBlank(costWorkdays) ? null : Integer.valueOf(costWorkdays)); + process.setCostWorkDays(processEntity.getCostWorkdays()); process.setAgencyId(processEntity.getAgencyId()); process.setCustomerId(processEntity.getCustomerId()); process.setDepartmentId(processEntity.getDepartmentId()); @@ -107,13 +106,37 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { assignedStaff.setProjectId(e.getProjectId()); return assignedStaff; }).collect(Collectors.toList()); + + // 4.当前处理人 + BlockChainProjectProcessAssignedStaffFormDTO handledStaff = null; + if (StringUtils.isNotBlank(projectStaffId)) { + ProjectStaffEntity handledStaffEntity = projectStaffDao.selectById(projectStaffId); + + handledStaff = new BlockChainProjectProcessAssignedStaffFormDTO(); + handledStaff.setStaffId(handledStaffEntity.getStaffId()); + handledStaff.setCreatedBy(handledStaffEntity.getCreatedBy()); + handledStaff.setCustomerId(handledStaffEntity.getCustomerId()); + handledStaff.setCreatedTime(handledStaffEntity.getCreatedTime()); + handledStaff.setProcessId(handledStaffEntity.getProcessId()); + handledStaff.setDepartmentId(handledStaffEntity.getDepartmentId()); + handledStaff.setDepartmentName(handledStaffEntity.getDepartmentName()); + handledStaff.setGridId(handledStaffEntity.getGridId()); + handledStaff.setId(handledStaffEntity.getId()); + handledStaff.setIsHandle(handledStaffEntity.getIsHandle()); + handledStaff.setOrgId(handledStaffEntity.getOrgId()); + handledStaff.setOrgIdPath(handledStaffEntity.getOrgIdPath()); + handledStaff.setProjectId(handledStaffEntity.getProjectId()); + } if (project == null) { + // 处理 BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO(); processForm.setProcess(process); processForm.setAssignedStaffs(assignedStaffs); + processForm.setHandledStaff(handledStaff); thirdOpenFeignClient.blockChainProcessProject(processForm); } else { + // 立项 BlockChainCreateProjectFormDTO createForm = new BlockChainCreateProjectFormDTO(); createForm.setProject(project); createForm.setProcess(process); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 510de14c1a..7b7702bc37 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -413,7 +413,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl()); + blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>(), null); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); @@ -2183,7 +2183,7 @@ public class ProjectServiceImpl extends BaseServiceImpl()); + blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>(), null); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index c3b8aa856c..111d2bf8e0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -534,7 +534,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS // 数据上链 try { - blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList); + blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); @@ -858,7 +858,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS // 数据上链 try { - blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList); + blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【项目流转】上链失败，错误信息:{}", errorMsg); From 9f6b32a3a8bb8248b38b73349317f4949a9ffee3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 8 Dec 2021 09:33:50 +0800 Subject: [PATCH 464/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9BlockChainService=E4=B8=ADgetResultOrThrowException()?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BlockChainProjectServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java index b21b0ae5b7..36db95499d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java @@ -76,17 +76,17 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R CustomerDTO customerDTO = new CustomerDTO(); customerDTO.setId(project.getCustomerId()); CustomerDTO customerInfo = getResultDataOrThrowsException(operCrmOpenFeignClient.getCustomerInfo(customerDTO), - ServiceConstant.EPMET_THIRD_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询客户信息失败"); + ServiceConstant.EPMET_THIRD_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询客户信息失败", null); // 组织信息 CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(project.getAgencyId()), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询Agency信息失败"); + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询Agency信息失败", null); // 用户信息 CustomerStaffDTO customerStaffDTO = new CustomerStaffDTO(); customerStaffDTO.setUserId(project.getCreatedBy()); CustomerStaffDTO staffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(customerStaffDTO), - ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询用户信息失败"); + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询用户信息失败", null); project.setCustomerName(customerInfo.getCustomerName()); project.setAgencyName(agencyInfo.getOrganizationName()); @@ -100,7 +100,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R if (StringUtils.isNotBlank(process.getAgencyId())) { // 组织信息 CustomerAgencyDTO processAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(process.getAgencyId()), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败"); + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败", null); process.setAgencyName(processAgencyInfo.getOrganizationName()); } @@ -110,7 +110,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R CustomerGridFormDTO processGridFormDTO = new CustomerGridFormDTO(); processGridFormDTO.setGridId(process.getGridId()); CustomerGridDTO processGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(processGridFormDTO), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败"); + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败", null); Optional.of(processGridInfo).ifPresent((grid) -> process.setGridName(grid.getGridName())); } @@ -119,7 +119,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R CustomerStaffDTO processCustomerStaffDTO = new CustomerStaffDTO(); processCustomerStaffDTO.setUserId(process.getStaffId()); CustomerStaffDTO processStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(processCustomerStaffDTO), - ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点用户信息失败"); + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点用户信息失败", null); process.setStaffName(processStaffInfo.getRealName()); process.setCreatedBy(processStaffInfo.getRealName()); @@ -147,7 +147,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R // 组织信息 if (StringUtils.isNotBlank(assignedStaff.getOrgId())) { CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败"); + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败", null); assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName()); } @@ -157,7 +157,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO(); assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId()); CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO), - ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败"); + ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败", null); Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName())); } @@ -166,7 +166,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO(); assignedStaffDTO.setUserId(assignedStaff.getStaffId()); CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO), - ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败", null); assignedStaff.setStaffName(assignedStaffInfo.getRealName()); @@ -174,7 +174,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R CustomerStaffDTO createStaffDTO = new CustomerStaffDTO(); createStaffDTO.setUserId(assignedStaff.getCreatedBy()); CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO), - ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败"); + ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败", null); Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName())); } From 93f64369b47f36ba360a7516106a40ca269f81ec Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 09:47:18 +0800 Subject: [PATCH 465/589] =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E9=A5=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/CategoryListResultDTO.java | 7 ++ .../mapper/IssueProjectCategoryDictDao.xml | 3 +- .../ProjectDistributionAnalysisFormDTO.java | 23 +++++ .../com/epmet/dto/result/CategoryListDTO.java | 38 ++++++++ .../dto/result/ProjectCategoryByDateDTO.java | 27 ++++++ ...jectDistributionAnalysisLeftResultDTO.java | 27 ++++++ .../epmet/controller/ProjectController.java | 16 ++++ .../main/java/com/epmet/dao/ProjectDao.java | 10 +++ .../com/epmet/service/ProjectService.java | 11 +++ .../service/impl/ProjectServiceImpl.java | 89 ++++++++++++++++++- .../src/main/resources/mapper/ProjectDao.xml | 14 +++ 11 files changed, 261 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java index 9e7844c3ea..ae61ba1769 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -24,8 +25,14 @@ public class CategoryListResultDTO implements Serializable { */ private String categoryName; + private Integer count; + + private Integer codeLength; + public CategoryListResultDTO() { this.categoryCode = ""; this.categoryName = ""; + this.count = NumConstant.ZERO; + this.codeLength = NumConstant.ZERO; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index a421f1c647..0030bb0a27 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -249,7 +249,8 @@ + SELECT + DISTINCT p.ID AS projectId, + p.CREATED_TIME AS createdTime, + LEFT(pc.CATEGORY_CODE,#{codeLength}) AS categoryCode + FROM project p + INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0) + WHERE p.DEL_FLAG = 0 + AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') = #{date} + ORDER BY projectId + \ No newline at end of file From 15dd331cb8e94ef46b41af17f6159512aaf88670 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 10:00:03 +0800 Subject: [PATCH 466/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=86=E6=9E=90=E3=80=91=E4=BA=8B=E4=BB=B6=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 27 +++++++++++ .../result/FactAgencyProjectResultDTO.java | 35 ++++++++++++++ .../govproject/form/ProjectTotalFormDTO.java | 5 ++ .../result/ProjectTotalResultDTO.java | 14 +++--- .../dataaggre/dao/datastats/DataStatsDao.java | 7 +++ .../service/datastats/DataStatsService.java | 6 +++ .../datastats/impl/DataStatsServiceImpl.java | 12 ++++- .../impl/GovProjectServiceImpl.java | 37 +++++++++++++- .../mapper/datastats/DatsStatsDao.xml | 48 +++++++++++++++++++ 9 files changed, 182 insertions(+), 9 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index cfca4dec6f..72ef2b483d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -890,4 +890,31 @@ public class DateUtils { format = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD); System.out.println(format); } + + /** + * @Author sun + * @Description 获取dateId对应的num天的dateId活monthId + * dateId yyyymmdd + * type[date;month] + * num[1;-1] + * 20211201 date 1 -> 20211202 + * 20211201 month -1 -> 202111 + **/ + public static String dateOrmonthId(String dateId, String type, int num){ + Calendar cal=Calendar.getInstance(); + if (StringUtils.isNotBlank(dateId)){ + cal.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD)); + } + if("date".equals(type)){ + cal.add(Calendar.DATE, num); + }else if("month".equals(type)){ + cal.add(Calendar.MONTH, num); + } + Date time=cal.getTime(); + if("month".equals(type)){ + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time); + } + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java new file mode 100644 index 0000000000..4418c02cb3 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description 项目总数-接口返参 + * @Auth sun + */ +@Data +public class FactAgencyProjectResultDTO implements Serializable { + private static final long serialVersionUID = 466974582608407121L; + @JsonIgnore + BigDecimal bi = new BigDecimal(0); + //组织Id + private String agencyId; + //组织名称 + private String dateId; + //问题解决总数 + private String monthId; + //党群自治占比 + private Integer projectTotal = 0; + //网格自治占比 + private Integer pendingTotal = 0; + //社区解决占比 + private String pendingRatio = "0%"; + //区直部门解决占比 + private Integer closedTotal = 0; + //街道解决占比 + private String closedRatio = "0%"; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index 975e22596b..bf02cf40f2 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -32,4 +32,9 @@ public class ProjectTotalFormDTO implements Serializable { public interface Statuslist extends CustomerClientShowGroup { } + //较昨日的dateId值 + private String yeDateId; + //较dateId上月的monthId值 + private String monthId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java index 541a742582..9afb3cb712 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java @@ -17,18 +17,18 @@ public class ProjectTotalResultDTO implements Serializable { //日期yyyymmdd private String dateId; //项目总数 - private Integer projectTotal; + private Integer projectTotal = 0; //较昨日数 - private Integer dateIncr; + private Integer dateIncr = 0; //较上月数 - private Integer monthIncr; + private Integer monthIncr = 0; //未结案项目数 - private Integer pendingTotal; + private Integer pendingTotal = 0; //为结案项目占比 xx% - private String pendingRatio; + private String pendingRatio = "0%"; //已结案项目数 - private Integer closedTotal; + private Integer closedTotal = 0; //已结案项目占比 - private String closedRatio; + private String closedRatio = "0%"; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 8696fa47a3..b41d0cd9b1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -24,6 +24,7 @@ import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO; import com.epmet.dataaggre.dto.datastats.result.*; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; @@ -335,4 +336,10 @@ public interface DataStatsDao { * @author sun */ List projectList(CustomerDataManageFormDTO formDTO); + + /** + * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据 + * @author sun + */ + List getProjectTotal(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 36fa24c7b2..80aa4defb5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -6,6 +6,7 @@ import com.epmet.dataaggre.dto.datastats.result.*; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; @@ -247,4 +248,9 @@ public interface DataStatsService { */ CustomerDataManageResultDTO operateExport(CustomerDataManageFormDTO formDTO) throws ParseException; + /** + * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据 + * @author sun + */ + List getProjectTotal(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index e2156dbadb..88ff22c7db 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -23,7 +23,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; -import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; + import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; + import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; @@ -2114,5 +2115,14 @@ public class DataStatsServiceImpl implements DataStatsService { return resultDTO; } + /** + * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据 + * @author sun + */ + @Override + public List getProjectTotal(ProjectTotalFormDTO formDTO) { + return dataStatsDao.getProjectTotal(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index a0401eb9b8..16e8dd97d0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -5,10 +5,12 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; +import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; @@ -17,6 +19,7 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; +import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.govissue.GovIssueService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; @@ -52,6 +55,8 @@ public class GovProjectServiceImpl implements GovProjectService { private GovIssueService govIssueService; @Autowired private ResiGroupService resiGroupService; + @Autowired + private DataStatsService dataStatsService; /** * @Description 查询项目信息 @@ -251,7 +256,37 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO) { - return null; + ProjectTotalResultDTO result = new ProjectTotalResultDTO(); + result.setAgencyId(formDTO.getAgencyId()); + result.setDateId(formDTO.getDateId()); + //较昨日dateId值 + formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", -1)); + //较上月monthId值 + formDTO.setMonthId(DateUtils.dateOrmonthId(formDTO.getDateId(), "month", -1)); + + //1.分别查询组织下dateId、较昨日、较上月项目统计数据 + List list = dataStatsService.getProjectTotal(formDTO); + if (CollectionUtils.isEmpty(list) || !formDTO.getDateId().equals(list.get(0).getDateId())) { + return result; + } + + //2.封装数据 + list.forEach(l -> { + if (formDTO.getDateId().equals(l.getDateId())) { + s result.setProjectTotal(l.getProjectTotal()); + result.setPendingTotal(l.getPendingTotal()); + result.setPendingRatio(l.getPendingRatio()); + result.setClosedTotal(l.getClosedTotal()); + result.setClosedRatio(l.getClosedRatio()); + } + if (formDTO.getYeDateId().equals(l.getDateId())) { + result.setDateIncr(result.getProjectTotal() - l.getProjectTotal()); + } else if (formDTO.getMonthId().equals(l.getMonthId())) { + result.setMonthIncr(result.getProjectTotal() - l.getProjectTotal()); + } + }); + + return result; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 3332f525f3..2c39797518 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1035,4 +1035,52 @@ GROUP BY t.orgId + + From b60d3304bea00dad0496161bc7342cd2534e2f7e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 10:00:34 +0800 Subject: [PATCH 467/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=86=E6=9E=90=E3=80=91=E4=BA=8B=E4=BB=B6=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 16e8dd97d0..d6af5cfe8b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -273,7 +273,7 @@ public class GovProjectServiceImpl implements GovProjectService { //2.封装数据 list.forEach(l -> { if (formDTO.getDateId().equals(l.getDateId())) { - s result.setProjectTotal(l.getProjectTotal()); + result.setProjectTotal(l.getProjectTotal()); result.setPendingTotal(l.getPendingTotal()); result.setPendingRatio(l.getPendingRatio()); result.setClosedTotal(l.getClosedTotal()); From 2a859c90ad3d2cae88a21ec8d86b32aa9f61e79e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 10:23:36 +0800 Subject: [PATCH 468/589] =?UTF-8?q?=E5=8F=B3=E9=A5=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDistributionAnalysisFormDTO.java | 4 ++ .../ProjectDistributionAnalysisRightDTO.java | 38 +++++++++++++++++++ ...ectDistributionAnalysisRightResultDTO.java | 33 ++++++++++++++++ .../epmet/controller/ProjectController.java | 13 +++++++ .../com/epmet/service/ProjectService.java | 9 +++++ .../service/impl/ProjectServiceImpl.java | 12 ++++++ 6 files changed, 109 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java index 745febe364..6cf6eaa2d4 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -20,4 +20,8 @@ public class ProjectDistributionAnalysisFormDTO implements Serializable { @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) private String date; + private String orgId; + + private String orgType; + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java new file mode 100644 index 0000000000..da965870b5 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/8 10:14 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisRightDTO implements Serializable { + + private static final long serialVersionUID = 7233782006110358477L; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织类型，组织：agency，网格：grid + */ + private String orgType; + + /** + * 热力值 + */ + private Integer count; + + public ProjectDistributionAnalysisRightDTO() { + this.orgId = ""; + this.orgType = ""; + this.count = NumConstant.ZERO; + } +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java new file mode 100644 index 0000000000..1801d1c1d7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/12/8 10:11 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisRightResultDTO implements Serializable { + + private static final long serialVersionUID = 8359144215262197796L; + + /** + * ..以上 + */ + private String under; + + /** + * 中间区间 + */ + private String middle; + /** + * ..以下 + */ + private String above; + + private List list; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 085cc4c333..edaaa2bc28 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -287,4 +287,17 @@ public class ProjectController { return new Result>().ok(projectService.projectDistributionAnalysisLeft(formDTO,tokenDto)); } + /** + * @Description 【社区治理】项目分布分析-右边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 10:21 上午 + */ + @PostMapping("projectdistributionanalysisright") + public Result projectDistributionAnalysisRight(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class); + return new Result().ok(projectService.projectDistributionAnalysisRight(formDTO,tokenDto)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 7a780592e1..7be2c6d71f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -342,4 +342,13 @@ public interface ProjectService extends BaseService { */ List projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + /** + * @Description 【社区治理】项目分布分析-右边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 10:21 上午 + */ + ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index d393cad3a7..adeb5eae2a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2819,6 +2819,18 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Wed, 8 Dec 2021 11:07:32 +0800 Subject: [PATCH 469/589] LinkedList --- .../epmet/commons/tools/utils/DateUtils.java | 28 +++++++++++++++++++ .../FactAgencyProjectMonthResultDTO.java | 21 ++++++++++++++ .../result/FactAgencyProjectResultDTO.java | 12 ++++---- .../govproject/form/ProjectTotalFormDTO.java | 4 +++ .../result/ProjectMonthIncrResultDTO.java | 4 +-- .../controller/GovProjectController.java | 5 ++-- .../dataaggre/dao/datastats/DataStatsDao.java | 7 +++++ .../service/datastats/DataStatsService.java | 7 +++++ .../datastats/impl/DataStatsServiceImpl.java | 10 +++++++ .../service/govproject/GovProjectService.java | 3 +- .../impl/GovProjectServiceImpl.java | 27 ++++++++++++++++-- .../mapper/datastats/DatsStatsDao.xml | 14 ++++++++++ 12 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 72ef2b483d..db6abec6aa 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -11,6 +11,7 @@ package com.epmet.commons.tools.utils; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.TimeListResultDTO; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; @@ -917,4 +918,31 @@ public class DateUtils { return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); } + /** + * @Author sun + * @Description 获取dateId对应上一个月过去12个月的monthId + * dateId yyyymmdd + * 20211201 -> 202012-202111的值 + **/ + public static LinkedHashMap getXproSub(String dateId){ + java.time.format.DateTimeFormatter fmt = java.time.format.DateTimeFormatter.ofPattern("yyyyMM"); + LinkedHashMap xAxis = new LinkedHashMap<>(); + Calendar cal=Calendar.getInstance(); + cal.setTime(DateUtils.parseDate(dateId, DateUtils.DATE_PATTERN_YYYYMMDD)); + TimeZone tz = cal.getTimeZone(); + ZoneId zid = tz == null ? ZoneId.systemDefault() : tz.toZoneId(); + java.time.LocalDate today = java.time.LocalDateTime.ofInstant(cal.toInstant(), zid).toLocalDate(); + //java.time.LocalDate today = java.time.LocalDate.now(); + + for(int i = NumConstant.TWELVE;i > NumConstant.ZERO; i--){ + java.time.LocalDate localDate = today.minusMonths(i); + String s = localDate.getMonth().getValue() + "月"; + xAxis.put(localDate.format(fmt),s); + } + LinkedHashMap result = Maps.newLinkedHashMap(); + xAxis.entrySet().stream().sorted(Map.Entry.comparingByKey()) + .forEachOrdered((e -> result.put(e.getKey(),e.getValue()))); + return result; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java new file mode 100644 index 0000000000..8138219216 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 项目月数据-接口返参 + * @Auth sun + */ +@Data +public class FactAgencyProjectMonthResultDTO implements Serializable { + private static final long serialVersionUID = 466974582608407121L; + //组织Id + private String agencyId; + //月维度Id + private String monthId; + //当月项目总数 【当前组织及下级前一月新增项目数】 + private Integer projectIncr = 0; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java index 4418c02cb3..13bc60fa06 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java @@ -19,17 +19,17 @@ public class FactAgencyProjectResultDTO implements Serializable { private String agencyId; //组织名称 private String dateId; - //问题解决总数 + //月维度Id private String monthId; - //党群自治占比 + //项目总数 private Integer projectTotal = 0; - //网格自治占比 + //处理中项目数 private Integer pendingTotal = 0; - //社区解决占比 + //处理中项目占比 private String pendingRatio = "0%"; - //区直部门解决占比 + //已结案中项目数 private Integer closedTotal = 0; - //街道解决占比 + //已结案中项目占比 private String closedRatio = "0%"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index bf02cf40f2..ff60c5eb79 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -36,5 +36,9 @@ public class ProjectTotalFormDTO implements Serializable { private String yeDateId; //较dateId上月的monthId值 private String monthId; + //查询数据起始月份Id + private String startMonth; + //查询数据结束月份Id + private String endMonth; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java index 8947eb971b..ade71720ed 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java @@ -13,8 +13,8 @@ public class ProjectMonthIncrResultDTO implements Serializable { private static final long serialVersionUID = 6188316867855643263L; //横坐标值 - private String value; + private Integer value; //横坐标 - private Integer type; + private String type; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 503caedfb4..42d4633398 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -17,6 +17,7 @@ import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.LinkedList; import java.util.List; /** @@ -75,9 +76,9 @@ public class GovProjectController { * @author sun */ @PostMapping("projectmonthincr") - public Result> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) { + public Result> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Monthincr.class); - return new Result>().ok(govProjectService.projectMonthIncr(formDTO)); + return new Result>().ok(govProjectService.projectMonthIncr(formDTO)); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index b41d0cd9b1..237432f5c2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -25,6 +25,7 @@ import com.epmet.dataaggre.dto.datastats.result.*; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; @@ -342,4 +343,10 @@ public interface DataStatsDao { * @author sun */ List getProjectTotal(ProjectTotalFormDTO formDTO); + + /** + * @Description 查询dateId的上一月过去12个月份组织项目数据 + * @author sun + */ + List getProjectMonthIncr(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 80aa4defb5..de584839e2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; @@ -253,4 +254,10 @@ public interface DataStatsService { * @author sun */ List getProjectTotal(ProjectTotalFormDTO formDTO); + + /** + * @Description 查询dateId的上一月过去12个月份组织项目数据 + * @author sun + */ + List getProjectMonthIncr(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 88ff22c7db..31cf2174d6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; + import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; @@ -2124,5 +2125,14 @@ public class DataStatsServiceImpl implements DataStatsService { return dataStatsDao.getProjectTotal(formDTO); } + /** + * @Description 查询dateId的上一月过去12个月份组织项目数据 + * @author sun + */ + @Override + public List getProjectMonthIncr(ProjectTotalFormDTO formDTO) { + return dataStatsDao.getProjectMonthIncr(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index a09c9257db..1cf1c73f18 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.*; +import java.util.LinkedList; import java.util.List; /** @@ -61,7 +62,7 @@ public interface GovProjectService { * @Description 赋能平台【项目处理分析】进12月新增项目折线图 * @author sun */ - List projectMonthIncr(ProjectTotalFormDTO formDTO); + LinkedList projectMonthIncr(ProjectTotalFormDTO formDTO); /** * @Description 赋能平台【项目处理分析】按状态查询项目列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index d6af5cfe8b..b3da96257b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; +import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -294,8 +295,30 @@ public class GovProjectServiceImpl implements GovProjectService { * @author sun */ @Override - public List projectMonthIncr(ProjectTotalFormDTO formDTO) { - return null; + public LinkedList projectMonthIncr(ProjectTotalFormDTO formDTO) { + LinkedList resultList = new LinkedList<>(); + //1.获取起始终止月份值 + LinkedHashMap map = DateUtils.getXproSub(formDTO.getDateId()); + List monthIdList = map.keySet().stream().collect(Collectors.toList()); + formDTO.setStartMonth(monthIdList.get(NumConstant.ZERO)); + formDTO.setEndMonth(monthIdList.get(NumConstant.ELEVEN)); + + //2.查询dateId的上一月过去12个月份数据【2021-12-08 数据是202012到202111的数据】 + List list = dataStatsService.getProjectMonthIncr(formDTO); + + //3.封装数据并返回 + map.forEach((k, v) -> { + ProjectMonthIncrResultDTO dto = new ProjectMonthIncrResultDTO(); + dto.setType(v); + list.forEach(l -> { + if (k.equals(l.getMonthId())) { + dto.setValue(l.getProjectIncr()); + } + }); + resultList.add(dto); + }); + + return resultList; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 2c39797518..4943a96776 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1083,4 +1083,18 @@ ORDER BY a.date_id DESC + + From 87fbaa7ab344fe572a59bf38d701d354ccd1993d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 11:12:38 +0800 Subject: [PATCH 470/589] emm --- .../service/impl/ProjectServiceImpl.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index adeb5eae2a..6614b7002a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2847,9 +2847,9 @@ public class ProjectServiceImpl extends BaseServiceImpl { AtomicReference count = new AtomicReference<>(cate.getCount()); groupByCode.forEach((k,v) -> { @@ -2862,17 +2862,27 @@ public class ProjectServiceImpl extends BaseServiceImpl { AtomicReference count = new AtomicReference<>(cate.getCount()); groupByCode.forEach((k,v) -> { if (cate.getCategoryCode().equals(k)){ v.forEach(l -> { - if (l.getCreatedTime().getTime() < end && l.getCreatedTime().getTime() >= start){ + if (l.getCreatedTime().getTime() < finalEnd && l.getCreatedTime().getTime() >= start){ cate.setCount(count.getAndSet(count.get() + NumConstant.ONE)); } }); @@ -2912,8 +2922,6 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Wed, 8 Dec 2021 12:14:13 +0800 Subject: [PATCH 471/589] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=8F=82epmetUserIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserPointActionLogServiceImpl.java | 2 +- .../src/main/resources/mapper/UserPointActionLogDao.xml | 4 +++- .../java/com/epmet/dto/form/PageUserReportEventFormDTO.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index c27498a82b..45bbb65790 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -571,7 +571,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pageUserPoint(IcResiPointPageFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getEpmetUserId())){ + if(org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ return new PageData(new ArrayList<>(),NumConstant.ZERO); } PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 8996007d8a..c6136f2202 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -52,7 +52,9 @@ USER_POINT_ACTION_LOG WHERE DEL_FLAG = '0' - AND USER_ID = #{epmetUserId} + + USER_ID = #{epmetUserId} + ORDER BY CREATED_TIME DESC diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java index 8d18c2a7ea..f4821b54b7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; @Data @@ -11,7 +12,7 @@ public class PageUserReportEventFormDTO implements Serializable { public interface AddUserInternalGroup { } //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) - private String epmetUserId; + private List epmetUserIdList; @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) From f14ebb24c09157a24067df9c556c9a920f70e191 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 13:06:17 +0800 Subject: [PATCH 472/589] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=8F=82epmetUserIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java index d4a8fb1f89..727bf1f558 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java @@ -4,13 +4,13 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; @Data public class IcResiPointPageFormDTO implements Serializable { public interface AddUserInternalGroup { } - //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) - private String epmetUserId; + private List epmetUserIdList; @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) From d1965876e74c565e3394a5652d2c3f62d0716129 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 13:31:36 +0800 Subject: [PATCH 473/589] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/PageUserReportEventFormDTO.java | 4 ++- .../dto/result/PageUserReportEventResDTO.java | 26 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 2 +- .../main/java/com/epmet/dao/ResiEventDao.java | 15 ++++++++--- .../com/epmet/service/ResiEventService.java | 7 +++++ .../service/impl/ResiEventServiceImpl.java | 15 +++++++++-- .../main/resources/mapper/ResiEventDao.xml | 16 ++++++++++++ 7 files changed, 77 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java index f4821b54b7..0a7b966a62 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -6,7 +6,9 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; - +/** + * 数据分析-个人档案-上报事件列表入参 + */ @Data public class PageUserReportEventFormDTO implements Serializable { public interface AddUserInternalGroup { diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java index 2f86cdef7d..d562132e12 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java @@ -1,9 +1,35 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; +/** + * 数据分析-个人档案-上报事件列表入参 + */ @Data public class PageUserReportEventResDTO implements Serializable { + private String resiEventId; + /** + * 事件内容 + */ + private String eventContent; + + /** + * 事件上报事件 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date reportTime; + + /** + * true 已转项目；false:未转项目 + */ + private Boolean shiftProject; + + /** + * 项目id + */ + private String projectId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 09dcb021f8..c868dbff0d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -217,7 +217,7 @@ public class ResiEventController { /** * 数据分析-个人档案-上报事件列表 - * + * 根据epmetUserIdList查询 * @param formDTO * @return com.epmet.commons.tools.utils.Result> * @author yinzuomei diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index 6275a0d821..a39c72aa76 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -18,10 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.NewEventsResultDTO; +import com.epmet.dto.form.PageUserReportEventFormDTO; +import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -88,4 +86,13 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/5 10:42 上午 */ List newEvents(@Param("orgIds")List orgIds); + + /** + * 数据分析-个人档案-上报事件列表 + * 根据epmetUserIdList查询 + * + * @param formDTO + * @return + */ + List selectUserReported(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index cabf11aeb7..f9712c498b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -131,5 +131,12 @@ public interface ResiEventService extends BaseService { */ ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId); + /** + * 数据分析-个人档案-上报事件列表 + * 根据epmetUserIdList查询 + * + * @param formDTO + * @return + */ PageData pageUserReported(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 1a8ae98cde..cbd5ff6b3c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -640,10 +640,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl pageUserReported(PageUserReportEventFormDTO formDTO) { - //todo - return null; + if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 3284be99e6..d88575dbab 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -201,4 +201,20 @@ ) ORDER BY ro.CREATED_TIME DESC + + \ No newline at end of file From 5a94f7a20a51f6c727bcb96bb245c0f329d1937d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 13:56:45 +0800 Subject: [PATCH 474/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=88=86=E6=9E=90=E3=80=91=E6=8C=89=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govproject/form/ProjectTotalFormDTO.java | 2 ++ .../controller/GovProjectController.java | 9 +++------ .../dataaggre/dao/govproject/ProjectDao.java | 9 +++++++++ .../service/govproject/GovProjectService.java | 2 +- .../impl/GovProjectServiceImpl.java | 8 ++++++-- .../mapper/govproject/ProjectDao.xml | 19 +++++++++++++++++++ 6 files changed, 40 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index ff60c5eb79..b277be17c9 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -40,5 +40,7 @@ public class ProjectTotalFormDTO implements Serializable { private String startMonth; //查询数据结束月份Id private String endMonth; + //明天的dateId值 + private String toDateId; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 42d4633398..1d448806b4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -9,10 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; -import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; +import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -86,9 +83,9 @@ public class GovProjectController { * @author sun */ @PostMapping("projectstatuslist") - public Result> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) { + public Result> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class); - return new Result>().ok(govProjectService.projectStatusList(formDTO)); + return new Result>().ok(govProjectService.projectStatusList(formDTO)); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 4697a0f267..0fb0c154dc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -21,8 +21,11 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; import com.epmet.dataaggre.entity.govproject.ProjectEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -70,4 +73,10 @@ public interface ProjectDao extends BaseDao { List selectList(@Param("customerId") String customerId,@Param("list")List issueIds); int countRedDot(String userId); + + /** + * @Description 查询组织下截止到dateId的某个状态的项目列表 + * @author sun + */ + List getProjectStatusList(ProjectTotalFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 1cf1c73f18..0265b0312f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -68,5 +68,5 @@ public interface GovProjectService { * @Description 赋能平台【项目处理分析】按状态查询项目列表 * @author sun */ - List projectStatusList(ProjectTotalFormDTO formDTO); + List projectStatusList(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index b3da96257b..058b0cce9a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -326,8 +326,12 @@ public class GovProjectServiceImpl implements GovProjectService { * @author sun */ @Override - public List projectStatusList(ProjectTotalFormDTO formDTO) { - return null; + public List projectStatusList(ProjectTotalFormDTO formDTO) { + //所选日期后一天的dateId值 + formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1)); + //1.查询组织下截止到dateId的某个状态的项目列表 + List resultList = projectDao.getProjectStatusList(formDTO); + return resultList; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 1e144e3420..6b88005261 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -155,4 +155,23 @@ AND rem.RED_DOT = '1' AND rem.USER_ID = #{userId} + + + \ No newline at end of file From af133e21680a9328d7845e6022e3e725b6520a77 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 14:02:33 +0800 Subject: [PATCH 475/589] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/ProjectConstant.java | 2 ++ .../main/java/com/epmet/dao/ProjectDao.java | 8 ++++--- .../service/impl/ProjectServiceImpl.java | 21 ++++++++++++++++++- .../src/main/resources/mapper/ProjectDao.xml | 3 +++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index b5acf5b2e7..205d91bc3d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -195,4 +195,6 @@ public interface ProjectConstant { String SORT_ASC = "asc"; String SORT_DESC = "desc"; + String ORG_TYPE_GRID = "grid"; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 4f65e09ab8..c070c7e8ac 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -219,12 +219,14 @@ public interface ProjectDao extends BaseDao { List selectByOriginId(String originId); /** - * @Description 根据日期查询项目分类 + * @Description 根据日期查询项目分类 * @param date * @param orgId + * @param codeLength 1级分类编码长度 + * @param originGrid 是否来源网格 * @author zxc - * @date 2021/12/7 2:43 下午 + * @date 2021/12/8 1:37 下午 */ - List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength); + List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength,@Param("originGrid")Boolean originGrid); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 6614b7002a..b83310b93c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2812,7 +2812,12 @@ public class ProjectServiceImpl extends BaseServiceImpl projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength()); + List projectCategoryByDateDTOS = new ArrayList<>(); + if (formDTO.getOrgType().equals(ProjectConstant.ORG_TYPE_GRID)){ + projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),true); + }else { + projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),false); + } if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){ return new ArrayList<>(); } @@ -2821,6 +2826,20 @@ public class ProjectServiceImpl extends BaseServiceImpl + p.ORIGIN = 'issue' + ORDER BY projectId \ No newline at end of file From e18ea027e2ab8efaa857dd4e8f3f971cdf53e50b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 14:07:28 +0800 Subject: [PATCH 476/589] =?UTF-8?q?/heart/userdemand/mydemand=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E6=94=B9=E4=B8=BAicResiUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java | 4 ++-- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java index f29e088293..4589bbd9ed 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java @@ -16,8 +16,8 @@ public class IcResiUserDemandFromDTO implements Serializable { /** * 居民信息录入的居民的id */ - @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) - private String userId; + @NotBlank(message = "icResiUserId不能为空", groups = AddUserInternalGroup.class) + private String icResiUserId; /** * icresiuser/persondata接口返参中有此值 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 3a0f278b10..9f37c99a6a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -476,7 +476,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userIds=new ArrayList<>(); - userIds.add(formDTO.getUserId()); + userIds.add(formDTO.getIcResiUserId()); if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ userIds.addAll(formDTO.getEpmetUserIdList()); } From 8fcb8cf1cf3aec6d8ea4c5534a02bd569734cfa5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 14:35:23 +0800 Subject: [PATCH 477/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=88=86=E6=9E=90=E3=80=91=E6=96=B9=E6=B3=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CategoryProjectFormDTO.java | 40 +++++++++++++++ .../form/ProjectAnalysisFormDTO.java | 34 +++++++++++++ .../form/ProjectCategoryTotalFormDTO.java | 30 +++++++++++ .../govproject/form/ProjectTotalFormDTO.java | 2 +- .../result/CategoryProjectResultDTO.java | 51 +++++++++++++++++++ .../result/ProjectAnalysisResultDTO.java | 34 +++++++++++++ .../result/ProjectCategoryTotalResultDTO.java | 24 +++++++++ .../controller/GovProjectController.java | 34 +++++++++++-- .../service/govproject/GovProjectService.java | 22 ++++++-- .../impl/GovProjectServiceImpl.java | 31 +++++++++-- 10 files changed, 292 insertions(+), 10 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java new file mode 100644 index 0000000000..726d01dbce --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目分类分析】-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class CategoryProjectFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //组织Id + @NotBlank(message = "组织ID不能为空", groups = {Category.class}) + private String agencyId; + //日期yyyymmdd + @NotBlank(message = "组织ID不能为空", groups = {Category.class}) + private String dateId; + //一级分类Id + @NotBlank(message = "分类Id不能为空", groups = {Category.class}) + private String categoryId; + //页码 + @Min(1) + private Integer pageNo = 1; + //每页多少条 + private Integer pageSize = 20; + //是否分页(是:true 否:false) + private Boolean isPage = true; + + public interface Category extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java new file mode 100644 index 0000000000..9689899cc4 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目分类分析】-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class ProjectAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //日期yyyymmdd + @NotBlank(message = "日维度ID不能为空", groups = {Analysis.class}) + private String dateId; + //小程序话题或事件发起人Id + @NotBlank(message = "话题或事件发起人Id不能为空", groups = {Analysis.class}) + private String userId; + //一级分类Id集合 + @NotNull(message = "分类Id集合不能为空", groups = {Analysis.class}) + private List categoryIdList; + + public interface Analysis extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java new file mode 100644 index 0000000000..eddd513d1c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目分类分析】-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class ProjectCategoryTotalFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //组织Id + @NotBlank(message = "组织ID不能为空", groups = {Project.class}) + private String agencyId; + //日期yyyymmdd + @NotBlank(message = "日维度ID不能为空", groups = {Project.class}) + private String dateId; + + public interface Project extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java index b277be17c9..22c0e731b6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -19,7 +19,7 @@ public class ProjectTotalFormDTO implements Serializable { @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) private String agencyId; //日期yyyymmdd - @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) + @NotBlank(message = "日维度ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) private String dateId; //状态:待处理 pending，结案closed @NotBlank(message = "项目状态不能为空", groups = {Statuslist.class}) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java new file mode 100644 index 0000000000..6f24967aba --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 赋能平台【项目处理分析】分类下项目列表-接口返参 + * @Auth sun + */ +@Data +public class CategoryProjectResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //总条数 + private Integer total = 0; + + private List list; + + @Data + public static class Project { + //项目所属组织Id + private String agencyId; + //项目Id + private String projectId; + //项目编码[目前没这个功能 默认为空] + private String projectCode = ""; + //一级分类Id集合 + private List categoryIds; + //一级分类名称集合 + private List categoryNames; + //来源：议题issue 项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】 + private String origin; + //网格Id[立项项目此值为空] + private String gridId; + //网格名[立项项目此值为空] + private String gridName; + //状态:待处理 pending，已结案closed + private String status; + //标题 + private String title; + //转项目时间 + private String time; + //当前人员是否处理：未处理unhandled，已处理handle + private String isHandle; + //小程序居民端话题或事件创建人【立项项目此值为空】 + private String userId; + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java new file mode 100644 index 0000000000..62a949a3d2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目处理分析】研判分析-接口返参 + * @Auth sun + */ +@Data +public class ProjectAnalysisResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //组织Id + private String agencyId; + //日期yyyymmdd + private String dateId; + //项目总数 + private Integer projectTotal = 0; + //较昨日数 + private Integer dateIncr = 0; + //较上月数 + private Integer monthIncr = 0; + //未结案项目数 + private Integer pendingTotal = 0; + //为结案项目占比 xx% + private String pendingRatio = "0%"; + //已结案项目数 + private Integer closedTotal = 0; + //已结案项目占比 + private String closedRatio = "0%"; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java new file mode 100644 index 0000000000..1d95b68175 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目分类分析】各分类项目数图表-接口返参 + * @Auth sun + */ +@Data +public class ProjectCategoryTotalResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //组织Id + private String agencyId; + //一级分类Id + private String categoryId; + //一级分类名称 + private String categoryName; + //分类下项目总数 + private Integer total = 0; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 1d448806b4..396f14543d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -6,9 +6,7 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,4 +86,34 @@ public class GovProjectController { return new Result>().ok(govProjectService.projectStatusList(formDTO)); } + /** + * @Description 赋能平台【项目分类分析】各分类项目数图表 + * @author sun + */ + @PostMapping("projectcategorylist") + public Result projectCategoryList(@RequestBody ProjectCategoryTotalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectCategoryTotalFormDTO.Project.class); + return new Result().ok(govProjectService.projectCategoryList(formDTO)); + } + + /** + * @Description 赋能平台【项目处理分析】分类下项目列表 + * @author sun + */ + @PostMapping("categoryprojectlist") + public Result categoryProjectList(@RequestBody CategoryProjectFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class); + return new Result().ok(govProjectService.categoryProjectList(formDTO)); + } + + /** + * @Description 赋能平台【项目处理分析】研判分析 + * @author sun + */ + @PostMapping("projectanalysis") + public Result projectAnalysis(@RequestBody ProjectAnalysisFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class); + return new Result().ok(govProjectService.projectAnalysis(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 0265b0312f..035e9d5400 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -2,9 +2,7 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; -import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import java.util.LinkedList; @@ -69,4 +67,22 @@ public interface GovProjectService { * @author sun */ List projectStatusList(ProjectTotalFormDTO formDTO); + + /** + * @Description 赋能平台【项目分类分析】各分类项目数图表 + * @author sun + */ + ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO); + + /** + * @Description 赋能平台【项目处理分析】分类下项目列表 + * @author sun + */ + CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO); + + /** + * @Description 赋能平台【项目处理分析】研判分析 + * @author sun + */ + ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 058b0cce9a..9f594e6b70 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -15,9 +15,7 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; -import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; @@ -334,4 +332,31 @@ public class GovProjectServiceImpl implements GovProjectService { return resultList; } + /** + * @Description 赋能平台【项目分类分析】各分类项目数图表 + * @author sun + */ + @Override + public ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { + return null; + } + + /** + * @Description 赋能平台【项目处理分析】分类下项目列表 + * @author sun + */ + @Override + public CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO) { + return null; + } + + /** + * @Description 赋能平台【项目处理分析】研判分析 + * @author sun + */ + @Override + public ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO) { + return null; + } + } From b18f1a4558b43f158122a1e4f3ae5a785fb622f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 14:52:57 +0800 Subject: [PATCH 478/589] =?UTF-8?q?/heart/userdemand/mydemand=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/demand/IcResiUserReportDemandRes.java | 3 +++ .../epmet/service/impl/IcUserDemandRecServiceImpl.java | 1 + .../src/main/resources/mapper/IcUserDemandRecDao.xml | 9 +++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java index e4792920b3..869f1b01e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java @@ -30,4 +30,7 @@ public class IcResiUserReportDemandRes implements Serializable { private String status; private String statusName; + + private String firstCategoryCode; + private String firstCategoryName; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 9f37c99a6a..b3b746eff1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -498,6 +498,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 33d491e2b4..e4ac17efca 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -129,7 +129,8 @@ r.PARENT_CODE as parentCode, r.CONTENT, r.`STATUS`, - r.WANT_SERVICE_TIME as wantServiceTime + r.WANT_SERVICE_TIME as wantServiceTime, + left(r.CATEGORY_CODE,4) as firstCategoryCode FROM ic_user_demand_rec r WHERE @@ -181,11 +182,7 @@ IFNULL(s.FINISH_DESC,'') as finishDesc, '' AS serviceShowName, s.id as serviceId, - ( - case when r.PARENT_CODE !='0' then r.PARENT_CODE - ELSE R.CATEGORY_CODE - END - ) as firstCategoryCode + left(r.CATEGORY_CODE,4) as firstCategoryCode FROM ic_user_demand_rec r left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' ) From 98e9a1cf4aa27b2fae4ac31bd215d444e3d94172 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Dec 2021 15:12:05 +0800 Subject: [PATCH 479/589] emm --- .../com/epmet/controller/IssueController.java | 2 ++ .../mapper/IssueProjectCategoryDictDao.xml | 2 +- .../ProjectDistributionAnalysisFormDTO.java | 7 +++++-- .../main/java/com/epmet/dao/ProjectDao.java | 9 +++++---- .../epmet/service/impl/ProjectServiceImpl.java | 18 ++++++++---------- .../src/main/resources/mapper/ProjectDao.xml | 8 +++----- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index cec85e03e5..3378abc1b4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -284,5 +284,7 @@ public class IssueController { return new Result>().ok(issueService.getUnResolvedList(formDTO)); } +// @PostMapping("resibuzz") + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 0030bb0a27..6c5d46eedd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -256,7 +256,7 @@ AND CUSTOMER_ID = #{customerId} AND CATEGORY_TYPE = 1 AND IS_DISABLE = 'enable' - ORDER BY CATEGORY_CODE + ORDER BY SORT diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java index 6cf6eaa2d4..d4413eb75f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -17,8 +17,11 @@ public class ProjectDistributionAnalysisFormDTO implements Serializable { public interface ProjectDistributionAnalysisForm{} - @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) - private String date; + @NotBlank(message = "startDate不能为空",groups = ProjectDistributionAnalysisForm.class) + private String startDate; + + @NotBlank(message = "endDate不能为空",groups = ProjectDistributionAnalysisForm.class) + private String endDate; private String orgId; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index c070c7e8ac..df0dc1ad95 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -220,13 +220,14 @@ public interface ProjectDao extends BaseDao { /** * @Description 根据日期查询项目分类 - * @param date - * @param orgId + * @param startDate + * @param endDate * @param codeLength 1级分类编码长度 - * @param originGrid 是否来源网格 + * @param orgId * @author zxc * @date 2021/12/8 1:37 下午 */ - List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength,@Param("originGrid")Boolean originGrid); + List selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate, + @Param("orgId")String orgId,@Param("codeLength")Integer codeLength); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index b83310b93c..3588aeefb1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2804,24 +2804,22 @@ public class ProjectServiceImpl extends BaseServiceImpl projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - if (null == staffInfo){ - throw new EpmetException("未查询到此工作人员的所属组织信息..."); + if (StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员的所属组织信息..."); + } + formDTO.setOrgId(staffInfo.getAgencyId()); } Result> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto); if (!listResult.success()){ throw new EpmetException("查询1级分类列表失败..."); } - List projectCategoryByDateDTOS = new ArrayList<>(); - if (formDTO.getOrgType().equals(ProjectConstant.ORG_TYPE_GRID)){ - projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),true); - }else { - projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),false); - } + List projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength()); if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){ return new ArrayList<>(); } - return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getDate(), listResult.getData()); + return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getStartDate(), listResult.getData()); } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 6eec0fe694..179a83ce1b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -402,16 +402,14 @@ \ No newline at end of file From d23401c039dfabb566fbca7ff37b5bdb68700698 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Dec 2021 16:08:56 +0800 Subject: [PATCH 480/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=88=86=E6=9E=90=E3=80=91=E5=90=84=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govissue/IssueProjectCategoryDictDTO.java | 93 +++++++++++++++++++ .../form/CategoryProjectFormDTO.java | 4 +- .../form/ProjectAnalysisFormDTO.java | 4 +- .../form/ProjectCategoryTotalFormDTO.java | 2 + .../result/CategoryProjectResultDTO.java | 2 +- .../result/ProjectCategoryTotalResultDTO.java | 4 +- .../controller/GovProjectController.java | 5 +- .../evaluationindex/EvaluationIndexDao.java | 8 ++ .../dataaggre/dao/govissue/IssueDao.java | 7 ++ .../EvaluationIndexService.java | 7 ++ .../impl/EvaluationIndexServiceImpl.java | 11 +++ .../service/govissue/GovIssueService.java | 7 ++ .../govissue/impl/GovIssueServiceImpl.java | 10 ++ .../service/govproject/GovProjectService.java | 2 +- .../impl/GovProjectServiceImpl.java | 31 ++++++- .../evaluationindex/EvaluationIndexDao.xml | 13 +++ .../resources/mapper/govissue/IssueDao.xml | 12 +++ 17 files changed, 209 insertions(+), 13 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java new file mode 100644 index 0000000000..4555a86cd2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java @@ -0,0 +1,93 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dto.govissue; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 议题项目分类字典 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-12-08 + */ +@Data +public class IssueProjectCategoryDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id, 产品默认default + */ + private String customerId; + + /** + * 上级分类ID 顶级此列存储0 + */ + private String pid; + + /** + * 所有上级分类ID，用逗号分开 + */ + private String pids; + + /** + * 上级分类编码 + */ + private String parentCategoryCode; + + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 分类名称 + */ + private String categoryName; + + /** + * 分类类别1,2,3,4.... + */ + private String categoryType; + + /** + * 排序 + */ + private Integer sort; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + + /** + * 颜色 + */ + private String colour; + + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java index 726d01dbce..38335e8223 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java @@ -24,8 +24,8 @@ public class CategoryProjectFormDTO implements Serializable { @NotBlank(message = "组织ID不能为空", groups = {Category.class}) private String dateId; //一级分类Id - @NotBlank(message = "分类Id不能为空", groups = {Category.class}) - private String categoryId; + @NotBlank(message = "分类Code不能为空", groups = {Category.class}) + private String categoryCode; //页码 @Min(1) private Integer pageNo = 1; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java index 9689899cc4..1cf8e85373 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java @@ -25,8 +25,8 @@ public class ProjectAnalysisFormDTO implements Serializable { @NotBlank(message = "话题或事件发起人Id不能为空", groups = {Analysis.class}) private String userId; //一级分类Id集合 - @NotNull(message = "分类Id集合不能为空", groups = {Analysis.class}) - private List categoryIdList; + @NotNull(message = "分类Code集合不能为空", groups = {Analysis.class}) + private List categoryCodeList; public interface Analysis extends CustomerClientShowGroup { } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java index eddd513d1c..66d4e983b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java @@ -24,6 +24,8 @@ public class ProjectCategoryTotalFormDTO implements Serializable { @NotBlank(message = "日维度ID不能为空", groups = {Project.class}) private String dateId; + private String customerId; + public interface Project extends CustomerClientShowGroup { } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java index 6f24967aba..b6cd54a88c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java @@ -27,7 +27,7 @@ public class CategoryProjectResultDTO implements Serializable { //项目编码[目前没这个功能 默认为空] private String projectCode = ""; //一级分类Id集合 - private List categoryIds; + private List categoryCodes; //一级分类名称集合 private List categoryNames; //来源：议题issue 项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】 diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java index 1d95b68175..fabbad4ddf 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java @@ -14,8 +14,8 @@ public class ProjectCategoryTotalResultDTO implements Serializable { //组织Id private String agencyId; - //一级分类Id - private String categoryId; + //一级分类Code + private String categoryCode; //一级分类名称 private String categoryName; //分类下项目总数 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 396f14543d..3039785f12 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -91,9 +91,10 @@ public class GovProjectController { * @author sun */ @PostMapping("projectcategorylist") - public Result projectCategoryList(@RequestBody ProjectCategoryTotalFormDTO formDTO) { + public Result> projectCategoryList(@LoginUser TokenDto tokenDto, @RequestBody ProjectCategoryTotalFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectCategoryTotalFormDTO.Project.class); - return new Result().ok(govProjectService.projectCategoryList(formDTO)); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(govProjectService.projectCategoryList(formDTO)); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java index 138ff3d449..5afe394900 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java @@ -21,6 +21,8 @@ import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -103,4 +105,10 @@ public interface EvaluationIndexDao { */ String selectAgencyNameByAgencyId(@Param("agencyId")String agencyId); + /** + * @Description 按dateId查询组织下一级分类项目总数统计 + * @author sun + */ + List projectCategoryList(ProjectCategoryTotalFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java index 1e85e06366..6727a2d2d4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govissue; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO; @@ -74,4 +75,10 @@ public interface IssueDao extends BaseDao { Integer selectIssueCount(@Param("gridIds") List gridIds,@Param("issueType")String issueType); List selectShiftProjectIssueList(@Param("customerId") String customerId, @Param("gridId") String gridId); + + /** + * @Description 查询客户下分类信息 + * @author sun + **/ + List getCategoryList(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java index 67468e32de..bd5cfd6886 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java @@ -6,6 +6,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import java.util.List; @@ -86,4 +88,9 @@ public interface EvaluationIndexService { */ ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId); + /** + * @Description 按dateId查询组织下一级分类项目总数统计 + * @author sun + */ + List projectCategoryList(ProjectCategoryTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java index abb0f137f5..e3f1b246af 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java @@ -11,6 +11,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import lombok.extern.slf4j.Slf4j; @@ -206,4 +208,13 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { return resultDTO; } + /** + * @Description 按dateId查询组织下一级分类项目总数统计 + * @author sun + */ + @Override + public List projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { + return evaluationIndexDao.projectCategoryList(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java index 5159bda48f..65e768ccf5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.govissue; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO; import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO; @@ -45,4 +46,10 @@ public interface GovIssueService { List closedIssueList(ClosedIssueListFormDTO fromDTO); List selectShiftProjectIssueList(String customerId,String gridId,Integer pageNo,Integer pageSize); + + /** + * @Description 查询客户下一级分类信息 + * @author sun + **/ + List categoryList(String customerId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java index 7b68d96332..db987e0b5c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.IssueConstant; import com.epmet.dataaggre.dao.govissue.IssueApplicationDao; import com.epmet.dataaggre.dao.govissue.IssueDao; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO; import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO; import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO; @@ -323,4 +324,13 @@ public class GovIssueServiceImpl implements GovIssueService { return issueDao.selectShiftProjectIssueList(customerId, gridId); } + /** + * @Description 查询客户下一级分类信息 + * @author sun + **/ + @Override + public List categoryList(String customerId) { + return issueDao.getCategoryList(customerId); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 035e9d5400..41d6b64379 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -72,7 +72,7 @@ public interface GovProjectService { * @Description 赋能平台【项目分类分析】各分类项目数图表 * @author sun */ - ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO); + List projectCategoryList(ProjectCategoryTotalFormDTO formDTO); /** * @Description 赋能平台【项目处理分析】分类下项目列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 9f594e6b70..ff484007b3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; +import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; @@ -19,6 +20,7 @@ import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; +import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govissue.GovIssueService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; @@ -56,6 +58,8 @@ public class GovProjectServiceImpl implements GovProjectService { private ResiGroupService resiGroupService; @Autowired private DataStatsService dataStatsService; + @Autowired + private EvaluationIndexService evaluationIndexService; /** * @Description 查询项目信息 @@ -334,11 +338,32 @@ public class GovProjectServiceImpl implements GovProjectService { /** * @Description 赋能平台【项目分类分析】各分类项目数图表 - * @author sun +, * @author sun */ @Override - public ProjectCategoryTotalResultDTO projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { - return null; + public List projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { + List resultList = new ArrayList<>(); + //1.查询客户下一级分类信息 + List categoryList = govIssueService.categoryList(formDTO.getCustomerId()); + + //2.按dateId查询组织下一级分类项目总数 + List list = evaluationIndexService.projectCategoryList(formDTO); + + //3.封装数据并返回 + categoryList.forEach(ca -> { + ProjectCategoryTotalResultDTO dto = new ProjectCategoryTotalResultDTO(); + dto.setAgencyId(formDTO.getAgencyId()); + dto.setCategoryCode(ca.getCategoryCode()); + dto.setCategoryName(ca.getCategoryName()); + list.forEach(l -> { + if (ca.getCategoryCode().equals(l.getCategoryCode())) { + dto.setTotal(l.getTotal()); + } + }); + resultList.add(dto); + }); + + return resultList; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml index afa7e56c2d..117e6c537b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml @@ -182,4 +182,17 @@ AND DEL_FLAG = 0 + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml index 185816c9bb..239e846aa9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml @@ -124,4 +124,16 @@ order by i.SHIFTED_TIME desc + + + \ No newline at end of file From b7b67c889ae5bcbdaab3161391d111c2bbfba83a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 20:58:11 +0800 Subject: [PATCH 481/589] /resievent/eventdetail-icdata --- .../dto/form/ResiEventDetailFormDTO.java | 18 +++++++++++ .../dto/result/EventDetailResultDTO.java | 6 ++-- .../epmet/controller/ResiEventController.java | 12 +++++++ .../com/epmet/service/ResiEventService.java | 8 +++++ .../service/impl/ResiEventServiceImpl.java | 31 ++++++++++++++----- 5 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java new file mode 100644 index 0000000000..37049a3ef8 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 数字赋能平台-个人档案-上报事件-事件详情 + */ +@Data +public class ResiEventDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4449275163195979994L; + public interface AddUserInternalGroup { + } + @NotBlank(message = "resiEventId不能为空",groups =AddUserInternalGroup.class ) + private String resiEventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java index 18295391c5..0b6bb8ccb2 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -11,7 +11,7 @@ import java.util.List; /** * @Author zxc * @DateTime 2021/8/3 1:30 下午 - * @DESC + * @DESC 两端通用时间详情接口+个人档案-数据分析-事件详情 */ @Data public class EventDetailResultDTO implements Serializable { @@ -87,10 +87,10 @@ public class EventDetailResultDTO implements Serializable { @JsonIgnore private List orgNameList; - @JsonIgnore + //@JsonIgnore private String projectId; - @JsonIgnore + //@JsonIgnore private Boolean isProject; public EventDetailResultDTO() { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c868dbff0d..b3dd410a81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -57,6 +57,18 @@ public class ResiEventController { return new Result().ok(resiEventService.eventDetail(formDTO, tokenDto)); } + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + @PostMapping("eventdetail-icdata") + public Result eventDetailForIcData(@RequestBody ResiEventDetailFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,ResiEventDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(resiEventService.eventDetailForIcData(formDTO)); + } + /** * 我要报事-提交（尹） * diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index f9712c498b..b73e1f7908 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -41,6 +41,14 @@ public interface ResiEventService extends BaseService { */ EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto); + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO); + /** * 我要报事-提交（尹） * diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index cbd5ff6b3c..01b0377ad3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -163,7 +163,20 @@ public class ResiEventServiceImpl extends BaseServiceImpl data = orgResult.getData(); dto.setEventOrg(data); - // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org - if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){ - baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId()); - baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId()); - }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){ - resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId()); - } return dto; } + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + public EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO){ + return getEventDetailResultDTO(formDTO.getResiEventId()); + } /** * 我要报事-提交（尹） From 504f293f6ef0a239d8e1d3b888d0906b5f33bcf8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 22:54:45 +0800 Subject: [PATCH 482/589] zancun --- .../result/IssueProjectCategory.java | 19 +++++++ .../resigroup/form/UserTopicPageFormDTO.java | 19 +++++++ .../dto/resigroup/result/UserTopicResDTO.java | 26 ++++++++++ .../controller/ResiGroupController.java | 12 +++++ .../dataaggre/dao/govproject/ProjectDao.java | 4 +- .../dataaggre/dao/resigroup/ResiTopicDao.java | 10 ++++ .../service/govproject/GovProjectService.java | 9 ++++ .../impl/GovProjectServiceImpl.java | 33 ++++++++++++ .../service/resigroup/ResiGroupService.java | 4 ++ .../resigroup/impl/ResiGroupServiceImpl.java | 50 +++++++++++++++++-- .../mapper/govproject/ProjectDao.xml | 21 ++++++++ .../mapper/resigroup/ResiTopicDao.xml | 18 +++++++ 12 files changed, 220 insertions(+), 5 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java new file mode 100644 index 0000000000..e0a028ee3d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java @@ -0,0 +1,19 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Set; + +@Data +public class IssueProjectCategory implements Serializable { + private static final long serialVersionUID = -2226298165882293959L; + private String issueId; + private String projectId; + private Set categoryPidsList; + + /** + * 这个项目对应的所有一级项目分类编码 + */ + private Set firstCategoryCodeList; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java new file mode 100644 index 0000000000..cfedd6e6d9 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dataaggre.dto.resigroup.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +@Data +public class UserTopicPageFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) + private List epmetUserIdList; + @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) + private Integer pageSize; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java new file mode 100644 index 0000000000..98bf53a3e6 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dataaggre.dto.resigroup.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +/** + * 个人分析，发布话题分页列表 + */ +@Data +public class UserTopicResDTO implements Serializable { + private String topicId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date releaseTime; + private String topicContent; + private Boolean shiftIssue; + private String issueId; + private Boolean shiftProject=false; + private String projectId=""; + //不返给前端了。 + private Set projectFirstCategoryCodeList=new HashSet<>(); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java index 259b22cff0..8dc1a34527 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java @@ -1,12 +1,15 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO; import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO; +import com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO; import com.epmet.dataaggre.service.resigroup.ResiGroupService; +import com.epmet.dto.form.PageUserReportEventFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -39,4 +42,13 @@ public class ResiGroupController { return new Result>().ok(resiGroupService.candidateList(formDTO)); } + /** + * 数字赋能平台-个人分析，发布话题分页列表 + * @return + */ + @PostMapping("pageusertopic") + public Result> pageUserTopic(@RequestBody PageUserReportEventFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiGroupService.pageUserTopic(formDTO)); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 0fb0c154dc..2a433d58d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; @@ -25,7 +26,6 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; import com.epmet.dataaggre.entity.govproject.ProjectEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -79,4 +79,6 @@ public interface ProjectDao extends BaseDao { * @author sun */ List getProjectStatusList(ProjectTotalFormDTO formDTO); + + List selectProjectIssueCategory(@Param("issueIds") List issueIds); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java index cd57936e2f..c41c85d0de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java @@ -19,7 +19,9 @@ package com.epmet.dataaggre.dao.resigroup; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; +import com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO; import com.epmet.dataaggre.entity.resigroup.ResiTopicEntity; +import com.epmet.dto.form.PageUserReportEventFormDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,4 +37,12 @@ import java.util.List; public interface ResiTopicDao extends BaseDao { List selectTopicInfoByIds(@Param("list") List topicIds); + + /** + * 数据分析-个人档案-发布话题列表 + * + * @param formDTO + * @return + */ + List selectListTopic(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 41d6b64379..d118a05746 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; @@ -85,4 +86,12 @@ public interface GovProjectService { * @author sun */ ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO); + + /** + * 找出这些议题中对应的项目id,以及项目对应的一级分类编码 + * + * @param issueIds + * @return + */ + List getIssueProjectFirstCategory(List issueIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index ff484007b3..de145afac2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.govproject.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -12,6 +13,7 @@ import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -384,4 +386,35 @@ public class GovProjectServiceImpl implements GovProjectService { return null; } + /** + * 找出这些议题中对应的项目id,以及项目对应的一级分类编码 + * + * @param issueIds + * @return + */ + @Override + public List getIssueProjectFirstCategory(List issueIds) { + List list=projectDao.selectProjectIssueCategory(issueIds); + if(CollectionUtils.isNotEmpty(list)){ + for(IssueProjectCategory projectCategory:list){ + Set firt=new HashSet<>(); + for(String pids:projectCategory.getCategoryPidsList()){ + if(pids.contains(StrConstant.COLON)){ + String[] pidAtt=pids.split(StrConstant.COLON); + firt.add(pidAtt[0]); + break; + } + if(pids.contains(StrConstant.COMMA)){ + String[] pidAtt=pids.split(StrConstant.COMMA); + firt.add(pidAtt[0]); + break; + } + firt.add(pids); + } + projectCategory.setFirstCategoryCodeList(firt); + } + } + return list; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java index 68f4afb4ee..4aaaa113e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java @@ -1,9 +1,11 @@ package com.epmet.dataaggre.service.resigroup; +import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.dto.resigroup.form.*; import com.epmet.dataaggre.dto.resigroup.result.*; +import com.epmet.dto.form.PageUserReportEventFormDTO; import java.util.List; @@ -61,4 +63,6 @@ public interface ResiGroupService { * @return com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO */ List querySubRankList(GroupActRankFormDTO formDTO); + + PageData pageUserTopic(PageUserReportEventFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index 374db9eedf..f81c5d9a39 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -3,12 +3,15 @@ package com.epmet.dataaggre.service.resigroup.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.resigroup.ResiGroupDao; import com.epmet.dataaggre.dao.resigroup.ResiTopicDao; import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO; import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO; +import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.dto.resigroup.form.*; @@ -18,7 +21,9 @@ import com.epmet.dataaggre.redis.ResiGroupRedis; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.resigroup.ResiGroupService; +import com.epmet.dto.form.PageUserReportEventFormDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -27,10 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -53,6 +55,8 @@ public class ResiGroupServiceImpl implements ResiGroupService { private DataStatsService dataStatsService; @Autowired private GovOrgService govOrgService; + @Autowired + private GovProjectService govProjectService; @Override public List selectTopicInfoByIds(List topicIds) { @@ -358,4 +362,42 @@ public class ResiGroupServiceImpl implements ResiGroupService { } return resultDTOList; } + + /** + * 数据分析-个人档案-发布话题列表 + * + * @param formDTO + * @return + */ + @Override + public PageData pageUserTopic(PageUserReportEventFormDTO formDTO) { + if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> resiTopicDao.selectListTopic(formDTO)); + List list =pageInfo.getList(); + //根据议题id查询出每个议题对应的项目id，以及项目分类编码 + List issueIds=list.stream().filter(dto -> StringUtils.isNotBlank(dto.getIssueId())).map(UserTopicResDTO::getIssueId).collect(Collectors.toList()); + if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(issueIds)){ + List categoryList= govProjectService.getIssueProjectFirstCategory(issueIds); + for(UserTopicResDTO topicResDTO :pageInfo.getList()){ + topicResDTO.setShiftProject(false); + topicResDTO.setProjectId(StrConstant.EPMETY_STR); + + topicResDTO.setProjectFirstCategoryCodeList(new HashSet<>()); + for(IssueProjectCategory category:categoryList){ + if(StringUtils.isNotBlank(category.getProjectId())){ + topicResDTO.setShiftProject(true); + topicResDTO.setProjectId(category.getProjectId()); + + topicResDTO.setProjectFirstCategoryCodeList(category.getFirstCategoryCodeList()); + break; + } + } + + } + } + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 6b88005261..1d23d8562d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -174,4 +174,25 @@ ORDER BY created_time DESC + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml index bd46639c94..763dcd98df 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml @@ -22,4 +22,22 @@ #{topicId} + + + \ No newline at end of file From 356180a0132f14ea1abe03d8e00b11bebe6fea20 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 22:58:44 +0800 Subject: [PATCH 483/589] zancun --- .../result/IssueProjectCategory.java | 7 ------ .../dto/resigroup/result/UserTopicResDTO.java | 4 ---- .../impl/GovProjectServiceImpl.java | 24 +------------------ .../resigroup/impl/ResiGroupServiceImpl.java | 5 +--- .../mapper/govproject/ProjectDao.xml | 13 ++-------- 5 files changed, 4 insertions(+), 49 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java index e0a028ee3d..1e50bd7c19 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java @@ -3,17 +3,10 @@ package com.epmet.dataaggre.dto.govproject.result; import lombok.Data; import java.io.Serializable; -import java.util.Set; @Data public class IssueProjectCategory implements Serializable { private static final long serialVersionUID = -2226298165882293959L; private String issueId; private String projectId; - private Set categoryPidsList; - - /** - * 这个项目对应的所有一级项目分类编码 - */ - private Set firstCategoryCodeList; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java index 98bf53a3e6..4d5fd23ca2 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java @@ -5,8 +5,6 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.HashSet; -import java.util.Set; /** * 个人分析，发布话题分页列表 @@ -21,6 +19,4 @@ public class UserTopicResDTO implements Serializable { private String issueId; private Boolean shiftProject=false; private String projectId=""; - //不返给前端了。 - private Set projectFirstCategoryCodeList=new HashSet<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index de145afac2..1b665e2888 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -2,7 +2,6 @@ package com.epmet.dataaggre.service.govproject.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -13,7 +12,6 @@ import com.epmet.dataaggre.constant.ProjectConstant; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; -import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -394,27 +392,7 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public List getIssueProjectFirstCategory(List issueIds) { - List list=projectDao.selectProjectIssueCategory(issueIds); - if(CollectionUtils.isNotEmpty(list)){ - for(IssueProjectCategory projectCategory:list){ - Set firt=new HashSet<>(); - for(String pids:projectCategory.getCategoryPidsList()){ - if(pids.contains(StrConstant.COLON)){ - String[] pidAtt=pids.split(StrConstant.COLON); - firt.add(pidAtt[0]); - break; - } - if(pids.contains(StrConstant.COMMA)){ - String[] pidAtt=pids.split(StrConstant.COMMA); - firt.add(pidAtt[0]); - break; - } - firt.add(pids); - } - projectCategory.setFirstCategoryCodeList(firt); - } - } - return list; + return projectDao.selectProjectIssueCategory(issueIds); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index f81c5d9a39..d0cd285b19 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -385,13 +385,10 @@ public class ResiGroupServiceImpl implements ResiGroupService { topicResDTO.setShiftProject(false); topicResDTO.setProjectId(StrConstant.EPMETY_STR); - topicResDTO.setProjectFirstCategoryCodeList(new HashSet<>()); for(IssueProjectCategory category:categoryList){ - if(StringUtils.isNotBlank(category.getProjectId())){ + if(topicResDTO.getIssueId().equals(category.getIssueId())&&StringUtils.isNotBlank(category.getProjectId())){ topicResDTO.setShiftProject(true); topicResDTO.setProjectId(category.getProjectId()); - - topicResDTO.setProjectFirstCategoryCodeList(category.getFirstCategoryCodeList()); break; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 1d23d8562d..fd2b6e44e1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -174,21 +174,12 @@ ORDER BY created_time DESC - - - - - - - SELECT p.ORIGIN_ID AS issueId, - p.id AS projectId, - pc.CATEGORY_PIDS + p.id AS projectId FROM project p - inner join project_category pc - on(p.id=pc.PROJECT_ID and pc.DEL_FLAG='0') WHERE p.DEL_FLAG = '0' From aca9b6ce5c6c453ca57028ab1b110ea2256a78c4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 23:00:12 +0800 Subject: [PATCH 484/589] zancun --- .../epmet/dataaggre/service/resigroup/ResiGroupService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java index 4aaaa113e7..2a353b0cc6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java @@ -64,5 +64,10 @@ public interface ResiGroupService { */ List querySubRankList(GroupActRankFormDTO formDTO); + /** + * 分页查询我发布的话题 + * @param formDTO + * @return + */ PageData pageUserTopic(PageUserReportEventFormDTO formDTO); } From f83110fda5c18f659893ae489ee4fada08b5cc52 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 23:19:55 +0800 Subject: [PATCH 485/589] zancun --- .../java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index b3b746eff1..51988384c8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -480,6 +480,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO)); From 2fe78be879e51199a8abe140799def2a7d9dbccf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 23:40:00 +0800 Subject: [PATCH 486/589] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E8=AF=9D=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/resigroup/ResiTopicDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml index 763dcd98df..63a4f7e32e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml @@ -28,7 +28,7 @@ resultType="com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO"> SELECT rt.id as topicId, - rt.TOPIC_CONTENT as topicContent, + IFNULL(rt.TOPIC_CONTENT,'语音话题') as topicContent, rt.SHIFT_ISSUE as shiftIssue, IFNULL(rt.ISSUE_ID,'') AS issueId, rt.CREATED_TIME as releaseTime From d912e8e02839eeaa4edca3e08c9b56f048490e12 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 9 Dec 2021 09:25:14 +0800 Subject: [PATCH 487/589] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E6=B2=A1=E6=9C=89=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/ResiBuzzFormDTO.java | 36 ++++++++ .../com/epmet/dto/result/ResiBuzzDTO.java | 91 +++++++++++++++++++ .../epmet/dto/result/ResiBuzzResultDTO.java | 28 ++++++ .../com/epmet/controller/IssueController.java | 15 ++- .../src/main/java/com/epmet/dao/IssueDao.java | 11 +++ .../java/com/epmet/service/IssueService.java | 9 ++ .../epmet/service/impl/IssueServiceImpl.java | 48 ++++++++++ .../src/main/resources/mapper/IssueDao.xml | 30 ++++++ 8 files changed, 267 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java new file mode 100644 index 0000000000..1ee04f0858 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/8 3:29 下午 + * @DESC + */ +@Data +public class ResiBuzzFormDTO implements Serializable { + + private static final long serialVersionUID = 7477325476668438447L; + + public interface ResiBuzzForm{} + + private String orgId; + + private String orgType; + + /** + * 表决中：voting 已转项目：shift_project 已关闭：closed，全部：all + */ + @NotBlank(message = "status不能为空",groups = ResiBuzzForm.class) + private String status; + + @NotNull(message = "pageSize不能为空",groups = ResiBuzzForm.class) + private Integer pageSize; + + @NotNull(message = "pageNo不能为空",groups = ResiBuzzForm.class) + private Integer pageNo; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java new file mode 100644 index 0000000000..df21741fdc --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java @@ -0,0 +1,91 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/8 3:37 下午 + * @DESC + */ +@Data +public class ResiBuzzDTO implements Serializable { + + private static final long serialVersionUID = -1844581181580474374L; + + @JsonIgnore + private String createdBy; + + /** + * 排序 + */ + private Integer sort; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题ID + */ + private String issueId; + + /** + * 建议 + */ + private String suggestion; + + /** + * 状态 + */ + private String status; + + /** + * 创建时间 + */ + private String createdTime; + + /** + * 支持个数 + */ + private Integer supportCount; + + /** + * 反对个数 + */ + private Integer oppositionCount; + + /** + * 表决占比 + */ + private String voteAccount; + + /** + * 议题发起人 + */ + private String issueOriginator; + + /** + * 分类名字 + */ + private String categoryName; + + public ResiBuzzDTO() { + this.createdBy = ""; + this.sort = NumConstant.ZERO; + this.issueTitle = ""; + this.issueId = ""; + this.suggestion = ""; + this.status = ""; + this.createdTime = ""; + this.supportCount = NumConstant.ZERO; + this.oppositionCount = NumConstant.ZERO; + this.voteAccount = ""; + this.issueOriginator = ""; + this.categoryName = ""; + } +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java new file mode 100644 index 0000000000..4f4236d2bb --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/12/8 3:36 下午 + * @DESC + */ +@Data +public class ResiBuzzResultDTO implements Serializable { + + private static final long serialVersionUID = 4914999826185811915L; + + private Integer total; + + private List list; + + public ResiBuzzResultDTO() { + this.total = NumConstant.ZERO; + this.list = new ArrayList<>(); + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 3378abc1b4..7b1615bb4e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IssueDTO; @@ -284,7 +286,18 @@ public class IssueController { return new Result>().ok(issueService.getUnResolvedList(formDTO)); } -// @PostMapping("resibuzz") + /** + * @Description 居民热议列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 3:50 下午 + */ + @PostMapping("resibuzz") + public Result resiBuzz(@RequestBody ResiBuzzFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, ResiBuzzFormDTO.ResiBuzzForm.class); + return new Result().ok(issueService.resiBuzz(formDTO,tokenDto)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index be1c4ee25b..286848eb98 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -225,4 +225,15 @@ public interface IssueDao extends BaseDao { * @return java.util.List */ List selectUnResolvedList(@Param("gridId") String gridId); + + /** + * @Description 查询表决前50名 + * @param orgId + * @param orgType + * @param status + * @author zxc + * @date 2021/12/8 4:08 下午 + */ + List selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index af7ec1b7a5..cbd08ab274 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -350,4 +350,13 @@ public interface IssueService extends BaseService { * @return java.util.List */ List getUnResolvedList(ShiftProjectListFromDTO fromDTO); + + /** + * @Description 居民热议列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 3:50 下午 + */ + ResiBuzzResultDTO resiBuzz(ResiBuzzFormDTO formDTO , TokenDto tokenDto); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index ca52276790..740ebd13f5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -9,10 +9,13 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; @@ -67,6 +70,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -1564,6 +1568,50 @@ public class IssueServiceImpl extends BaseServiceImpl imp return resultList; } + /** + * @Description 居民热议列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/8 3:50 下午 + */ + @Override + public ResiBuzzResultDTO resiBuzz(ResiBuzzFormDTO formDTO, TokenDto tokenDto) { + if (org.apache.commons.lang3.StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员的所属组织信息..."); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus())); + List list = pageInfo.getList(); + if (CollectionUtils.isEmpty(list)){ + return new ResiBuzzResultDTO(); + } + AtomicReference no = new AtomicReference<>((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE); + ResiBuzzResultDTO result = new ResiBuzzResultDTO(); + UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); + userResiInfoListFormDTO.setUserIdList(list.stream().map(ResiBuzzDTO::getCreatedBy).collect(Collectors.toList())); + Result> usersResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO); + if (!usersResult.success()){ + throw new EpmetException("查询人员姓名失败..."); + } + Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal())); + result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total); + list.forEach(l -> { + l.setSort(no.getAndSet(no.get() + NumConstant.ONE)); + usersResult.getData().forEach(u -> { + if (l.getCreatedBy().equals(u.getUserId())){ + l.setIssueOriginator(u.getShowName()); + } + }); + }); + result.setList(list); + return result; + } + public static void main(String[] args) { List list = new ArrayList<>(); list.add("1"); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index f12b363cc7..fd68a02084 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -577,4 +577,34 @@ AND ISSUE_STATUS = 'closed' AND RESOLVE_TYPE = 'unresolved' + + + \ No newline at end of file From 30425b5a87bf7c2ab54ad93650742ed2ef5ee48b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 12:49:06 +0800 Subject: [PATCH 488/589] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demand/DemandResearchAnalysisFormDTO.java | 34 +++++++++++++ .../DemandResearchAnalysisResultDTO.java | 28 ++++++++++ .../controller/IcUserDemandRecController.java | 14 ++++- .../epmet/service/IcUserDemandRecService.java | 9 ++++ .../impl/IcUserDemandRecServiceImpl.java | 51 +++++++++++++++++++ .../com/epmet/dto/result/HouseUserDTO.java | 15 ++++++ .../epmet/dto/result/IcResiUserBriefDTO.java | 19 +++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 ++ .../EpmetUserOpenFeignClientFallback.java | 5 ++ .../controller/IcResiUserController.java | 13 +++++ .../java/com/epmet/dao/IcResiUserDao.java | 21 ++++++-- .../com/epmet/service/IcResiUserService.java | 2 + .../service/impl/IcResiUserServiceImpl.java | 5 ++ .../main/resources/mapper/IcResiUserDao.xml | 37 ++++++++++++++ 14 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java new file mode 100644 index 0000000000..745d5038be --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form.demand; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + + +/** + * 需求研判分析 入参DTO + */ +@Data +public class DemandResearchAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = 3528172570410679765L; + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "firstCategoryCode不能为空",groups = AddUserInternalGroup.class) + private String firstCategoryCode; + + @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) + private String isResiUserId; + + private List epmetUserIdList; + + + @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java new file mode 100644 index 0000000000..3a17485f7a --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result.demand; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 数据分析-个人档案-需求详情，研判分析 + */ +@Data +public class DemandResearchAnalysisResultDTO implements Serializable { + private static final long serialVersionUID = -1024304149893118204L; + /** + * 居民信息及家属列表 + */ + private String icResiUserId; + private String icUserName; + private String houseId; + private List houseUserList; + + + private List demandList; + /** + * 入参中给的，再返回去 + */ + private List epmetUserIdList; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 9ce587e7b3..563777d008 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.UserDemandConstant; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.demand.DemandRecResultDTO; +import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.service.*; @@ -210,7 +211,18 @@ public class IcUserDemandRecController { } - + /** + * 数据分析-个人档案-需求详情，研判分析 + * + * @param formDTO + * @return + */ + @PostMapping("demand-research-analysis") + public Result queryDemandResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody DemandResearchAnalysisFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO, DemandResearchAnalysisFormDTO.AddUserInternalGroup.class); + return new Result().ok(icUserDemandRecService.queryDemandResearchAnalysis(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index e3b719615e..e2e9f10e4c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.demand.DemandRecResultDTO; +import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; import com.epmet.entity.IcUserDemandRecEntity; @@ -144,4 +145,12 @@ public interface IcUserDemandRecService extends BaseService userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIsResiUserId()); + if (userRes.success() || null == userRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常"); + } + IcResiUserBriefDTO icResiUserDTO = userRes.getData(); + DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, DemandResearchAnalysisResultDTO.class); + resultDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList()); + //获取当前需求人，相同分类的需求列表。不分页，直接返回所有 + List userIds=new ArrayList<>(); + userIds.add(formDTO.getIsResiUserId()); + if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ + userIds.addAll(formDTO.getEpmetUserIdList()); + } + IcResiUserDemandFromDTO icResiUserDemandFromDTO=new IcResiUserDemandFromDTO(); + icResiUserDemandFromDTO.setUserIds(userIds); + icResiUserDemandFromDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode()); + List demandList = baseDao.selectUserDemand(icResiUserDemandFromDTO); + + if(CollectionUtils.isNotEmpty(demandList)){ + // 1、状态字典 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + //2、查询分类名称 + List categoryCodes = demandList.stream().map(IcResiUserReportDemandRes::getCategoryCode).collect(Collectors.toList()); + List dictList = demandDictService.listByCodes(formDTO.getCustomerId(), categoryCodes); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); + for (IcResiUserReportDemandRes resDto : demandList) { + //状态赋值 + resDto.setStatusName(statusMap.containsKey(resDto.getStatus()) ? statusMap.get(resDto.getStatus()) : StrConstant.EPMETY_STR); + if (null != dictMap && dictMap.containsKey(resDto.getCategoryCode())) { + //分类名称XXX-XX 或者XXX + resDto.setCategoryName(dictMap.get(resDto.getCategoryCode())); + } + //一级分类名称 + resDto.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),resDto.getFirstCategoryCode())); + } + resultDTO.setDemandList(CollectionUtils.isNotEmpty(demandList) ? demandList : Collections.emptyList()); + } + return resultDTO; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java new file mode 100644 index 0000000000..7bf9978b48 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 家属 + */ +@Data +public class HouseUserDTO implements Serializable { + private static final long serialVersionUID = -5307147522738642535L; + private String icResiUserId; + private String icUserName; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java new file mode 100644 index 0000000000..ce955f1a56 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 案件居民、家属列表 + * 只有名称这些简要信息 + */ +@Data +public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { + private String houseId; + /** + * 同屋的其他人 + */ + private List houseUserList; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index ff3b7ffc1c..6947f0d47d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -669,4 +669,7 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping(value = "/epmetuser/user/findepmetuser") Result findEpmetUser(@RequestBody ResiUserFormDTO formDTO); + + @GetMapping("/epmetuser/icresiuser/findfamilymem/{icResiUserId}") + Result findFamilyMem(@PathVariable("icResiUserId") String icResiUserId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 1eeca4cdd3..e208b2ea1a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -490,4 +490,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result findEpmetUser(ResiUserFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findEpmetUser", formDTO); } + + @Override + public Result findFamilyMem(String icResiUserId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findFamilyMem", icResiUserId); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index d6df9f57e0..5c76d8e578 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -206,6 +206,19 @@ public class IcResiUserController { return new Result>().ok(icResiUserService.getPeopleByRoom(formDTO.getHomeId())); } + /** + * 根据ic_resi_user找家属 + * @param icResiUserId + * @return + */ + @GetMapping("findfamilymem/{icResiUserId}") + public Result findFamilyMem(@PathVariable("icResiUserId") String icResiUserId){ + if(StringUtils.isNotBlank(icResiUserId)){ + return new Result().ok(icResiUserService.findFamilyMem(icResiUserId)); + } + return new Result<>(); + } + @PostMapping("listresi") public Result>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO) { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index ea5ca5b741..09f467f6bf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -20,10 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.ResiUserQueryValueDTO; -import com.epmet.dto.result.DemandUserResDTO; -import com.epmet.dto.result.IcFormResColumnDTO; -import com.epmet.dto.result.PersonDataResultDTO; -import com.epmet.dto.result.SearchByNameResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; @@ -166,4 +163,20 @@ public interface IcResiUserDao extends BaseDao { IcResiUserDTO selectIdByIdCard(@Param("customerId") String customerId, @Param("idNum")String idNum, @Param("icResiUserId")String icResiUserId); + + /** + * 获取居民名称，家属名称和id + * @param isResiUserId + * @return + */ + IcResiUserBriefDTO selectIcResuUser(@Param("isResiUserId") String isResiUserId); + + /** + * 除了本人以外，住在这个房子的人 + * + * @param currentIcResiUserId + * @param homeId + * @return + */ + List selectListFamilyMember(@Param("currentIcResiUserId") String currentIcResiUserId, @Param("homeId") String homeId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 9a0fcbed95..450ee74c70 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -151,4 +151,6 @@ public interface IcResiUserService extends BaseService { * @return */ IcResiUserDTO getByIdCard(String customerId, String idNum,String icResiUserId); + + IcResiUserBriefDTO findFamilyMem(String icResiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ea21846183..d045c08f3d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -878,4 +878,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl + + + + + + + + + + + + + + + From 32355d5013176a63f4b6d70756d3e882305deac3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 12:52:31 +0800 Subject: [PATCH 489/589] =?UTF-8?q?user=E6=9C=8D=E5=8A=A1=E5=BC=80?= =?UTF-8?q?=E6=94=BE=E5=87=BA=E6=89=BE=E5=AE=B6=E5=B1=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java index 3a17485f7a..b8d6dae615 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result.demand; +import com.epmet.dto.result.HouseUserDTO; import lombok.Data; import java.io.Serializable; From bc935ec7a60e3beb60fe7085eb005eb6fc557db2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 9 Dec 2021 13:39:03 +0800 Subject: [PATCH 490/589] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=83=AD=E8=AE=AE?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/ResiBuzzLeftPieChartFormDTO.java | 26 ++++++++++++++ .../com/epmet/dto/result/ResiBuzzDTO.java | 2 +- .../result/ResiBuzzLeftPieChartResultDTO.java | 36 +++++++++++++++++++ .../com/epmet/controller/IssueController.java | 12 +++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 18 ++++++++++ .../java/com/epmet/service/IssueService.java | 10 ++++++ .../epmet/service/impl/IssueServiceImpl.java | 33 +++++++++++++---- .../src/main/resources/mapper/IssueDao.xml | 32 +++++++++++++++++ 8 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java new file mode 100644 index 0000000000..a8b2cae5dd --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/9 9:53 上午 + * @DESC + */ +@Data +public class ResiBuzzLeftPieChartFormDTO implements Serializable { + + private static final long serialVersionUID = -7312573663758331220L; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织类型，agency：组织，grid：网格 + */ + private String orgType; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java index df21741fdc..72da12a996 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java @@ -86,6 +86,6 @@ public class ResiBuzzDTO implements Serializable { this.oppositionCount = NumConstant.ZERO; this.voteAccount = ""; this.issueOriginator = ""; - this.categoryName = ""; + this.categoryName = "其他"; } } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java new file mode 100644 index 0000000000..e954770cab --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/9 9:56 上午 + * @DESC + */ +@Data +public class ResiBuzzLeftPieChartResultDTO implements Serializable { + + private static final long serialVersionUID = -4673540577019002156L; + + /** + * 数量 + */ + private Integer count; + + /** + * 分类编码 + */ + private String categoryCode; + + /** + * 分类名字 + */ + private String categoryName; + + /** + * 颜色 + */ + private String colour; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 7b1615bb4e..1058f54ce8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -299,5 +299,17 @@ public class IssueController { return new Result().ok(issueService.resiBuzz(formDTO,tokenDto)); } + /** + * @Description 居民热议左边饼图 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/9 10:03 上午 + */ + @PostMapping("resibuzz-leftpiechart") + public Result> resiBuzzLeftPieChart(@RequestBody ResiBuzzLeftPieChartFormDTO formDTO,@LoginUser TokenDto tokenDto){ + return new Result>().ok(issueService.resiBuzzLeftPieChart(formDTO,tokenDto)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 286848eb98..66584d76ba 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -236,4 +236,22 @@ public interface IssueDao extends BaseDao { */ List selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status); + /** + * @Description 查询客户下1级分类的长度 + * @param customerId + * @author zxc + * @date 2021/12/9 10:28 上午 + */ + Integer selectOneLevelCategoryLength(@Param("customerId")String customerId); + + /** + * @Description 查询居民热议左侧饼图 + * @param orgId + * @param orgType + * @param length + * @author zxc + * @date 2021/12/9 10:57 上午 + */ + List resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index cbd08ab274..e85b8c69e9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -359,4 +359,14 @@ public interface IssueService extends BaseService { * @date 2021/12/8 3:50 下午 */ ResiBuzzResultDTO resiBuzz(ResiBuzzFormDTO formDTO , TokenDto tokenDto); + + /** + * @Description 居民热议左边饼图 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/9 10:03 上午 + */ + List resiBuzzLeftPieChart(ResiBuzzLeftPieChartFormDTO formDTO,TokenDto tokenDto); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 740ebd13f5..05b146ac8c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1570,6 +1570,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp /** * @Description 居民热议列表 + * 如果议题没有分类，默认显示其他，产品说的 * @param formDTO * @param tokenDto * @author zxc @@ -1577,7 +1578,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp */ @Override public ResiBuzzResultDTO resiBuzz(ResiBuzzFormDTO formDTO, TokenDto tokenDto) { - if (org.apache.commons.lang3.StringUtils.isBlank(formDTO.getOrgId())){ + if (StringUtils.isBlank(formDTO.getOrgId())){ CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo){ throw new EpmetException("未查询到此工作人员的所属组织信息..."); @@ -1612,12 +1613,30 @@ public class IssueServiceImpl extends BaseServiceImpl imp return result; } - public static void main(String[] args) { - List list = new ArrayList<>(); - list.add("1"); - list.add("2"); - list.add("3"); - System.out.println(list.subList(0, 3)); + /** + * @Description 居民热议左边饼图 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/9 10:03 上午 + */ + @Override + public List resiBuzzLeftPieChart(ResiBuzzLeftPieChartFormDTO formDTO, TokenDto tokenDto) { + if (StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员的所属组织信息..."); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); + } + Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); + List result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length); + if(CollectionUtils.isEmpty(result)){ + return new ArrayList<>(); + } + return result; } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index fd68a02084..5067b9c8cd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -607,4 +607,36 @@ ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC + + + + + + \ No newline at end of file From 5ec25107aec365f306fbbbf865dba95812d1a83a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 9 Dec 2021 15:14:14 +0800 Subject: [PATCH 491/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=88=86=E6=9E=90=E3=80=91=E5=88=86=E7=B1=BB=E4=B8=8B?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govorg/result/GridsInfoListResultDTO.java | 6 +- .../dto/govproject/ResiEventDTO.java | 45 +++++++++++ .../form/CategoryProjectFormDTO.java | 5 ++ .../result/CategoryProjectResultDTO.java | 11 ++- .../result/ProjectStatusListResultDTO.java | 2 + .../controller/GovProjectController.java | 3 +- .../dataaggre/dao/govissue/IssueDao.java | 2 +- .../dataaggre/dao/govproject/ProjectDao.java | 31 +++++++- .../service/govissue/GovIssueService.java | 4 +- .../govissue/impl/GovIssueServiceImpl.java | 4 +- .../impl/GovProjectServiceImpl.java | 75 +++++++++++++++++- .../resources/mapper/govissue/IssueDao.xml | 8 +- .../mapper/govorg/CustomerGridDao.xml | 3 +- .../mapper/govproject/ProjectDao.xml | 76 ++++++++++++++++++- 14 files changed, 252 insertions(+), 23 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java index f25721539f..571195cd86 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java @@ -24,8 +24,12 @@ public class GridsInfoListResultDTO implements Serializable { private String gridId; /** - * 网格名称 + * 组织-网格名称 */ private String gridName; + /** + * 网格名称 + */ + private String name; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java new file mode 100644 index 0000000000..4f0e39c907 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java @@ -0,0 +1,45 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dto.govproject; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +public class ResiEventDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + private String projectId; + + private String reportUserId; + + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java index 38335e8223..07588e5e3c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java @@ -33,6 +33,11 @@ public class CategoryProjectFormDTO implements Serializable { private Integer pageSize = 20; //是否分页(是:true 否:false) private Boolean isPage = true; + //明天的dateId值 + private String toDateId; + private String customerId; + private List categoreCodeList; + public interface Category extends CustomerClientShowGroup { } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java index b6cd54a88c..33199b3854 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.dto.govproject.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -26,7 +27,7 @@ public class CategoryProjectResultDTO implements Serializable { private String projectId; //项目编码[目前没这个功能 默认为空] private String projectCode = ""; - //一级分类Id集合 + //一级分类Code集合 private List categoryCodes; //一级分类名称集合 private List categoryNames; @@ -42,10 +43,14 @@ public class CategoryProjectResultDTO implements Serializable { private String title; //转项目时间 private String time; - //当前人员是否处理：未处理unhandled，已处理handle - private String isHandle; //小程序居民端话题或事件创建人【立项项目此值为空】 private String userId; + //分类对应的所有上级,英文逗号隔开【目前分类只有两级，所以这个字段值其实就是一类的id值】 + @JsonIgnore + private String categoryPids; + //二级分类code + @JsonIgnore + private String categoryCode; } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java index c8c895e549..9d2bedab75 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java @@ -24,5 +24,7 @@ public class ProjectStatusListResultDTO implements Serializable { private Integer longitude; //纬度 private Integer dimension; + //项目标题 + private String title; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 3039785f12..3d70bf2b96 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -102,8 +102,9 @@ public class GovProjectController { * @author sun */ @PostMapping("categoryprojectlist") - public Result categoryProjectList(@RequestBody CategoryProjectFormDTO formDTO) { + public Result categoryProjectList(@LoginUser TokenDto tokenDto, @RequestBody CategoryProjectFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(govProjectService.categoryProjectList(formDTO)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java index 6727a2d2d4..17d16fd72d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java @@ -80,5 +80,5 @@ public interface IssueDao extends BaseDao { * @Description 查询客户下分类信息 * @author sun **/ - List getCategoryList(@Param("customerId") String customerId); + List getCategoryList(@Param("customerId") String customerId, @Param("level") String level, @Param("isDisable") String isDisable); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 2a433d58d7..05071b61e5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -18,14 +18,14 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; +import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; +import com.epmet.dataaggre.dto.govproject.ResiEventDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; +import com.epmet.dataaggre.dto.govproject.form.CategoryProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO; +import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.entity.govproject.ProjectEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -81,4 +81,27 @@ public interface ProjectDao extends BaseDao { List getProjectStatusList(ProjectTotalFormDTO formDTO); List selectProjectIssueCategory(@Param("issueIds") List issueIds); + + /** + * @Description 查询组织截止某一天的某个分类下的项目列表 + * @author sun + */ + List categoryProjectList(CategoryProjectFormDTO formDTO); + + /** + * @Description 查询项目对应的所有分类信息 + * @author sun + */ + List getCategoryList(@Param("projectIds") List projectIds); + + /** + * @Description 查询来源事件的项目居民端创建人信息 + * @author sun + */ + List getEventList(@Param("projectIds") List projectIds); + /** + * @Description 查询来源话题的项目居民端创建人信息 + * @author sun + */ + List getTopicUser(@Param("projectIds") List projectIds); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java index 65e768ccf5..3e87ea18d3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java @@ -48,8 +48,8 @@ public interface GovIssueService { List selectShiftProjectIssueList(String customerId,String gridId,Integer pageNo,Integer pageSize); /** - * @Description 查询客户下一级分类信息 + * @Description 查询客户下分类信息 * @author sun **/ - List categoryList(String customerId); + List categoryList(String customerId, String level, String isDisable); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java index db987e0b5c..5556d2d3f0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java @@ -329,8 +329,8 @@ public class GovIssueServiceImpl implements GovIssueService { * @author sun **/ @Override - public List categoryList(String customerId) { - return issueDao.getCategoryList(customerId); + public List categoryList(String customerId, String level, String isDisable) { + return issueDao.getCategoryList(customerId, level, isDisable); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 1b665e2888..21c18f8ba2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -15,7 +15,10 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; +import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; +import com.epmet.dataaggre.dto.govproject.ResiEventDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; @@ -28,6 +31,8 @@ import com.epmet.dataaggre.service.resigroup.ResiGroupService; import com.epmet.dto.form.TimestampIntervalFormDTO; import com.epmet.dto.form.WorkMinuteFormDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -330,7 +335,7 @@ public class GovProjectServiceImpl implements GovProjectService { @Override public List projectStatusList(ProjectTotalFormDTO formDTO) { //所选日期后一天的dateId值 - formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1)); + formDTO.setToDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1)); //1.查询组织下截止到dateId的某个状态的项目列表 List resultList = projectDao.getProjectStatusList(formDTO); return resultList; @@ -344,7 +349,7 @@ public class GovProjectServiceImpl implements GovProjectService { public List projectCategoryList(ProjectCategoryTotalFormDTO formDTO) { List resultList = new ArrayList<>(); //1.查询客户下一级分类信息 - List categoryList = govIssueService.categoryList(formDTO.getCustomerId()); + List categoryList = govIssueService.categoryList(formDTO.getCustomerId(), "1", "enable"); //2.按dateId查询组织下一级分类项目总数 List list = evaluationIndexService.projectCategoryList(formDTO); @@ -372,7 +377,71 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO) { - return null; + CategoryProjectResultDTO resultDTO = new CategoryProjectResultDTO(); + //所选日期后一天的dateId值 + formDTO.setToDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1)); + //1.查询客户下分类信息 + List categoryList = govIssueService.categoryList(formDTO.getCustomerId(), null, null); + List categoreCodeList = categoryList.stream().map(ca -> formDTO.getCategoryCode().equals(ca.getParentCategoryCode()) ? ca.getCategoryCode() : "").collect(Collectors.toList()); + formDTO.setCategoreCodeList(categoreCodeList); + + //2.查询组织及下级截止某一天的某个一级分类下的项目列表 + PageInfo result = + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> projectDao.categoryProjectList(formDTO)); + if (org.springframework.util.CollectionUtils.isEmpty(result.getList())) { + return resultDTO; + } + resultDTO.setTotal((int) result.getTotal()); + + //3.查询已有项目列表涉及的所有分类信息【一个项目存在多个一级分类下的二级分类】 + List projectIds = result.getList().stream().map(CategoryProjectResultDTO.Project::getProjectId).collect(Collectors.toList()); + List list = projectDao.getCategoryList(projectIds); + + //4.查询网格信息【楼院小组类项目、上报事件且上报给网格的项目才存在网格Id】 + List gridIds = result.getList().stream().map(CategoryProjectResultDTO.Project::getGridId).collect(Collectors.toList()); + gridIds = gridIds.stream().distinct().collect(Collectors.toList()); + List gridList = govOrgService.gridListByIds(gridIds); + + //5.查询来源议题、事件的项目居民端创建人userId + List eventUser = projectDao.getEventList(projectIds); + List topicUser = projectDao.getTopicUser(projectIds); + + //5.封装数据 + result.getList().forEach(re -> { + //项目涉及网格信息 + gridList.forEach(g -> { + if (StringUtils.isNotBlank(re.getGridId()) && re.getGridId().equals(g.getGridId())) { + re.setGridName(g.getName()); + } + }); + //项目涉及分类信息【一个项目涉及多个一级分类】 + List caId = new ArrayList<>(); + List caCode = new ArrayList<>(); + list.forEach(ca -> { + if (ca.getProjectId().equals(re.getProjectId())) { + caId.add(ca.getCategoryPids()); + caCode.add(ca.getCategoryCode()); + } + }); + List caName = new ArrayList<>(); + categoryList.forEach(ca -> caId.stream().filter(li -> ca.getId().equals(li)).forEach(s -> caName.add(ca.getCategoryName()))); + re.setCategoryCodes(caCode); + re.setCategoryNames(caName); + //项目来源话题、事件的创建人信息 + eventUser.forEach(ev -> { + if (re.getProjectId().equals(ev.getProjectId())) { + re.setUserId(ev.getReportUserId()); + } + }); + topicUser.forEach(to -> { + if (re.getProjectId().equals(to.getProjectId())) { + re.setUserId(to.getUserId()); + } + }); + }); + + resultDTO.setList(result.getList()); + return resultDTO; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml index 239e846aa9..90ecda4b20 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml @@ -131,8 +131,12 @@ FROM issue_project_category_dict WHERE del_flag = 0 AND customer_id = #{customerId} - AND category_type = '1' - AND is_disable = 'enable' + + AND category_type = #{level} + + + AND is_disable = #{isDisable} + ORDER BY category_code diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index fde243eafa..60350c7a1e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -22,7 +22,8 @@ cg.grid_name, CONCAT(ca.organization_name,'-',cg.grid_name) ) AS 'gridName', - cg.customer_id AS 'customerId' + cg.customer_id AS 'customerId', + cg.grid_name AS 'name' FROM customer_grid cg INNER JOIN customer_agency ca ON cg.pid = ca.id diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index fd2b6e44e1..cec83dea7f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -163,17 +163,87 @@ origin "origin", `status` "status", locate_longitude "longitude", - locate_dimension dimension + locate_dimension dimension, + title title FROM project WHERE del_flag = '0' - AND agency_id = #{agencyId} + AND org_id_path LIKE CONCAT('%', #{agencyId}, '%') AND `status` = #{status} - AND created_time DATE_FORMAT(#{dateId}, '%Y-%m-%d') + AND created_time DATE_FORMAT(#{toDateId}, '%Y-%m-%d') ORDER BY created_time DESC + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java index da965870b5..d48a225007 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result; import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -23,6 +24,7 @@ public class ProjectDistributionAnalysisRightDTO implements Serializable { /** * 组织类型，组织：agency，网格：grid */ + @JsonIgnore private String orgType; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java index 1801d1c1d7..5b52084e9d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -30,4 +31,11 @@ public class ProjectDistributionAnalysisRightResultDTO implements Serializable { private String above; private List list; + + public ProjectDistributionAnalysisRightResultDTO() { + this.under = ""; + this.middle = ""; + this.above = ""; + this.list = new ArrayList<>(); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index 205d91bc3d..612debd512 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -197,4 +197,6 @@ public interface ProjectConstant { String ORG_TYPE_GRID = "grid"; + String ORG_LEVEL_COMMUNITY = "community"; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 3588aeefb1..8b0376db17 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -28,7 +28,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; @@ -2845,7 +2847,25 @@ public class ProjectServiceImpl extends BaseServiceImpl orgList = new ArrayList<>(); + if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){ + + }else { + + } + return result; } /** From 9ce3b0132e37ebf235e50923ca14415aa2bb425d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 16:48:44 +0800 Subject: [PATCH 493/589] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E8=BF=98=E6=97=A9=E5=91=A2=EF=BC=8C=E8=A6=81?= =?UTF-8?q?=E5=8E=BB=E6=94=B9=E9=9C=80=E6=B1=82=E7=9A=84bug=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project/gov-project-client/pom.xml | 6 +++ .../ResiEventResearchAnalysisFormDTO.java | 50 +++++++++++++++++++ .../com/epmet/dto/result/ProjectDataDTO.java | 16 ++++++ .../epmet/dto/result/ProjectInfoIcData.java | 17 +++++++ .../ResiEventResearchAnalysisResDTO.java | 30 +++++++++++ .../epmet/controller/ResiEventController.java | 16 ++++++ .../com/epmet/dao/ProjectCategoryDao.java | 7 +++ .../epmet/service/ProjectCategoryService.java | 7 +++ .../com/epmet/service/ResiEventService.java | 8 +++ .../impl/ProjectCategoryServiceImpl.java | 11 ++++ .../service/impl/ResiEventServiceImpl.java | 37 ++++++++++++-- .../resources/mapper/ProjectCategoryDao.xml | 7 +++ 12 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java diff --git a/epmet-module/gov-project/gov-project-client/pom.xml b/epmet-module/gov-project/gov-project-client/pom.xml index 6bf188e6e8..57a8d18366 100644 --- a/epmet-module/gov-project/gov-project-client/pom.xml +++ b/epmet-module/gov-project/gov-project-client/pom.xml @@ -23,5 +23,11 @@ 2.0.0 compile + + com.epmet + epmet-user-client + 2.0.0 + compile + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java new file mode 100644 index 0000000000..e942fe127e --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件 + * + */ +@Data +public class ResiEventResearchAnalysisFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 当前选中的事件id + */ + @NotBlank(message = "resiEventId不能为空",groups = AddUserInternalGroup.class) + private String resiEventId; + + /** + * 当前选中的事件转为的项目id + */ + @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) + private String projectId; + + /** + * 个人档案的这个人 + */ + @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) + private String isResiUserId; + + /** + * 个人档案的这个人，对应小程序的人的用户id + */ + private List epmetUserIdList; + + + + + @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java new file mode 100644 index 0000000000..0f4721dbec --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件 + */ +@Data +public class ProjectDataDTO implements Serializable { + private String firstCategoryCode; + private String firstCategoryName; + private List projectList; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java new file mode 100644 index 0000000000..312f8721ab --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件 + */ +@Data +public class ProjectInfoIcData implements Serializable { + private static final long serialVersionUID = -1937915930811634827L; + private String projectId; + private String projectTitle; + private String resiEventId; + private String projectStatus; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java new file mode 100644 index 0000000000..e432179589 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件 + * + */ +@Data +public class ResiEventResearchAnalysisResDTO implements Serializable { + + /** + * 居民信息及家属列表 + */ + private String icResiUserId; + private String icUserName; + private String houseId; + private List houseUserList; + + + /** + * 入参中给的，再返回去 + */ + private List epmetUserIdList; + private List projectData; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index b3dd410a81..c0fa147ba6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -240,4 +240,20 @@ public class ResiEventController { ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class); return new Result>().ok(resiEventService.pageUserReported(formDTO)); } + + /** + * 数据分析-个人档案-上报事件列表-事件详情研判分析 + * + * @param formDTO + * @return + */ + @PostMapping("research-analysis") + public Result queryResiEventResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody ResiEventResearchAnalysisFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,ResiEventResearchAnalysisFormDTO.AddUserInternalGroup.class); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + return new Result<>(); + } + return new Result().ok(resiEventService.queryResiEventResearchAnalysis(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java index cc2d336344..1127a7a099 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java @@ -61,4 +61,11 @@ public interface ProjectCategoryDao extends BaseDao { * @date 2021/5/17 10:47 上午 */ List selectCategoryByIds(@Param("projectIds")List projectIds); + + /** + * + * @param projectId + * @return + */ + List selectListByProjectId(String projectId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java index 37fb5fa984..4d66d39dd0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java @@ -119,4 +119,11 @@ public interface ProjectCategoryService extends BaseService getProjectCategoryList(DelCategoryFormDTO formDTO); + + /** + * 根据项目id，查询所有分类 + * @param projectId + * @return + */ + List getProjectCategoryService(String projectId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index b73e1f7908..c6e52d4cc3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -147,4 +147,12 @@ public interface ResiEventService extends BaseService { * @return */ PageData pageUserReported(PageUserReportEventFormDTO formDTO); + + /** + * 数据分析-个人档案-上报事件列表-事件详情研判分析 + * + * @param formDTO + * @return + */ + ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java index 85a2d6cc7e..ac0a279fb9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java @@ -214,4 +214,15 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl getProjectCategoryService(String projectId) { + return baseDao.selectListByProjectId(projectId); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 01b0377ad3..4be3ddcf79 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; @@ -38,11 +39,13 @@ import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.*; import com.epmet.dto.EventProjectInfoDTO; +import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.service.ProjectCategoryService; import com.epmet.service.ResiEventService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -54,10 +57,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; /** * 居民报事表 @@ -90,6 +90,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } + /** + * 数据分析-个人档案-上报事件列表-事件详情研判分析 + * + * @param formDTO + * @return + */ + @Override + public ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO) { + //获取案件居民和及家属列表 + Result userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIsResiUserId()); + if (userRes.success() || null == userRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常"); + } + IcResiUserBriefDTO icResiUserDTO = userRes.getData(); + ResiEventResearchAnalysisResDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiEventResearchAnalysisResDTO.class); + resultDTO.setEpmetUserIdList(!CollectionUtils.isEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList()); + // 先判断这个项目是否有分类没有直接返回 + List projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId()); + if(CollectionUtils.isEmpty(projectCategoryDTOList)){ + resultDTO.setProjectData(new ArrayList<>()); + return resultDTO; + } + //查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目 + //todo + return null; + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml index 49942cdca3..465bd2454a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml @@ -50,4 +50,11 @@ ) + \ No newline at end of file From acd5159f759ccee1397c7e890608a3de8c8bf0fd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 9 Dec 2021 16:54:15 +0800 Subject: [PATCH 494/589] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=90=E7=BA=A7?= =?UTF-8?q?=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/GovOrgOpenFeignClient.java | 9 +++++++++ .../fallback/GovOrgOpenFeignClientFallback.java | 5 +++++ .../com/epmet/controller/AgencyController.java | 11 +++++++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 8 ++++++++ .../java/com/epmet/service/AgencyService.java | 8 ++++++++ .../com/epmet/service/impl/AgencyServiceImpl.java | 15 +++++++++++++++ .../main/resources/mapper/CustomerAgencyDao.xml | 10 ++++++++++ .../epmet/service/impl/ProjectServiceImpl.java | 8 +++++++- 8 files changed, 73 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 6c438becaf..5d713f13e4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -531,4 +531,13 @@ public interface GovOrgOpenFeignClient { @GetMapping("/gov/org/customergrid/getGridIListByAgency/{agencyId}") Result> getGridIListByAgency(@PathVariable("agencyId") String agencyId); + + /** + * @Description 查询下级agencyId + * @param orgId + * @author zxc + * @date 2021/12/9 4:42 下午 + */ + @PostMapping("/gov/org/agency/getsonagencyid") + Result> getSonAgencyId(@RequestParam("orgId")String orgId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 58847819eb..46fcb2506c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -334,6 +334,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIListByAgency", agencyId); } + @Override + public Result> getSonAgencyId(String orgId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getSonAgencyId", orgId); + } + @Override public Result selectPidsByGridId(String gridId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index c2c2273036..5651110c57 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -349,4 +349,15 @@ public class AgencyController { return new Result>().ok(agencyService.baseInfoFamilyBuilding(formDTO)); } + /** + * @Description 查询下级agencyId + * @param orgId + * @author zxc + * @date 2021/12/9 4:42 下午 + */ + @PostMapping("getsonagencyid") + public Result> getSonAgencyId(@RequestParam("orgId")String orgId){ + return new Result>().ok(agencyService.getSonAgencyId(orgId)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 24a007311e..f2b122dca7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -273,4 +273,12 @@ public interface CustomerAgencyDao extends BaseDao { * @date 2021/10/25 2:30 下午 */ List selectSonOrg(@Param("pid")String pid,@Param("type")String type); + + /** + * @Description 查询下级agencyId + * @param orgId + * @author zxc + * @date 2021/12/9 4:42 下午 + */ + List getSonAgencyId(@Param("orgId") String orgId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java index 9a2fd83d82..d85f2d8b68 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java @@ -148,4 +148,12 @@ public interface AgencyService { */ List baseInfoFamilyBuilding(BaseInfoFamilyBuildingFormDTO formDTO); + /** + * @Description 查询下级agencyId + * @param orgId + * @author zxc + * @date 2021/12/9 4:42 下午 + */ + List getSonAgencyId(String orgId); + } \ No newline at end of file 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 e9747050e3..b15e6f17c3 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 @@ -621,6 +621,21 @@ public class AgencyServiceImpl implements AgencyService { return result; } + /** + * @Description 查询下级agencyId + * @param orgId + * @author zxc + * @date 2021/12/9 4:42 下午 + */ + @Override + public List getSonAgencyId(String orgId) { + List result = customerAgencyDao.getSonAgencyId(orgId); + if (CollectionUtils.isNotEmpty(result)){ + return result; + } + return new ArrayList<>(); + } + private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) { CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class); insertEntity.setOrganizationName(formDTO.getAgencyName()); 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 f0d6065116..f35fe34fed 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 @@ -638,4 +638,14 @@ order by created_time desc + + + diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 8b0376db17..9bb324a2ea 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2863,7 +2863,13 @@ public class ProjectServiceImpl extends BaseServiceImpl> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO); + if (!projectCountByGrid.success()){ + throw new EpmetException("查询网格项目数失败..."); + } + if (CollectionUtils.isNotEmpty(projectCountByGrid.getData())){ + orgList = projectCountByGrid.getData(); + } } return result; } From 9849a30f9990b1184cfed0513d517e057ae48f1d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 9 Dec 2021 17:25:11 +0800 Subject: [PATCH 495/589] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerAgencyDao.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 39001b916b..d1a49f7ba3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -282,11 +282,5 @@ public interface CustomerAgencyDao extends BaseDao { */ List getSonAgencyId(@Param("orgId") String orgId); - /** - * desc：获取组织网格树 含直属网格 - * @param agencyId - * @return - */ - AgencyTreeResultDTO getAgencyGridTree(String agencyId); } From c2b8eb5e8077f79b08dcd0b708867029f46fb390 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 9 Dec 2021 17:27:20 +0800 Subject: [PATCH 496/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetAdminOpenFeignClient.java | 6 ++ .../EpmetAdminOpenFeignClientFallback.java | 7 ++ .../tools/dto/result/OptionDataResultDTO.java | 18 ++++ .../com/epmet/dto/IcPartyActivityDTO.java | 4 +- .../epmet/dto/form/PartyActivityFormDTO.java | 2 + .../dto/result/ActivityStatisticsDTO.java | 16 ++++ .../PartyUnitDistributionResultDTO.java | 20 +++++ .../controller/IcPartyActivityController.java | 21 +++++ .../controller/IcPartyUnitController.java | 29 +++++++ .../com/epmet/dao/IcPartyActivityDao.java | 11 +++ .../java/com/epmet/dao/IcPartyUnitDao.java | 20 +++++ .../epmet/service/IcPartyActivityService.java | 19 ++++ .../com/epmet/service/IcPartyUnitService.java | 21 +++++ .../impl/IcPartyActivityServiceImpl.java | 86 ++++++++++++++++++- .../service/impl/IcPartyUnitServiceImpl.java | 48 +++++++++++ .../resources/mapper/IcPartyActivityDao.xml | 18 ++++ .../main/resources/mapper/IcPartyUnitDao.xml | 28 ++++++ 17 files changed, 371 insertions(+), 3 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java index bb8d12f49c..6d7e1124dd 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java @@ -1,6 +1,8 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.form.DictListFormDTO; +import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.result.CorsConfigResultDTO; @@ -8,6 +10,7 @@ import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -84,4 +87,7 @@ public interface EpmetAdminOpenFeignClient { */ @PostMapping("/sys/dict/data/dictmap/{dictType}") Result> dictMap(@PathVariable("dictType") String dictType); + + @PostMapping("/sys/dict/data/dictlist") + Result> dictList(@RequestBody DictListFormDTO formDTO); } diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java index 139514d1f5..6c16e8f3ae 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java @@ -1,6 +1,8 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.form.DictListFormDTO; +import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; @@ -46,4 +48,9 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli public Result> dictMap(String dictType) { return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictMap", dictType); } + + @Override + public Result> dictList(DictListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictList", formDTO); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java new file mode 100644 index 0000000000..78f77a850b --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.commons.tools.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/8 14:50 + */ +@Data +public class OptionDataResultDTO implements Serializable { + private static final long serialVersionUID = 416877704759019210L; + private String label; + private String value; + private String code; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index fc0d7555e3..a8c770f8e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -69,7 +69,7 @@ public class IcPartyActivityDTO implements Serializable { */ @NotBlank(message = "服务事项不能为空",groups = AddGroup.class) private String serviceMatter; - + private String serviceMatterName; /** * 活动标题 */ @@ -97,7 +97,7 @@ public class IcPartyActivityDTO implements Serializable { * 活动时间 */ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm") private Date activityTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 40ac5563ac..1f108568e1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; @@ -16,6 +17,7 @@ import java.util.Date; @Data public class PartyActivityFormDTO implements Serializable { private static final long serialVersionUID = -2510068555703677L; + @NotBlank(message = "组织Id不能为空" ) private String agencyId; private String unitId; private String title; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java new file mode 100644 index 0000000000..a941c3eb8f --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/9 16:05 + */ +@Data +public class ActivityStatisticsDTO implements Serializable { + private String unitCount; + private String activityCount; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java new file mode 100644 index 0000000000..e8ef54c842 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/9 10:05 + */ +@Data +public class PartyUnitDistributionResultDTO implements Serializable { + private static final long serialVersionUID = -4066938451623510159L; + private String id; + private String name; + private String type; + private String longitude; + private String latitude; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index a17609835d..5071fd8710 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcPartyActivityDTO; import com.epmet.dto.form.PartyActivityFormDTO; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcPartyActivityExcel; import com.epmet.service.IcPartyActivityService; import org.apache.commons.collections4.CollectionUtils; @@ -117,4 +118,24 @@ public class IcPartyActivityController { public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException { return icPartyActivityService.importData(tokenDto, response, file); } + + /** + * @Description 联建活动分类统计 + * @Param formDTO + * @Return {@link Result< List< OptionDTO>>} + * @Author zhaoqifeng + * @Date 2021/12/9 16:20 + */ + @PostMapping("statistics") + public Result> statistics(@RequestBody PartyActivityFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icPartyActivityService.statistics(formDTO)); + } + + @PostMapping("activitylist") + public Result> activityList(@LoginUser TokenDto tokenDto, @RequestBody PartyActivityFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + PageData page = icPartyActivityService.getActivityList(tokenDto, formDTO); + return new Result>().ok(page); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index ec06c3bf5f..359e6b3657 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -19,6 +19,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; @@ -28,8 +29,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcPartyUnitDTO; +import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; +import com.epmet.dto.result.PartyUnitDistributionResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcPartyUnitExcel; import com.epmet.service.IcPartyUnitService; @@ -150,4 +153,30 @@ public class IcPartyUnitController { public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException { return icPartyUnitService.importData(tokenDto, response, file); } + + /** + * @Description 按类型统计单位数量 + * @Param dto + * @Return {@link Result< List< OptionDataResultDTO>>} + * @Author zhaoqifeng + * @Date 2021/12/8 14:52 + */ + @PostMapping("typestatistics") + public Result> typeStatistics(@RequestBody PartyActivityFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icPartyUnitService.typeStatistics(formDTO)); + } + + /** + * @Description 联建单位分布 + * @Param formDTO + * @Return {@link Result< List< PartyUnitDistributionResultDTO>>} + * @Author zhaoqifeng + * @Date 2021/12/9 10:11 + */ + @PostMapping("distribution") + public Result> distribution(@RequestBody PartyActivityFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icPartyUnitService.distribution(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java index c596572fee..bb7e41c2ed 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java @@ -18,6 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.PartyActivityFormDTO; +import com.epmet.dto.result.ActivityStatisticsDTO; import com.epmet.entity.IcPartyActivityEntity; import org.apache.ibatis.annotations.Mapper; @@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActivityDao extends BaseDao { + + /** + * @Description 联建活动统计 + * @Param formDTO + * @Return {@link ActivityStatisticsDTO} + * @Author zhaoqifeng + * @Date 2021/12/9 16:06 + */ + ActivityStatisticsDTO getStatistics(PartyActivityFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java index caf1f6336c..e287499c48 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java @@ -18,6 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.dto.result.PartyUnitDistributionResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyUnitEntity; import org.apache.ibatis.annotations.Mapper; @@ -43,4 +45,22 @@ public interface IcPartyUnitDao extends BaseDao { List selectListByAgencyId(@Param("agencyIds") List agencyIds, @Param("unitName") String unitName, @Param("customerId")String customerId); + + /** + * 单位分类统计 + * @Param agencyId + * @Return {@link java.util.List} + * @Author zhaoqifeng + * @Date 2021/12/8 15:25 + */ + List getTypeStatistics(@Param("agencyId")String agencyId); + + /** + * @Description 联建单位分布 + * @Param agencyId + * @Return {@link List< PartyUnitDistributionResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/9 14:24 + */ + List getDistribution(@Param("agencyId")String agencyId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java index dc0ca8b8a9..c3931bbd0b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcPartyActivityDTO; import com.epmet.dto.form.PartyActivityFormDTO; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyActivityEntity; import org.springframework.web.multipart.MultipartFile; @@ -98,4 +99,22 @@ public interface IcPartyActivityService extends BaseService} + * @Author zhaoqifeng + * @Date 2021/12/9 14:55 + */ + List statistics(PartyActivityFormDTO formDTO); + + /** + * 联建活动统计列表 + * @Param formDTO + * @Return {@link PageData< IcPartyActivityDTO>} + * @Author zhaoqifeng + * @Date 2021/12/9 16:24 + */ + PageData getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java index 8106d724fe..ebb876072a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java @@ -18,12 +18,15 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcPartyUnitDTO; +import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; +import com.epmet.dto.result.PartyUnitDistributionResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyUnitEntity; import org.springframework.web.multipart.MultipartFile; @@ -120,4 +123,22 @@ public interface IcPartyUnitService extends BaseService { * @Date 2021/11/29 11:01 */ Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException; + + /** + * @Description 按类型统计单位数量 + * @Param formDTO + * @Return {@link List< OptionDataResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/8 14:56 + */ + List typeStatistics(PartyActivityFormDTO formDTO); + + /** + * 联建单位分布 + * @Param formDTO + * @Return {@link List< PartyUnitDistributionResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/9 10:10 + */ + List distribution(PartyActivityFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 213dacc377..cd80f55b72 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -36,6 +36,7 @@ import com.epmet.dto.IcPartyActivityDTO; import com.epmet.dto.IcPartyUnitDTO; import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.form.demand.SubCodeFormDTO; +import com.epmet.dto.result.ActivityStatisticsDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyActivityEntity; import com.epmet.excel.IcPartyActivityImportExcel; @@ -149,7 +150,13 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class); + dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); + return dto; } @Override @@ -287,4 +294,81 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2021/12/9 14:55 + */ + @Override + public List statistics(PartyActivityFormDTO formDTO) { + List list = new ArrayList<>(); + if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) { + setDate(formDTO); + } + ActivityStatisticsDTO dto = baseDao.getStatistics(formDTO); + + OptionDTO unit = new OptionDTO(); + unit.setLabel("组织单位"); + unit.setValue(dto.getUnitCount()); + list.add(unit); + OptionDTO activity = new OptionDTO(); + activity.setLabel("组织活动"); + activity.setValue(dto.getActivityCount()); + list.add(activity); + + return list; + } + + /** + * 联建活动统计列表 + * + * @param formDTO + * @Param formDTO + * @Return {@link PageData< IcPartyActivityDTO>} + * @Author zhaoqifeng + * @Date 2021/12/9 16:24 + */ + @Override + public PageData getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO) { + if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) { + setDate(formDTO); + } + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter()); + wrapper.ge(null != formDTO.getStartTime(),IcPartyActivityEntity::getActivityTime, formDTO.getStartTime()); + wrapper.le(null != formDTO.getEndTime(), IcPartyActivityEntity::getActivityTime, formDTO.getEndTime()); + wrapper.orderByDesc(IcPartyActivityEntity::getActivityTime); + List list = baseDao.selectList(wrapper); + List dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class); + + IcPartyUnitDTO unitDTO = new IcPartyUnitDTO(); + unitDTO.setAgencyId(formDTO.getAgencyId()); + if (CollectionUtils.isNotEmpty(dtoList)) { + Map option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + SubCodeFormDTO codeFormDTO = new SubCodeFormDTO(); + codeFormDTO.setCustomerId(tokenDto.getCustomerId()); + codeFormDTO.setParentCategoryCode("1010"); + Map categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + dtoList.forEach(dto -> { + dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); + dto.setUnitName(option.get(dto.getUnitId())); + }); + } + PageInfo pageInfo = new PageInfo<>(dtoList); + return new PageData<>(dtoList, pageInfo.getTotal()); + } + + private void setDate(PartyActivityFormDTO formDTO) { + String start = DateUtils.getBeforeNDay(30); + formDTO.setEndTime(DateUtils.parse(start.concat("000000"), DateUtils.DATE_TIME_NO_SPLIT)); + String end = DateUtils.format(new Date(), DateUtils.DATE_PATTERN); + formDTO.setEndTime(DateUtils.parse(end.concat(" 23:59:59"), DateUtils.DATE_TIME_PATTERN)); + } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 4931389ae0..336c60f7be 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -24,7 +24,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.dto.result.DictListResultDTO; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.PartyUnitTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -37,9 +40,11 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcPartyUnitDao; import com.epmet.dto.IcPartyUnitDTO; +import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.form.demand.SubCodeFormDTO; +import com.epmet.dto.result.PartyUnitDistributionResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyUnitEntity; import com.epmet.excel.IcPartyUnitImportExcel; @@ -370,6 +375,49 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2021/12/8 14:56 + */ + @Override + public List typeStatistics(PartyActivityFormDTO formDTO) { + DictListFormDTO dictFromDTO = new DictListFormDTO(); + dictFromDTO.setDictType(DictTypeEnum.PARTY_UNIT_TYPE.getCode()); + Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFromDTO); + if (!dictResult.success()) { + throw new EpmetException(dictResult.getCode()); + } + + List list = baseDao.getTypeStatistics(formDTO.getAgencyId()); + Map map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); + + return dictResult.getData().stream().map(item -> { + OptionDataResultDTO dto = new OptionDataResultDTO(); + dto.setLabel(item.getLabel()); + dto.setCode(item.getValue()); + dto.setValue(null == map.get(item.getValue())?NumConstant.ZERO_STR:map.get(item.getValue())); + return dto; + }).collect(Collectors.toList()); + } + + /** + * 联建单位分布 + * + * @param formDTO + * @Param formDTO + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2021/12/9 10:10 + */ + @Override + public List distribution(PartyActivityFormDTO formDTO) { + return baseDao.getDistribution(formDTO.getAgencyId()); + } + private String getServiceMatter(Map map, String matter) { List matters = Arrays.asList(matter.split(StrConstant.COLON)); List list = matters.stream().map(map::get).collect(Collectors.toList()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index fd84685f0e..ede5b4c0e1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -26,6 +26,24 @@ + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index a346765fd8..aa0785186d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -46,4 +46,32 @@ + + + \ No newline at end of file From 7b10430da6ae737ee3883c80c4bef5c9f953bcef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 17:54:54 +0800 Subject: [PATCH 497/589] =?UTF-8?q?project-client=E4=B8=8D=E5=BC=95?= =?UTF-8?q?=E7=94=A8userclient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-project/gov-project-client/pom.xml | 6 ------ .../main/java/com/epmet/dto/result/HouseUserDTO.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java diff --git a/epmet-module/gov-project/gov-project-client/pom.xml b/epmet-module/gov-project/gov-project-client/pom.xml index 57a8d18366..6bf188e6e8 100644 --- a/epmet-module/gov-project/gov-project-client/pom.xml +++ b/epmet-module/gov-project/gov-project-client/pom.xml @@ -23,11 +23,5 @@ 2.0.0 compile - - com.epmet - epmet-user-client - 2.0.0 - compile - \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java new file mode 100644 index 0000000000..4ade8603df --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java @@ -0,0 +1,11 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class HouseUserDTO implements Serializable { + private String icResiUserId; + private String icUserName; +} From 2d2e2a090af0828ee2010e10ee62c3c78314db63 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 18:18:30 +0800 Subject: [PATCH 498/589] is->ic --- .../epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java | 2 +- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 4 ++-- .../com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java | 2 +- .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index 745d5038be..d40ed7cb8a 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -24,7 +24,7 @@ public class DemandResearchAnalysisFormDTO implements Serializable { private String firstCategoryCode; @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) - private String isResiUserId; + private String icResiUserId; private List epmetUserIdList; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 7a8a639c35..e96791ba22 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -565,7 +565,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIsResiUserId()); + Result userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常"); } @@ -574,7 +574,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userIds=new ArrayList<>(); - userIds.add(formDTO.getIsResiUserId()); + userIds.add(formDTO.getIcResiUserId()); if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ userIds.addAll(formDTO.getEpmetUserIdList()); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java index e942fe127e..9cb4a525d2 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java @@ -35,7 +35,7 @@ public class ResiEventResearchAnalysisFormDTO implements Serializable { * 个人档案的这个人 */ @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) - private String isResiUserId; + private String icResiUserId; /** * 个人档案的这个人，对应小程序的人的用户id diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 4be3ddcf79..7b17d0a336 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -683,7 +683,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIsResiUserId()); + Result userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常"); } From 62008db560a9c614a7b5bb7503149ce2371de67b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 19:02:08 +0800 Subject: [PATCH 499/589] ! --- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 4 ++-- .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index e96791ba22..a5b915765b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -566,8 +566,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); - if (userRes.success() || null == userRes.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常"); + if (!userRes.success() || null == userRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); } IcResiUserBriefDTO icResiUserDTO = userRes.getData(); DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, DemandResearchAnalysisResultDTO.class); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 7b17d0a336..295f0bd593 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -685,7 +685,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (userRes.success() || null == userRes.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); } IcResiUserBriefDTO icResiUserDTO = userRes.getData(); ResiEventResearchAnalysisResDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiEventResearchAnalysisResDTO.class); From 5c3379f42a23305010cab88e7e3c1e2cb9fb1b3f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 19:15:11 +0800 Subject: [PATCH 500/589] =?UTF-8?q?=E5=AE=B6=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 3444b71566..c9af6f06e4 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -351,8 +351,8 @@ From 020f9042418a47988edc2bb8f8c591570da431f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:16:46 +0800 Subject: [PATCH 502/589] =?UTF-8?q?=E9=AD=94=E9=AC=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectCategoryDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml index 465bd2454a..24acbb220f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml @@ -50,7 +50,7 @@ ) - SELECT * FROM project_category From 51cd0fc229da66e96024cdf2ca859b811e35597d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:18:52 +0800 Subject: [PATCH 503/589] =?UTF-8?q?feign=E5=BC=80=E6=94=BE=E5=87=BA/gov/is?= =?UTF-8?q?sue/issueprojectcategorydict/getcategorylist=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fallback/GovIssueOpenFeignClientFallBack.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 3792ed5502..79ff8cbcfd 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -20,7 +20,6 @@ import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO; import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -292,4 +291,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO); } + + /** + * @param formDTO + * @return + * @Description 批量查询分类信息 + * @Author yinzuomei + **/ + @Override + public Result> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryList", formDTO); + } } From 25f38d49190dfcca13ae853fdef45bd12689ac91 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:19:16 +0800 Subject: [PATCH 504/589] =?UTF-8?q?feign=E5=BC=80=E6=94=BE=E5=87=BA/gov/is?= =?UTF-8?q?sue/issueprojectcategorydict/getcategorylist=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/GovIssueOpenFeignClient.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 19e8f00720..c62daf8ddb 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -7,7 +7,6 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBackFactory; import com.epmet.project.dto.CustomerCategoryDTO; import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; @@ -362,4 +361,12 @@ public interface GovIssueOpenFeignClient { @PostMapping(value = "/gov/issue/issue/projectcountbygrid") Result> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO); + /** + * @param formDTO + * @return + * @Description 批量查询分类信息 + * @Author yinzuomei + **/ + @PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorylist") + public Result> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO); } From a39ebd2aac0e0a774758549be24e5dca3a4268e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:20:17 +0800 Subject: [PATCH 505/589] =?UTF-8?q?=E5=AE=B6=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index c9af6f06e4..8414cf5e4b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -357,7 +357,7 @@ ic_resi_user m WHERE m.DEL_FLAG = '0' - AND m.id != #{isResiUserId} + AND m.id != #{currentIcResiUserId} and m.HOME_ID=#{homeId} order by m.CREATED_TIME asc From bcd7cdea4f73cfaa215401607ea140ef27e1d95c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 21:56:32 +0800 Subject: [PATCH 506/589] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiEventServiceImpl.java | 61 ++++++++++++++++++- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 295f0bd593..976bfcbf05 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -39,11 +39,13 @@ import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.*; import com.epmet.dto.EventProjectInfoDTO; +import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ProjectCategoryService; import com.epmet.service.ResiEventService; @@ -92,6 +94,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl()); // 先判断这个项目是否有分类没有直接返回 List projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId()); if(CollectionUtils.isEmpty(projectCategoryDTOList)){ - resultDTO.setProjectData(new ArrayList<>()); return resultDTO; } + //筛选出所有的一级分类 + Set firstCategoryIds=new HashSet<>(); + for(ProjectCategoryDTO categoryDTO:projectCategoryDTOList){ + if(StringUtils.isNotBlank(categoryDTO.getCategoryPids())){ + if(NumConstant.ZERO_STR.equals(categoryDTO.getCategoryPids())){ + //当前分类就是一级分类 + firstCategoryIds.add(categoryDTO.getCategoryId()); + continue; + } + //英文逗号 + if(categoryDTO.getCategoryPids().contains(StrConstant.COMMA)){ + String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COMMA); + firstCategoryIds.add(categoryAtt[NumConstant.ZERO]); + continue; + } + //可能也是英文冒号吧。。不知道是啥，所以都判断下吧 + if(categoryDTO.getCategoryPids().contains(StrConstant.COLON)){ + String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COLON); + firstCategoryIds.add(categoryAtt[NumConstant.ZERO]); + continue; + } + } + } + //没有一级分类直接退出 + if(CollectionUtils.isEmpty(firstCategoryIds)){ + return resultDTO; + } + //查询这些分类的名称 //查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目 - //todo - return null; + IssueProjectCategoryDictListFormDTO dictFormDto=new IssueProjectCategoryDictListFormDTO(); + dictFormDto.setCustomerId(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId()); + dictFormDto.setCstegoryIdList(new ArrayList(firstCategoryIds)); + Result> categoryRes=govIssueOpenFeignClient.getCategoryList(dictFormDto); + if(!categoryRes.success()||CollectionUtils.isEmpty(categoryRes.getData())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); + } + List projectData=new ArrayList<>(); + for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){ + //当前项目分类一致，排除当前项目，相同分类编码 + //todo + List projectList=null; + //projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), + //categoryDictDTO.getCategoryCode(),formDTO.getProjectId()); + if(!CollectionUtils.isEmpty(projectList)){ + ProjectDataDTO projectDataDTO=new ProjectDataDTO(); + projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode()); + projectDataDTO.setFirstCategoryName(categoryDictDTO.getCategoryName()); + projectDataDTO.setProjectList(projectList); + projectData.add(projectDataDTO); + } + } + resultDTO.setProjectData(projectData); + return resultDTO; } From d4f2543545b21eb9349bce27cca3981916b55be4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 22:28:08 +0800 Subject: [PATCH 507/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88-=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/ProjectDao.java | 12 +++++++++ .../service/impl/ResiEventServiceImpl.java | 13 ++++++---- .../src/main/resources/mapper/ProjectDao.xml | 25 +++++++++++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index df0dc1ad95..359f35dce4 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -230,4 +230,16 @@ public interface ProjectDao extends BaseDao { List selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate, @Param("orgId")String orgId,@Param("codeLength")Integer codeLength); + /** + * 数据分析-个人档案-事件详情页面的研判分析项目列表 + * @param customerId + * @param categoryCode + * @param excludeProjectId + * @param epmetUserIds + * @return + */ + List selectCommonCategoryEventProject(@Param("customerId")String customerId, + @Param("categoryCode")String categoryCode, + @Param("excludeProjectId") String excludeProjectId, + @Param("epmetUserIds")List epmetUserIds); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 976bfcbf05..129ebda49b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -694,8 +694,13 @@ public class ResiEventServiceImpl extends BaseServiceImpl()); + if(CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + //灭有找到小程序里的用户id, 所以不用查询接下来的项目了..... + return resultDTO; + } + resultDTO.setEpmetUserIdList(formDTO.getEpmetUserIdList()); + // 先判断这个项目是否有分类没有直接返回 List projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId()); if(CollectionUtils.isEmpty(projectCategoryDTOList)){ @@ -740,10 +745,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl projectData=new ArrayList<>(); for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){ //当前项目分类一致，排除当前项目，相同分类编码 - //todo - List projectList=null; - //projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), - //categoryDictDTO.getCategoryCode(),formDTO.getProjectId()); + List projectList=projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), + categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList()); if(!CollectionUtils.isEmpty(projectList)){ ProjectDataDTO projectDataDTO=new ProjectDataDTO(); projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 179a83ce1b..4f6b2fbeca 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -412,4 +412,29 @@ AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') #{endDate} ORDER BY projectId + + + \ No newline at end of file From c0d91bb45bf17f0492e1bb904640d453ce893f5f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 22:39:31 +0800 Subject: [PATCH 508/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88-=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java | 2 +- .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java index 9cb4a525d2..c20612d279 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java @@ -34,7 +34,7 @@ public class ResiEventResearchAnalysisFormDTO implements Serializable { /** * 个人档案的这个人 */ - @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) + @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class) private String icResiUserId; /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 129ebda49b..c37f16b292 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -689,7 +689,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); - if (userRes.success() || null == userRes.getData()) { + if (!userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); } IcResiUserBriefDTO icResiUserDTO = userRes.getData(); From 01952affcbd628a88bb9edc87fee272d47098bef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 22:51:50 +0800 Subject: [PATCH 509/589] =?UTF-8?q?=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/resigroup/ResiTopicDao.xml | 1 + .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml index 63a4f7e32e..c2e54e14ae 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml @@ -39,5 +39,6 @@ rt.CREATED_BY = #{epmetUserId} + order by rt.CREATED_TIME desc \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index c37f16b292..33f7668140 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -715,6 +715,11 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Thu, 9 Dec 2021 23:39:30 +0800 Subject: [PATCH 510/589] hautiyanpan --- .../ResiEventResearchAnalysisFormDTO.java | 2 +- .../form/TopicResearchAnalysisFormDTO.java | 44 ++++++++++ .../epmet/dto/result/ProjectInfoIcData.java | 6 ++ .../result/TopicResearchAnalysisResDTO.java | 23 +++++ .../epmet/controller/ProjectController.java | 13 ++- .../epmet/controller/ResiEventController.java | 3 - .../main/java/com/epmet/dao/ProjectDao.java | 14 +++ .../com/epmet/service/ProjectService.java | 6 ++ .../service/impl/ProjectServiceImpl.java | 86 +++++++++++++++++++ .../service/impl/ResiEventServiceImpl.java | 2 +- .../src/main/resources/mapper/ProjectDao.xml | 27 ++++++ 11 files changed, 220 insertions(+), 6 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java index c20612d279..26950059b5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java @@ -28,7 +28,7 @@ public class ResiEventResearchAnalysisFormDTO implements Serializable { /** * 当前选中的事件转为的项目id */ - @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) + @NotBlank(message = "projectId不能为空",groups = AddUserInternalGroup.class) private String projectId; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java new file mode 100644 index 0000000000..b3c2ffe827 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + + +/** + * 话题详情-研判分析 + */ +@Data +public class TopicResearchAnalysisFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 当前选中的事件转为的项目id + */ + @NotBlank(message = "projectId不能为空",groups = AddUserInternalGroup.class) + private String projectId; + + /** + * 个人档案的这个人 + */ + @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class) + private String icResiUserId; + + /** + * 个人档案的这个人，对应小程序的人的用户id + */ + private List epmetUserIdList; + + + + + @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java index 312f8721ab..3129e6fccc 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java @@ -14,4 +14,10 @@ public class ProjectInfoIcData implements Serializable { private String projectTitle; private String resiEventId; private String projectStatus; + + /** + * 以下这两个参数是给话题详情-研判分析用的 + */ + private String issueId; + private String topicId; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java new file mode 100644 index 0000000000..37648617ed --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.util.List; + +@Data +public class TopicResearchAnalysisResDTO { + /** + * 居民信息及家属列表 + */ + private String icResiUserId; + private String icUserName; + private String houseId; + private List houseUserList; + + + /** + * 入参中给的，再返回去 + */ + private List epmetUserIdList; + private List projectData; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index edaaa2bc28..db1af3d7a9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -33,7 +33,6 @@ import com.epmet.dto.result.*; import com.epmet.excel.ProjectExcel; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import com.epmet.service.ProjectService; -import jdk.nashorn.internal.parser.Token; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -300,4 +299,16 @@ public class ProjectController { return new Result().ok(projectService.projectDistributionAnalysisRight(formDTO,tokenDto)); } + /** + * 个人档案-话题详情-研判分析 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("topic-research-analysis") + public Result topicResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody TopicResearchAnalysisFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,TopicResearchAnalysisFormDTO.AddUserInternalGroup.class); + return new Result().ok(projectService.topicResearchAnalysis(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c0fa147ba6..5ebcafac13 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -251,9 +251,6 @@ public class ResiEventController { public Result queryResiEventResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody ResiEventResearchAnalysisFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO,ResiEventResearchAnalysisFormDTO.AddUserInternalGroup.class); - if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { - return new Result<>(); - } return new Result().ok(resiEventService.queryResiEventResearchAnalysis(formDTO)); } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 359f35dce4..ec003c035b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -242,4 +242,18 @@ public interface ProjectDao extends BaseDao { @Param("categoryCode")String categoryCode, @Param("excludeProjectId") String excludeProjectId, @Param("epmetUserIds")List epmetUserIds); + + /** + * 数据分析-个人档案-话题详情页面的研判分析项目列表 + * + * @param customerId + * @param categoryCode + * @param excludeProjectId + * @param epmetUserIds + * @return + */ + List selectCommonCategoryIssueProject(@Param("customerId")String customerId, + @Param("categoryCode")String categoryCode, + @Param("excludeProjectId") String excludeProjectId, + @Param("epmetUserIds")List epmetUserIds); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 7be2c6d71f..dff8e9d30e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -351,4 +351,10 @@ public interface ProjectService extends BaseService { */ ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + /** + * 个人档案-话题详情-研判分析 + * @param formDTO + * @return + */ + TopicResearchAnalysisResDTO topicResearchAnalysis(TopicResearchAnalysisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 9bb324a2ea..ad06a13462 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2874,6 +2874,92 @@ public class ProjectServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); + if (!userRes.success() || null == userRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); + } + IcResiUserBriefDTO icResiUserDTO = userRes.getData(); + TopicResearchAnalysisResDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, TopicResearchAnalysisResDTO.class); + resultDTO.setProjectData(new ArrayList<>()); + if(org.springframework.util.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + //灭有找到小程序里的用户id, 所以不用查询接下来的项目了..... + return resultDTO; + } + resultDTO.setEpmetUserIdList(formDTO.getEpmetUserIdList()); + + // 先判断这个项目是否有分类没有直接返回 + List projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId()); + if(org.springframework.util.CollectionUtils.isEmpty(projectCategoryDTOList)){ + return resultDTO; + } + //筛选出所有的一级分类 + Set firstCategoryIds=new HashSet<>(); + for(ProjectCategoryDTO categoryDTO:projectCategoryDTOList){ + if(StringUtils.isNotBlank(categoryDTO.getCategoryPids())){ + if(NumConstant.ZERO_STR.equals(categoryDTO.getCategoryPids())){ + //当前分类就是一级分类 + firstCategoryIds.add(categoryDTO.getCategoryId()); + continue; + } + //当前分类为二级分类 + if(!categoryDTO.getCategoryPids().contains(StrConstant.COMMA)&&!categoryDTO.getCategoryPids().contains(StrConstant.COLON)){ + firstCategoryIds.add(categoryDTO.getCategoryPids()); + continue; + } + //英文逗号 + if(categoryDTO.getCategoryPids().contains(StrConstant.COMMA)){ + String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COMMA); + firstCategoryIds.add(categoryAtt[NumConstant.ZERO]); + continue; + } + //可能也是英文冒号吧。。不知道是啥，所以都判断下吧 + if(categoryDTO.getCategoryPids().contains(StrConstant.COLON)){ + String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COLON); + firstCategoryIds.add(categoryAtt[NumConstant.ZERO]); + continue; + } + } + } + //没有一级分类直接退出 + if(org.springframework.util.CollectionUtils.isEmpty(firstCategoryIds)){ + return resultDTO; + } + log.info(String.format("当前项目id:%s,所有一级分类id:%s",formDTO.getProjectId(), JSON.toJSONString(firstCategoryIds))); + //查询这些分类的名称 + //查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目 + IssueProjectCategoryDictListFormDTO dictFormDto=new IssueProjectCategoryDictListFormDTO(); + dictFormDto.setCustomerId(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId()); + dictFormDto.setCstegoryIdList(new ArrayList(firstCategoryIds)); + Result> categoryRes=govIssueOpenFeignClient.getCategoryList(dictFormDto); + if(!categoryRes.success()|| org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); + } + List projectData=new ArrayList<>(); + for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){ + //当前项目分类一致，排除当前项目，相同分类编码 + List projectList=baseDao.selectCommonCategoryIssueProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), + categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList()); + if(!org.springframework.util.CollectionUtils.isEmpty(projectList)){ + ProjectDataDTO projectDataDTO=new ProjectDataDTO(); + projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode()); + projectDataDTO.setFirstCategoryName(categoryDictDTO.getCategoryName()); + projectDataDTO.setProjectList(projectList); + projectData.add(projectDataDTO); + } + } + resultDTO.setProjectData(projectData); + return resultDTO; + } + /** * @Description 区间项目分类数量处理 * @param categories diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 33f7668140..ed2c5ee690 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -716,7 +716,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl + + + \ No newline at end of file From 18c4820c3761382fcce9866640e2c489ff238b13 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 23:40:34 +0800 Subject: [PATCH 511/589] issueId --- .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index ff4ad03072..ee2ffffe79 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -444,7 +444,7 @@ DISTINCT pc.PROJECT_ID AS projectId, p.TITLE AS projectTitle, - p.ORIGIN_ID AS resiEventId, + p.ORIGIN_ID AS issueId, p.`STATUS` AS projectStatus FROM project_category pc From 95ca57ed3e911db7305018ac35d650f93257c68a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 23:44:42 +0800 Subject: [PATCH 512/589] topicId --- .../src/main/resources/mapper/ProjectDao.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index ee2ffffe79..d71fab0ee2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -419,7 +419,9 @@ distinct pc.PROJECT_ID as projectId, p.TITLE as projectTitle, p.ORIGIN_ID as resiEventId, - p.`STATUS` as projectStatus + p.`STATUS` as projectStatus, + '' as issueId, + '' as topicId from project_category pc inner join project p on(pc.PROJECT_ID=p.id) @@ -445,7 +447,9 @@ pc.PROJECT_ID AS projectId, p.TITLE AS projectTitle, p.ORIGIN_ID AS issueId, - p.`STATUS` AS projectStatus + per.SOURCE_ID as topicId, + p.`STATUS` AS projectStatus, + '' as resiEventId FROM project_category pc INNER JOIN project_related_personnel per ON ( pc.PROJECT_ID = per.PROJECT_ID ) From 99ea8a72d80f43d3981cd1dc14112f34384a4f4b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Dec 2021 23:55:47 +0800 Subject: [PATCH 513/589] and --- .../src/main/resources/mapper/ProjectDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index d71fab0ee2..f3d2d46a62 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -461,10 +461,10 @@ AND pc.CUSTOMER_ID = #{customerId} AND p.ORIGIN = 'issue' AND pc.PROJECT_ID != #{excludeProjectId} + AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' ) - AND per.USER_ID = #{epmetUserId} + per.USER_ID = #{epmetUserId} - AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' ) ORDER BY p.CREATED_TIME DESC From bad191abd8294b9629568ca417e93e7c9ada0475 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Dec 2021 00:06:04 +0800 Subject: [PATCH 514/589] topic --- .../src/main/resources/mapper/ProjectDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index f3d2d46a62..5f2a063bab 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -453,13 +453,14 @@ FROM project_category pc INNER JOIN project_related_personnel per ON ( pc.PROJECT_ID = per.PROJECT_ID ) - INNER JOIN project p + INNER JOIN project p on(pc.project_id=p.id) WHERE pc.DEL_FLAG = '0' AND per.DEL_FLAG = '0' AND p.DEL_FLAG = '0' AND pc.CUSTOMER_ID = #{customerId} AND p.ORIGIN = 'issue' + and per.SOURCE_TYPE='topic' AND pc.PROJECT_ID != #{excludeProjectId} AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' ) From 1a71e7b2053b366dec17b15561404c54f9cdc6b2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Dec 2021 09:23:07 +0800 Subject: [PATCH 515/589] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/demand/PageListAnalysisFormDTO.java | 50 ++++++++++++ .../controller/IcUserDemandRecController.java | 14 +++- .../com/epmet/dao/IcUserDemandRecDao.java | 9 +++ .../epmet/service/IcUserDemandRecService.java | 8 ++ .../impl/IcUserDemandRecServiceImpl.java | 80 +++++++++++++++++++ .../resources/mapper/IcUserDemandRecDao.xml | 69 ++++++++++++++++ 6 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java new file mode 100644 index 0000000000..c98dad4730 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.form.demand; + + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 数据分析-服务措施分析-分页查询接口入参 + */ +@Data +public class PageListAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = 4993949289966075260L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotNull(message = "页码不能为空", groups = AddUserInternalGroup.class) + private Integer pageNo; + + @NotNull(message = "每页数量不能为空", groups = AddUserInternalGroup.class) + private Integer pageSize; + + @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class) + private String orgId; + @NotBlank(message = "组织或网格的上级", groups = AddUserShowGroup.class) + private String pid; + @NotBlank(message = "orgType=grid或者agency,不能为空", groups = AddUserInternalGroup.class) + private String orgType; + + @NotBlank(message = "分类编码不能为空", groups = AddUserInternalGroup.class) + private String categoryCode; + @NotBlank(message = "上报时间起始日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class) + private String startDateId; + @NotBlank(message = "上报时间截止日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class) + private String endDateId; + + @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; + /** + * orgType=agency时pid拼接上orgId + */ + private String gridPids; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 563777d008..6666d90311 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -224,5 +224,17 @@ public class IcUserDemandRecController { return new Result().ok(icUserDemandRecService.queryDemandResearchAnalysis(formDTO)); } - + /** + * 数分析-服务措施分析-分页查询 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("pagelist-analysis") + public Result> pageListAnalysis(@LoginUser TokenDto tokenDto,@RequestBody PageListAnalysisFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,PageListAnalysisFormDTO.AddUserShowGroup.class,PageListAnalysisFormDTO.AddUserInternalGroup.class); + return new Result>().ok(icUserDemandRecService.pageListAnalysis(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java index a06f831778..aa7c3c68c1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.demand.IcResiUserDemandFromDTO; +import com.epmet.dto.form.demand.PageListAnalysisFormDTO; import com.epmet.dto.form.demand.UserDemandPageFormDTO; import com.epmet.dto.result.demand.DemandRecResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; @@ -56,4 +57,12 @@ public interface IcUserDemandRecDao extends BaseDao { * @return */ DemandRecResultDTO selectDemandRecDetail(@Param("customerId") String customerId, @Param("demandRecId") String demandRecId); + + /** + * 数分析-服务措施分析-分页查询 + * + * @param formDTO + * @return + */ + List pageListAnalysis(PageListAnalysisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index e2e9f10e4c..685261ec33 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -153,4 +153,12 @@ public interface IcUserDemandRecService extends BaseService pageListAnalysis(PageListAnalysisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index a5b915765b..6da6c4e93e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.dao.IcUserDemandOperateLogDao; import com.epmet.dao.IcUserDemandRecDao; import com.epmet.dao.IcUserDemandSatisfactionDao; import com.epmet.dao.IcUserDemandServiceDao; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.CustomerGridFormDTO; @@ -607,7 +608,86 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl pageListAnalysis(PageListAnalysisFormDTO formDTO) { + if("agency".equals(formDTO.getOrgType())){ + if(NumConstant.ZERO_STR.equals(formDTO.getPid())){ + //当前传入的组织id=客户的根组织 + formDTO.setGridPids(formDTO.getOrgId()); + }else{ + //找到当前组织的所有上级，再拼接上自己 + Result customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); + if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); + } + formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId())); + } + } + PageInfo pageInfo= PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageListAnalysis(formDTO)); + List list=pageInfo.getList(); + if(CollectionUtils.isNotEmpty(list)){ + //1、查询网格信息 + List gridIds=list.stream().map(DemandRecResultDTO::getGridId).collect(Collectors.toList()); + Result> gridInfoRes=govOrgOpenFeignClient.getGridListByGridIds(gridIds); + List gridInfoList = gridInfoRes.success() && !CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>(); + Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, Function.identity())); + + //2、查询分类名称 + List categoryCodes=list.stream().map(DemandRecResultDTO::getCategoryCode).collect(Collectors.toList()); + List dictList=demandDictService.listByCodes(formDTO.getCustomerId(),categoryCodes); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); + + //3、查询志愿者 + // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； + Map userInfoMap=new HashMap<>(); + List userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){ + throw new RenException("查询志愿者信息异常"); + } + userInfoMap=userInfoRes.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, UserBaseInfoResultDTO::getRealName)); + } + + //查询字典表 + Result> reportTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); + Map reportTypeMap=reportTypeRes.success()&& MapUtils.isNotEmpty(reportTypeRes.getData())?reportTypeRes.getData():new HashMap<>(); + + Result> statusRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map statusMap=statusRes.success()&& MapUtils.isNotEmpty(statusRes.getData())?statusRes.getData():new HashMap<>(); + + Result> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); + Map serviceTypeMap=serviceTypeRes.success()&& MapUtils.isNotEmpty(serviceTypeRes.getData())?serviceTypeRes.getData():new HashMap<>(); + + for(DemandRecResultDTO res:list){ + if (null != gridInfoMap && gridInfoMap.containsKey(res.getGridId())) { + res.setGridName(gridInfoMap.get(res.getGridId()).getGridName()); + } + if (null != dictMap && dictMap.containsKey(res.getCategoryCode())) { + res.setCategoryName(dictMap.get(res.getCategoryCode())); + } + res.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(), res.getFirstCategoryCode())); + if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) { + res.setServiceName(userInfoMap.get(res.getServerId())); + } + //社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help + res.setReportTypeName(reportTypeMap.containsKey(res.getReportType())?reportTypeMap.get(res.getReportType()):StrConstant.EPMETY_STR); + //待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished + res.setStatusName(statusMap.containsKey(res.getStatus())?statusMap.get(res.getStatus()):StrConstant.EPMETY_STR); + //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； + res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR); + } + } + return new PageData<>(list, pageInfo.getTotal()); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index e4ac17efca..2bd535800a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -192,4 +192,73 @@ AND r.CUSTOMER_ID = #{customerId} and r.id=#{demandRecId} + + + + \ No newline at end of file From fbc377c9221d70dd9021b9e6a3321dec6250769d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Dec 2021 11:09:45 +0800 Subject: [PATCH 516/589] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8-=E5=AF=BC=E5=87=BA=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/demand/PageListAnalysisFormDTO.java | 2 + .../demand/DemandRecExcelResultDTO.java | 52 +++++++++++++++++++ .../controller/IcUserDemandRecController.java | 28 ++++++++-- .../impl/IcUserDemandRecServiceImpl.java | 16 ++++-- .../resources/mapper/IcUserDemandRecDao.xml | 2 +- 5 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java index c98dad4730..9add161aca 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java @@ -47,4 +47,6 @@ public class PageListAnalysisFormDTO implements Serializable { * orgType=agency时pid拼接上orgId */ private String gridPids; + + private Boolean pageFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java new file mode 100644 index 0000000000..eaf3bdee36 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java @@ -0,0 +1,52 @@ +package com.epmet.dto.result.demand; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class DemandRecExcelResultDTO implements Serializable { + + private static final long serialVersionUID = -1110606022410166621L; + + @Excel(name = "状态", width = 15) + private String statusName; + + @Excel(name = "所属网格", width = 40) + private String gridName; + + @Excel(name = "需求类型", width = 40) + private String categoryName; + + @Excel(name = "需求内容", width = 40) + private String content; + + @Excel(name = "上报类型", width = 40) + private String reportTypeName; + + @Excel(name = "上报人", width = 20) + private String reportUserName; + + @Excel(name = "上报时间", width = 25) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date reportTime; + + @Excel(name = "需求人", width = 20) + private String demandUserName; + + /** + * 尹作梅(志愿者) + * XXX(社会组织) + * XXX(社区自组织) + * XXX(区域化党建单位) + */ + @Excel(name = "服务方", width = 15) + private String serviceShowName; + + @Excel(name = "服务时间", width = 25) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wantServiceTime; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 6666d90311..666243eee0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -20,22 +20,22 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.UserDemandConstant; import com.epmet.dto.form.demand.*; -import com.epmet.dto.result.demand.DemandRecResultDTO; -import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO; -import com.epmet.dto.result.demand.IcResiUserReportDemandRes; -import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.demand.*; import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -233,8 +233,28 @@ public class IcUserDemandRecController { */ @PostMapping("pagelist-analysis") public Result> pageListAnalysis(@LoginUser TokenDto tokenDto,@RequestBody PageListAnalysisFormDTO formDTO){ + formDTO.setPageFlag(true); formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO,PageListAnalysisFormDTO.AddUserShowGroup.class,PageListAnalysisFormDTO.AddUserInternalGroup.class); return new Result>().ok(icUserDemandRecService.pageListAnalysis(formDTO)); } + + /** + * 数据分析-服务措施分析-导出 + * @param response + * @param tokenDto + * @param formDTO + * @throws Exception + */ + @PostMapping("analysis-export") + public Result analysisExport(HttpServletResponse response,@LoginUser TokenDto tokenDto, @RequestBody PageListAnalysisFormDTO formDTO)throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPageFlag(false); + PageData res=icUserDemandRecService.pageListAnalysis(formDTO); + if (!CollectionUtils.isEmpty(res.getList())) { + ExcelUtils.exportExcelToTarget(response, null, res.getList(), DemandRecExcelResultDTO.class); + return new Result(); + } + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 6da6c4e93e..51bc5fc35c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -629,9 +629,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl pageInfo= PageHelper.startPage(formDTO.getPageNo(), - formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageListAnalysis(formDTO)); - List list=pageInfo.getList(); + long total=NumConstant.ZERO; + List list=new ArrayList<>(); + if(formDTO.getPageFlag()){ + PageInfo pageInfo= PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageListAnalysis(formDTO)); + list=pageInfo.getList(); + total=pageInfo.getTotal(); + }else{ + list=baseDao.pageListAnalysis(formDTO); + } if(CollectionUtils.isNotEmpty(list)){ //1、查询网格信息 List gridIds=list.stream().map(DemandRecResultDTO::getGridId).collect(Collectors.toList()); @@ -686,8 +693,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); + return new PageData<>(list, total); } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 2bd535800a..804ddac6d6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -246,7 +246,7 @@ and r.GRID_ID=#{orgId} - + AND r.GRID_PIDS LIKE concat(#{gridPids},'%') From d8d12db7986ea17c6e51166e82a81d9713c38912 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 10 Dec 2021 11:11:46 +0800 Subject: [PATCH 517/589] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=88=86=E6=9E=90=E3=80=91=E7=A0=94=E5=88=A4=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ProjectAnalysisFormDTO.java | 5 +- .../result/ProjectAnalysisResultDTO.java | 65 ++- .../result/ProjectCategoryResultDTO.java | 33 ++ .../result/ProjectCategoryTotalResultDTO.java | 2 + .../dao/epmetuser/IcResiUserDao.java | 49 ++ .../dao/epmetuser/UserBaseInfoDao.java | 6 + .../dataaggre/dao/govproject/ProjectDao.java | 11 + .../entity/epmetuser/IcResiUserEntity.java | 493 ++++++++++++++++++ .../service/epmetuser/EpmetUserService.java | 21 + .../epmetuser/impl/EpmetUserServiceImpl.java | 32 ++ .../impl/GovProjectServiceImpl.java | 91 +++- .../mapper/epmetuser/IcResiUserDao.xml | 39 ++ .../mapper/epmetuser/UserBaseInfoDao.xml | 11 + .../mapper/govproject/ProjectDao.xml | 37 ++ 14 files changed, 873 insertions(+), 22 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java index 1cf8e85373..d3d1a0e9a8 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java @@ -18,9 +18,6 @@ import java.util.List; @Data public class ProjectAnalysisFormDTO implements Serializable { private static final long serialVersionUID = -8515172319313536407L; - //日期yyyymmdd - @NotBlank(message = "日维度ID不能为空", groups = {Analysis.class}) - private String dateId; //小程序话题或事件发起人Id @NotBlank(message = "话题或事件发起人Id不能为空", groups = {Analysis.class}) private String userId; @@ -28,6 +25,8 @@ public class ProjectAnalysisFormDTO implements Serializable { @NotNull(message = "分类Code集合不能为空", groups = {Analysis.class}) private List categoryCodeList; + private String customerId; + public interface Analysis extends CustomerClientShowGroup { } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java index 62a949a3d2..2601c26a63 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java @@ -3,6 +3,8 @@ package com.epmet.dataaggre.dto.govproject.result; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @Description 赋能平台【项目处理分析】研判分析-接口返参 @@ -12,23 +14,50 @@ import java.io.Serializable; public class ProjectAnalysisResultDTO implements Serializable { private static final long serialVersionUID = 6188316867855643263L; - //组织Id - private String agencyId; - //日期yyyymmdd - private String dateId; - //项目总数 - private Integer projectTotal = 0; - //较昨日数 - private Integer dateIncr = 0; - //较上月数 - private Integer monthIncr = 0; - //未结案项目数 - private Integer pendingTotal = 0; - //为结案项目占比 xx% - private String pendingRatio = "0%"; - //已结案项目数 - private Integer closedTotal = 0; - //已结案项目占比 - private String closedRatio = "0%"; + //小程序居民Id + private String userId; + //负能平台居民Id + private String icUserId; + //负能平台居民名称 + private String icUserName; + //家庭里人员集合 + private List homeUserList = new ArrayList<>(); + //楼院小组下分类项目列表 + private List groupProjectList = new ArrayList<>(); + //事件上报下分类项目列表 + private List eventProjectList = new ArrayList<>(); + + @Data + public static class Home { + //家庭Id + private String homeId; + //居民Id + private String icUserId; + //居民姓名 + private String icUserName; + + } + + @Data + public static class Category { + //一级分类Id + private String categoryCode; + //一级分类名称 + private String categoryName; + //分类下项目列表【创建时间倒序】 + private List projectList = new ArrayList<>(); + + + } + + @Data + public static class Project { + //项目Id + private String projectId; + //项目标题 + private String title; + //状态:待处理 pending，结案closed + private String status; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java new file mode 100644 index 0000000000..f7846c3354 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author sun + * @dscription + */ +@NoArgsConstructor +@Data +public class ProjectCategoryResultDTO implements Serializable { + + private static final long serialVersionUID = 3217246702883400582L; + /** + * 项目ID + */ + private String projectId; + /** + * 项目标题 + */ + private String title; + /** + * 项目状态 + */ + private String status; + /** + * 二级分类Code + */ + private String categoryCode; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java index fabbad4ddf..c329d79cdf 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java @@ -18,6 +18,8 @@ public class ProjectCategoryTotalResultDTO implements Serializable { private String categoryCode; //一级分类名称 private String categoryName; + //一级分类颜色 + private String colour; //分类下项目总数 private Integer total = 0; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java new file mode 100644 index 0000000000..1e34921a43 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -0,0 +1,49 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dao.epmetuser; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; +import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; +import com.epmet.dto.IcResiUserDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户基础信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +@Mapper +public interface IcResiUserDao extends BaseDao { + + /** + * @Description 根据身份证号查询负能平台用户信息 + * @author sun + */ + IcResiUserDTO getIcResiUser(@Param("idCard") String idCard, @Param("customerId") String customerId); + + /** + * @Description 查询人员的家庭成员数据 + * @author sun + */ + List getHomeUserList(@Param("homeId") String homeId, @Param("icUserId") String icUserId); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java index 805657fc11..0ac5f211fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java @@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO; import com.epmet.dataaggre.entity.epmetuser.UserBaseInfoEntity; +import com.epmet.dto.UserBaseInfoDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -50,4 +51,9 @@ public interface UserBaseInfoDao extends BaseDao { */ List selectUserIdByCustomerId(@Param("userIds") List userIds); + /** + * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 + * @author sun + */ + List getUserBaseList(@Param("userId") String userId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 05071b61e5..ee44c3cee8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -27,6 +27,7 @@ import com.epmet.dataaggre.dto.govproject.form.CategoryProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.entity.govproject.ProjectEntity; +import com.epmet.dto.ProjectCategoryDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -104,4 +105,14 @@ public interface ProjectDao extends BaseDao { * @author sun */ List getTopicUser(@Param("projectIds") List projectIds); + + /** + * @Description 根据项目来源查询不同分类不同创建人下的分类项目 + * @author sun + */ + List getProjectCategoryList(@Param("customerId") String customerId, + @Param("secondCodeList") List secondCodeList, + @Param("userIds") List userIds, + @Param("origin") String origin); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java new file mode 100644 index 0000000000..e40441101d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java @@ -0,0 +1,493 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.entity.epmetuser; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户基础信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_user") +public class IcResiUserEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * + */ + private String agencyId; + + /** + * + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 是否本地户籍 + */ + private String isBdhj; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系人电话 + */ + private String contactsMobile; + + /** + * 九小场所url + */ + private String ninePlace; + + /** + * 是否党员 + */ + private String isParty; + + /** + * 是否低保户 + */ + private String isDbh; + + /** + * 是否保障房 + */ + private String isEnsureHouse; + + /** + * 是否失业 + */ + private String isUnemployed; + + /** + * 是否育龄妇女 + */ + private String isYlfn; + + /** + * 是否退役军人 + */ + private String isVeterans; + + /** + * 是否统战人员 + */ + private String isUnitedFront; + + /** + * 是否信访人员 + */ + private String isXfry; + + /** + * 是否志愿者 + */ + private String isVolunteer; + + /** + * 是否老年人 + */ + private String isOldPeople; + + /** + * 是否空巢 + */ + private String isKc; + + /** + * 是否失独 + */ + private String isSd; + + /** + * 是否失能 + */ + private String isSn; + + /** + * 是否失智 + */ + private String isSz; + + /** + * 是否残疾 + */ + private String isCj; + + /** + * 是否大病 + */ + private String isDb; + + /** + * 是否慢病 + */ + private String isMb; + + /** + * 是否特殊人群 + */ + private String isSpecial; + + /** + * 文化程度【字典表】 + */ + private String culture; + + /** + * 文化程度备注 + */ + private String cultureRemakes; + + /** + * 特长【字典表】 + */ + private String specialSkill; + + /** + * 兴趣爱好 + */ + private String hobby; + + /** + * 兴趣爱好备注 + */ + private String hobbyRemakes; + + /** + * 宗教信仰 + */ + private String faith; + + /** + * 宗教信仰备注 + */ + private String faithRemakes; + + /** + * 残疾类别【字典表】 + */ + private String cjlb; + + /** + * 残疾登记(状况)【字典表】 + */ + private String cjzk; + + /** + * 残疾证号 + */ + private String cjzh; + + /** + * 残疾说明 + */ + private String cjsm; + + /** + * 有无监护人【yes no】 + */ + private String ynJdr; + + /** + * 有无技能特长【yes no】 + */ + private String ynJntc; + + /** + * 有无劳动能力 + */ + private String ynLdnl; + + /** + * 有无非义务教育阶段助学【yes no】 + */ + private String ynFywjyjdzx; + + /** + * 所患大病 + */ + private String shdb; + + /** + * 患大病时间 + */ + private String dbsj; + + /** + * 所患慢性病 + */ + private String shmxb; + + /** + * 患慢性病时间 + */ + private String mxbsj; + + /** + * 是否参保 + */ + private String isCb; + + /** + * 自付金额 + */ + private String zfje; + + /** + * 救助金额 + */ + private String jzje; + + /** + * 救助时间[yyyy-MM-dd] + */ + private String jzsj; + + /** + * 享受救助明细序号 + */ + private String jzmxxh; + + /** + * 健康信息备注 + */ + private String healthRemakes; + + /** + * 工作单位 + */ + private String gzdw; + + /** + * 职业 + */ + private String zy; + + /** + * 离退休时间 + */ + private String ltxsj; + + /** + * 工作信息备注 + */ + private String workRemake; + + /** + * 退休金额 + */ + private String txje; + + /** + * 月收入 + */ + private String ysr; + + /** + * 籍贯 + */ + private String jg; + + /** + * 户籍所在地 + */ + private String hjszd; + + /** + * 现居住地 + */ + private String xjzd; + + /** + * 人户情况 + */ + private String rhzk; + + /** + * 居住信息备注 + */ + private String jzxxRemakes; + + /** + * 民族【字典表】 + */ + private String mz; + + /** + * 与户主关系【字典表】 + */ + private String yhzgx; + + /** + * 居住情况【字典表】 + */ + private String jzqk; + + /** + * 婚姻状况【字典表】 + */ + private String hyzk; + + /** + * 配偶情况【字典表】 + */ + private String poqk; + + /** + * 有无赡养人 + */ + private String ynSyr; + + /** + * 与赡养人关系【字典表】 + */ + private String ysyrgx; + + /** + * 赡养人电话 + */ + private String syrMobile; + + /** + * 家庭信息备注 + */ + private String jtxxRemakes; + + /** + * 预留字段1 + */ + private String field1; + + /** + * 预留字段2 + */ + private String field2; + + /** + * 预留字段3 + */ + private String field3; + + /** + * 预留字段4 + */ + private String field4; + + /** + * 预留字段5 + */ + private String field5; + + /** + * 预留字段6 + */ + private String field6; + + /** + * 预留字段7 + */ + private String field7; + + /** + * 预留字段8 + */ + private String field8; + + /** + * 预留字段9 + */ + private String field9; + + /** + * 预留字段10 + */ + private String field10; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 5f0a73ad1e..e9275ee09e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -7,6 +7,9 @@ import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.UserBaseInfoDTO; import java.util.List; @@ -148,4 +151,22 @@ public interface EpmetUserService { * @author sun */ StaffDetailV2FormDTO selectByStaffId(String staffId); + + /** + * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 + * @author sun + */ + List getUserBaseList(String userId); + + /** + * @Description 根据身份证号查询负能平台用户信息 + * @author sun + */ + IcResiUserDTO getIcResiUser(String idNum, String customerId); + + /** + * @Description 查询人员的家庭成员数据 + * @author sun + */ + List getHomeUserList(String homeId, String icUserId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 50221188f9..ac6ee4a24e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity; import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; @@ -36,6 +37,8 @@ import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.result.StaffRoleResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -79,6 +82,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { private DataStatsService dataStatsService; @Resource private GovStaffRoleDao govStaffRoleDao; + @Resource + private IcResiUserDao icResiUserDao; /** * @Description 根据UserIds查询 @@ -702,5 +707,32 @@ public class EpmetUserServiceImpl implements EpmetUserService { return result; } + /** + * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 + * @author sun + */ + @Override + public List getUserBaseList(String userId) { + return userBaseInfoDao.getUserBaseList(userId); + } + + /** + * @Description 根据身份证号查询负能平台用户信息 + * @author sun + */ + @Override + public IcResiUserDTO getIcResiUser(String idNum, String customerId) { + return icResiUserDao.getIcResiUser(idNum, customerId); + } + + /** + * @Description 查询人员的家庭成员数据 + * @author sun + */ + @Override + public List getHomeUserList(String homeId, String icUserId) { + return icResiUserDao.getHomeUserList(homeId, icUserId); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 21c18f8ba2..3aa1329a11 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -15,6 +15,7 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govissue.result.ShiftProjectIssueListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; @@ -23,11 +24,15 @@ import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; +import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govissue.GovIssueService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.resigroup.ResiGroupService; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.ProjectCategoryDTO; +import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.form.TimestampIntervalFormDTO; import com.epmet.dto.form.WorkMinuteFormDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -65,6 +70,8 @@ public class GovProjectServiceImpl implements GovProjectService { private DataStatsService dataStatsService; @Autowired private EvaluationIndexService evaluationIndexService; + @Autowired + private EpmetUserService epmetUserService; /** * @Description 查询项目信息 @@ -360,6 +367,7 @@ public class GovProjectServiceImpl implements GovProjectService { dto.setAgencyId(formDTO.getAgencyId()); dto.setCategoryCode(ca.getCategoryCode()); dto.setCategoryName(ca.getCategoryName()); + dto.setColour(ca.getColour()); list.forEach(l -> { if (ca.getCategoryCode().equals(l.getCategoryCode())) { dto.setTotal(l.getTotal()); @@ -450,7 +458,88 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO) { - return null; + ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO(); + //1.查询userId的身份证号在小程序用户中存在的多个userId值 + List userList = epmetUserService.getUserBaseList(formDTO.getUserId()); + List userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList()); + + //2.查询对应负能平台用户家庭信息 + if (!org.springframework.util.CollectionUtils.isEmpty(userList)) { + //2-1.根据身份证号查询负能平台用户信息 + IcResiUserDTO icResiUserDTO = epmetUserService.getIcResiUser(userList.get(0).getIdNum(), formDTO.getCustomerId()); + resultDTO.setIcUserId(icResiUserDTO.getId()); + resultDTO.setIcUserName(icResiUserDTO.getName()); + if (null != icResiUserDTO) { + //2-2.查询人员的家庭成员数据 + List homeList = epmetUserService.getHomeUserList(icResiUserDTO.getHomeId(), icResiUserDTO.getId()); + resultDTO.setHomeUserList(homeList); + } + } + if (org.springframework.util.CollectionUtils.isEmpty(userIds)) { + userIds = new ArrayList<>(); + userIds.add(formDTO.getUserId()); + } + + //3.查询一级分类数据 + List categoryList = govIssueService.categoryList(formDTO.getCustomerId(), null, null); + List secondCodeList = formDTO.getCategoryCodeList().stream().flatMap(code -> categoryList.stream().filter(ca -> code.equals(ca.getParentCategoryCode())).map(second -> { + return second.getCategoryCode(); + })).collect(Collectors.toList()); + + //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "issue"); + + //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 + List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); + + //6.封装数据 + //楼院小组下分类项目列表 + List groupProjectList = new ArrayList<>(); + //事件上报下分类项目列表 + List eventProjectList = new ArrayList<>(); + formDTO.getCategoryCodeList().forEach(code -> { + //一级分类code下的二级分类code集合 + Map secondCodeMap = new HashMap<>(); + //来源楼院小组的分类及项目列表 + ProjectAnalysisResultDTO.Category groupCa = new ProjectAnalysisResultDTO.Category(); + List groupPrList = new ArrayList<>(); + //来源事件上报的分类及项目列表 + ProjectAnalysisResultDTO.Category eventCa = new ProjectAnalysisResultDTO.Category(); + List eventPrList = new ArrayList<>(); + categoryList.forEach(ca -> { + groupCa.setCategoryCode(code); + eventCa.setCategoryCode(code); + if (code.equals(ca.getCategoryCode())) { + groupCa.setCategoryName(ca.getCategoryName()); + eventCa.setCategoryName(ca.getCategoryName()); + } + if (code.equals(ca.getParentCategoryCode())) { + secondCodeMap.put(ca.getCategoryCode(), ca.getCategoryCode()); + } + }); + //当前分类下来源楼院小组的项目 + groupList.forEach(gr -> { + if (secondCodeMap.containsKey(gr.getCategoryCode())) { + ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); + groupPrList.add(project); + } + }); + groupCa.setProjectList(groupPrList); + groupProjectList.add(groupCa); + //当前分类下来源事件上报的项目 + eventList.forEach(gr -> { + if (secondCodeMap.containsKey(gr.getCategoryCode())) { + ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); + eventPrList.add(project); + } + }); + eventCa.setProjectList(eventPrList); + eventProjectList.add(eventCa); + }); + + resultDTO.setGroupProjectList(groupProjectList); + resultDTO.setEventProjectList(eventProjectList); + return resultDTO; } /** 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 new file mode 100644 index 0000000000..c28d81375c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 1ce45a28d8..195e586292 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -38,4 +38,15 @@ ) + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index cec83dea7f..ceea242e1f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -256,4 +256,41 @@ p.ORIGIN_ID = #{issueId} + + + \ No newline at end of file From 8a0f40a238773e33f1bc91c61f5b391833a47a39 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Dec 2021 11:32:54 +0800 Subject: [PATCH 518/589] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/demand/DemandRecExcelResultDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java index eaf3bdee36..15f02110b4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java @@ -30,7 +30,7 @@ public class DemandRecExcelResultDTO implements Serializable { @Excel(name = "上报人", width = 20) private String reportUserName; - @Excel(name = "上报时间", width = 25) + @Excel(name = "上报时间", width = 25,format ="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date reportTime; @@ -46,7 +46,7 @@ public class DemandRecExcelResultDTO implements Serializable { @Excel(name = "服务方", width = 15) private String serviceShowName; - @Excel(name = "服务时间", width = 25) + @Excel(name = "服务时间", width = 25,format ="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date wantServiceTime; } From 46ce977e7343d900551aaaffaf9d0378c1383266 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 14:06:07 +0800 Subject: [PATCH 519/589] emm --- .../dto/result/CategoryListResultDTO.java | 9 +++++++ .../mapper/IssueProjectCategoryDictDao.xml | 3 ++- .../main/java/com/epmet/dao/ProjectDao.java | 11 +++++++++ .../service/impl/ProjectServiceImpl.java | 24 ++++++++++++++++++- .../src/main/resources/mapper/ProjectDao.xml | 14 +++++++++++ 5 files changed, 59 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java index ae61ba1769..8f719ff94c 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java @@ -27,6 +27,14 @@ public class CategoryListResultDTO implements Serializable { private Integer count; + /** + * 颜色 + */ + private String colour; + + /** + * 1级分类长度 + */ private Integer codeLength; public CategoryListResultDTO() { @@ -34,5 +42,6 @@ public class CategoryListResultDTO implements Serializable { this.categoryName = ""; this.count = NumConstant.ZERO; this.codeLength = NumConstant.ZERO; + this.colour = ""; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 6c5d46eedd..7730d467f4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -250,7 +250,8 @@ SELECT CATEGORY_CODE, CATEGORY_NAME, - LENGTH(CATEGORY_CODE) AS codeLength + LENGTH(CATEGORY_CODE) AS codeLength, + IFNULL(colour,'') AS colour FROM issue_project_category_dict WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index ec003c035b..d0d71cab98 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -256,4 +256,15 @@ public interface ProjectDao extends BaseDao { @Param("categoryCode")String categoryCode, @Param("excludeProjectId") String excludeProjectId, @Param("epmetUserIds")List epmetUserIds); + + /** + * @Description 查询组织下的项目数 + * @param orgIds + * @param startDate + * @param endDate + * @author zxc + * @date 2021/12/10 10:31 上午 + */ + List selectProjectCountByOrg(@Param("orgIds")List orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index ad06a13462..59e08ee55a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2861,7 +2861,14 @@ public class ProjectServiceImpl extends BaseServiceImpl orgList = new ArrayList<>(); if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){ - + Result> sonAgencyIdResult = govOrgOpenFeignClient.getSonAgencyId(formDTO.getOrgId()); + if (!sonAgencyIdResult.success()){ + throw new EpmetException(String.format("查询组织{%s}的下级组织失败...",formDTO.getOrgId())); + } + List agencyIds = sonAgencyIdResult.getData(); + if (CollectionUtils.isNotEmpty(agencyIds)){ + orgList = baseDao.selectProjectCountByOrg(agencyIds,formDTO.getStartDate(),formDTO.getEndDate()); + } }else { Result> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO); if (!projectCountByGrid.success()){ @@ -2871,6 +2878,21 @@ public class ProjectServiceImpl extends BaseServiceImpl allCount = orgList.stream().map(m -> m.getCount()).collect(Collectors.toList()); + Integer max = Collections.max(allCount); + Integer min = Collections.min(allCount); + if (orgList.size() == NumConstant.ONE || max.compareTo(min) == NumConstant.ZERO){ + result.setUnder(orgList.get(NumConstant.ZERO).getCount().toString()); + return result; + } + Integer minRange = min + ((max - min) / NumConstant.THREE); + Integer maxRange = min + ((max - min) * NumConstant.TWO / NumConstant.THREE); + result.setUnder(minRange.toString().concat("以下")); + result.setMiddle(minRange.toString().concat("-").concat(maxRange.toString())); + result.setAbove(maxRange.toString().concat("以上")); return result; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 5f2a063bab..83332f7dfb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -469,4 +469,18 @@ ORDER BY p.CREATED_TIME DESC + + + \ No newline at end of file From e6225bc0eb755c28fcb191f550a1ef071962973f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 14:23:05 +0800 Subject: [PATCH 520/589] sql --- .../db/migration/V0.0.15__add_colour.sql | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql new file mode 100644 index 0000000000..81473802f7 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql @@ -0,0 +1,88 @@ +alter table issue_project_category_dict add column `COLOUR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`; + + + +UPDATE issue_project_category_dict +SET colour = '#ffba00' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '市场监管'; + +UPDATE issue_project_category_dict +SET colour = '#ffd074' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '卫生计生监督执法'; + +UPDATE issue_project_category_dict +SET colour = '#42cd05' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '建设管理'; + +UPDATE issue_project_category_dict +SET colour = '#16d783' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '文化执法'; + +UPDATE issue_project_category_dict +SET colour = '#00e5ed' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '民政'; + +UPDATE issue_project_category_dict +SET colour = '#0091ed' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '其他'; + +UPDATE issue_project_category_dict +SET colour = '#1b51ff' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '城市管理'; + +UPDATE issue_project_category_dict +SET colour = '#1641cc' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '公安交通管理'; + +UPDATE issue_project_category_dict +SET colour = '#2a00ff' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '消防安全'; + +UPDATE issue_project_category_dict +SET colour = '#7800ff' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '创卫复审类'; + +UPDATE issue_project_category_dict +SET colour = '#c600ff' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '环境保护'; + +UPDATE issue_project_category_dict +SET colour = '#ff00d2' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '安全监管'; + +UPDATE issue_project_category_dict +SET colour = '#ff2a00' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '社会治安综治'; + +UPDATE issue_project_category_dict +SET colour = '#ff7800' +WHERE DEL_FLAG = '0' + AND CATEGORY_TYPE = '1' + AND CATEGORY_NAME = '食品药品监管'; + From a04c7a2993c81d39481059a6fb4efbdeb2084b7b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 14:51:29 +0800 Subject: [PATCH 521/589] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java | 8 ++++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 2 +- .../java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../src/main/resources/mapper/IssueDao.xml | 7 ++++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java index e954770cab..7349b7967b 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -33,4 +34,11 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable { * 颜色 */ private String colour; + + public ResiBuzzLeftPieChartResultDTO() { + this.count = NumConstant.ZERO; + this.categoryCode = ""; + this.categoryName = ""; + this.colour = ""; + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index f7ef6c86f5..d81143c74c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -252,7 +252,7 @@ public interface IssueDao extends BaseDao { * @author zxc * @date 2021/12/9 10:57 上午 */ - List resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length); + List resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length,@Param("customerId")String customerId); /** * @Description 查询组织下每个网格的项目数 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index e77be90639..3111b567b0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1631,7 +1631,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); } Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); - List result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length); + List result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId()); if(CollectionUtils.isEmpty(result)){ return new ArrayList<>(); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 646fdd33e0..827f52b774 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -620,15 +620,16 @@ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index ceea242e1f..29ccb588ad 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -158,11 +158,11 @@ SELECT project_id projectId, - category_pids categoryPids, + substring_index(category_pids, ',', 1) categoryPids, category_code categoryCode FROM project_category From 60c455b39a7080c83b54c02205dadf3467d97298 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 10 Dec 2021 15:49:55 +0800 Subject: [PATCH 523/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=E6=8E=AA=E6=96=BD=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/DemandServiceCountResultDTO.java | 15 ++ .../epmet/controller/DemandController.java | 38 ++++ .../dao/heart/IcUserDemandServiceDao.java | 44 +++++ .../com/epmet/dao/heart/VolunteerInfoDao.java | 33 ++++ .../stats/FactVolunteerServiceDailyDao.java | 42 ++++ .../main/java/com/epmet/dao/user/UserDao.java | 2 + .../heart/IcUserDemandServiceEntity.java | 75 +++++++ .../entity/heart/VolunteerInfoEntity.java | 71 +++++++ .../FactVolunteerServiceDailyEntity.java | 86 ++++++++ .../java/com/epmet/service/DemandService.java | 20 ++ .../service/heart/HeartDemandService.java | 15 ++ .../service/heart/HeartVolunteerService.java | 15 ++ .../heart/impl/HeartDemandServiceImpl.java | 40 ++++ .../heart/impl/HeartVolunteerServiceImpl.java | 40 ++++ .../epmet/service/impl/DemandServiceImpl.java | 184 ++++++++++++++++++ .../service/stats/DemandStatsService.java | 18 ++ .../stats/impl/DemandStatsServiceImpl.java | 36 ++++ .../com/epmet/service/user/UserService.java | 2 + .../service/user/impl/UserServiceImpl.java | 4 + ...0.0.26__create_volunteer_service_daily.sql | 21 ++ .../mapper/heart/IcUserDemandServiceDao.xml | 33 ++++ .../mapper/heart/VolunteerInfoDao.xml | 23 +++ .../stats/FactVolunteerServiceDailyDao.xml | 37 ++++ .../main/resources/mapper/user/UserDao.xml | 13 ++ 24 files changed, 907 insertions(+) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java new file mode 100644 index 0000000000..57cc894ae4 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.heart.result; + +import lombok.Data; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/12/8 4:39 下午 + * @Version 1.0 + */ +@Data +public class DemandServiceCountResultDTO { + private String serverId; + private String serviceType; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java new file mode 100644 index 0000000000..cd77d2b25a --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java @@ -0,0 +1,38 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.DemandService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/12/8 10:44 上午 + * @Version 1.0 + */ +@RestController +@RequestMapping("demand") +public class DemandController { + + @Autowired + private DemandService demandStatsService; + + /** + * wangxianzhang + * + * 计算客户下志愿者服务相关数据 + * + * @param customerId 客户ID，可以为空，为空则计算所有客户 + * @return + */ + @PostMapping("volunteer/daily") + public Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId) { + + demandStatsService.statsVolunteerDemandServicesDaily(customerId); + + return new Result(); + } + + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java new file mode 100644 index 0000000000..602c04da5e --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java @@ -0,0 +1,44 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.heart; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.heart.result.DemandServiceCountResultDTO; +import com.epmet.entity.heart.IcUserDemandServiceEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +/** + * 居民需求服务记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-11-19 + */ +@Mapper +public interface IcUserDemandServiceDao extends BaseDao { + + /** + * 需求服务次数查询 + * @param customerId 客户id + * @param serviceType 服务者类型 + */ + List listDemandServiceCountPage(@Param("customerId") String customerId, @Param("endTime") Date endTime, @Param("serviceType") String serviceType); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java new file mode 100644 index 0000000000..11b5aad534 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.heart; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.heart.VolunteerInfoEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 志愿者信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-12-08 + */ +@Mapper +public interface VolunteerInfoDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java new file mode 100644 index 0000000000..605364c820 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java @@ -0,0 +1,42 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.stats; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.stats.FactVolunteerServiceDailyEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 志愿者服务情况统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-12-08 + */ +@Mapper +public interface FactVolunteerServiceDailyDao extends BaseDao { + + /** + * 删除指定客户，指定dateId的志愿者服务统计记录 + * @param customerIds + * @param dateDimId + */ + void clearVolunteerDemandServiceDailyStats(@Param("customerIds") List customerIds, @Param("dateDimId") String dateDimId); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java index 2c8f46ea9b..584bfdf64c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java @@ -264,5 +264,7 @@ public interface UserDao { List getPatrolRecordList(MidPatrolFormDTO formDTO); List getPatrolDetailList(MidPatrolFormDTO formDTO); + + List filterUserIds(@Param("userIds") List userIds, @Param("roleKey") String roleKey); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java new file mode 100644 index 0000000000..002b1db875 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java @@ -0,0 +1,75 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.heart; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 居民需求服务记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-11-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_user_demand_service") +public class IcUserDemandServiceEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 需求id + */ + private String demandRecId; + + /** + * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； + */ + private String serviceType; + + /** + * 志愿者：居民端爱心互助的志愿者userId； + */ + private String serverId; + + /** + * 实际服务开始时间 + */ + private Date serviceStartTime; + + /** + * 实际服务结束时间 + */ + private Date serviceEndTime; + + /** + * 完成情况 + */ + private String finishDesc; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java new file mode 100644 index 0000000000..60f41bd0fa --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java @@ -0,0 +1,71 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.heart; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 志愿者信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-12-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("volunteer_info") +public class VolunteerInfoEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private String userId; + + /** + * 客户id + */ + private String customerId; + + /** + * 志愿者自我介绍 + */ + private String volunteerIntroduce; + + /** + * 志愿者签名 + */ + private String volunteerSignature; + + /** + * 网格id + */ + private String gridId; + + /** + * 网格名称 + */ + private String gridName; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java new file mode 100644 index 0000000000..f2b473bfe9 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.stats; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 志愿者服务情况统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-12-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("fact_volunteer_service_daily") +public class FactVolunteerServiceDailyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * yyyyMMdd + */ + private String dateId; + + /** + * yyyyMM + */ + private String monthId; + + /** + * 截止到当前dateId，当前客户下，共有多少个爱心互助的志愿者 + */ + private Integer volunteerTotal; + + /** + * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，党员有多少个 + */ + private Integer partyTotal; + + /** + * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，居民有多少个 + */ + private Integer resiTotal; + + /** + * 服务总次数 + */ + private Integer serviceTotal; + + /** + * 党员服务总次数 + */ + private Integer partyServiceTotal; + + /** + * 居民服务总次数 + */ + private Integer resiServiceTotal; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java new file mode 100644 index 0000000000..a5baf1a613 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java @@ -0,0 +1,20 @@ +package com.epmet.service; + +/** + * @Description 需求service + * @Author wangxianzhang + * @Date 2021/12/8 12:14 下午 + * @Version 1.0 + */ +public interface DemandService { + + /** + * wangxianzhang + * + * 按日统计 + * + * @param customerId 客户ID，可为空，为空计算所有 + */ + void statsVolunteerDemandServicesDaily(String customerId); + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java new file mode 100644 index 0000000000..1a106fa881 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java @@ -0,0 +1,15 @@ +package com.epmet.service.heart; + +import com.epmet.dto.heart.result.DemandServiceCountResultDTO; + +import java.util.Date; +import java.util.List; + +/** + *@Description 爱心互助，需求service + *@Author wangxianzhang + *@Date 2021/12/8 + */ +public interface HeartDemandService { + List listDemandServiceCountPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java new file mode 100644 index 0000000000..abccaae1e6 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java @@ -0,0 +1,15 @@ +package com.epmet.service.heart; + +import com.epmet.entity.heart.VolunteerInfoEntity; + +import java.util.Date; +import java.util.List; + +/** + *@Description heart 志愿者service + *@Author wangxianzhang + *@Date 2021/12/8 + */ +public interface HeartVolunteerService { + List listVolunteersPage(String customerId, Date endCreateTime, Integer pageNum, Integer pageSize); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java new file mode 100644 index 0000000000..a4192fcd30 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java @@ -0,0 +1,40 @@ +package com.epmet.service.heart.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.heart.IcUserDemandServiceDao; +import com.epmet.dto.heart.result.DemandServiceCountResultDTO; +import com.epmet.service.heart.HeartDemandService; +import com.github.pagehelper.ISelect; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description 爱心互助，需求service + * @Author wangxianzhang + * @Date 2021/12/8 12:33 下午 + * @Version 1.0 + */ +@Service +@DataSource(DataSourceConstant.EPMET_HEART) +public class HeartDemandServiceImpl implements HeartDemandService { + + @Autowired + private IcUserDemandServiceDao demandServiceDao; + + @Override + public List listDemandServiceCountPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize) { + return PageHelper.startPage(serviceCountPageNo, serviceCountPageSize).doSelectPage(new ISelect() { + @Override + public void doSelect() { + demandServiceDao.listDemandServiceCountPage(customerId, endTime, "volunteer"); + } + }); + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java new file mode 100644 index 0000000000..c95fd094fe --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java @@ -0,0 +1,40 @@ +package com.epmet.service.heart.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.heart.VolunteerInfoDao; +import com.epmet.entity.heart.VolunteerInfoEntity; +import com.epmet.service.heart.HeartVolunteerService; +import com.github.pagehelper.ISelect; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/12/8 1:35 下午 + * @Version 1.0 + */ +@Service +@DataSource(DataSourceConstant.EPMET_HEART) +public class HeartVolunteerServiceImpl implements HeartVolunteerService { + + @Autowired + private VolunteerInfoDao volunteerInfoDao; + + @Override + public List listVolunteersPage(String customerId, Date endCreateTime, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPage(() -> { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(VolunteerInfoEntity::getCustomerId, customerId); + query.lt(VolunteerInfoEntity::getCreatedTime, endCreateTime); + volunteerInfoDao.selectList(query); + }); + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java new file mode 100644 index 0000000000..7782226923 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java @@ -0,0 +1,184 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.dto.heart.result.DemandServiceCountResultDTO; +import com.epmet.entity.crm.CustomerEntity; +import com.epmet.entity.heart.VolunteerInfoEntity; +import com.epmet.entity.stats.FactVolunteerServiceDailyEntity; +import com.epmet.service.DemandService; +import com.epmet.service.crm.CustomerService; +import com.epmet.service.heart.HeartDemandService; +import com.epmet.service.heart.HeartVolunteerService; +import com.epmet.service.stats.DemandStatsService; +import com.epmet.service.user.UserService; +import com.epmet.util.DimIdGenerator; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description 需求service + * @Author wangxianzhang + * @Date 2021/12/8 12:14 下午 + * @Version 1.0 + */ +@Service +public class DemandServiceImpl implements DemandService { + + @Autowired + private HeartDemandService heartDemandService; + + @Autowired + private HeartVolunteerService heartVolunteerService; + + @Autowired + private UserService userService; + + @Autowired + private DemandStatsService demandStatsService; + + @Autowired + private CustomerService customerService; + + @Override + public void statsVolunteerDemandServicesDaily(String customerId) { + + Date now = new Date(); + Date today = DateUtils.integrate(now, "yyyy-MM-dd"); + Date yestoday = DateUtils.addDateDays(today, -1); + + if (StringUtils.isNotBlank(customerId)) { + // 只计算单个客户 + clearOldDatas(Arrays.asList(customerId), yestoday); + statsVolunteerDemandServicesDaily4Customer(customerId, today, yestoday); + } else { + // 查询所有客户ID + List customerIds = customerService.listValidCustomersByCreateTime(null, null).stream().map(c -> c.getId()).collect(Collectors.toList()); + clearOldDatas(customerIds, yestoday); + customerIds.stream().forEach(cId -> { + statsVolunteerDemandServicesDaily4Customer(cId, today, yestoday); + }); + } + } + + /** + * 清理旧数据 + * @param yestoday + */ + private void clearOldDatas(List customerIds, Date yestoday) { + + String dateDimId = DimIdGenerator.getDateDimId(yestoday); + + demandStatsService.clearVolunteerDemandServiceDailyStats(customerIds, dateDimId); + + } + + /** + * 统计单个客户的志愿者服务情况 + * @param customerId 客户ID + * @param endTime 统计截止时间( partymemberVolunteerUserIds = new ArrayList<>(16); + + int pageNum = 1; + int volunteerPageSize = 5; + + while (true) { + + int shardingStartIndex = 0; + int shardingSize = 2; + + List volunteersPage = heartVolunteerService.listVolunteersPage(customerId, endTime, pageNum, volunteerPageSize); + + // 如果查询结果为0，说明没有更多的志愿者了 + if (volunteersPage.size() == 0) { + break; + } + + volunteerTotalCount += volunteersPage.size(); + + // 分片去确定党员身份 + while (true) { + int realShardingSize = Math.min(shardingSize, volunteersPage.size() - shardingStartIndex); + + if (realShardingSize == 0) { + break; + } + + int shardingEndIndex = shardingStartIndex + realShardingSize; + List volunteerUserIds = volunteersPage.subList(shardingStartIndex, shardingEndIndex) + .stream() + .map((volunteerInfoEntity) -> volunteerInfoEntity.getUserId()) + .collect(Collectors.toList()); + + List tempPartymemberUserIds = userService.filterUserIds(volunteerUserIds, EpmetRoleKeyConstant.PARTYMEMBER); + + partymemberVolunteerUserIds.addAll(tempPartymemberUserIds); + + shardingStartIndex = shardingEndIndex; + } + + pageNum++; + } + + partymemberVolunteerCount += partymemberVolunteerUserIds.size(); + resiVolunteerCount = volunteerTotalCount - partymemberVolunteerCount; + + //2. 查询志愿者服务次数 + + // 总服务次数 + int totalDemandServiceCount = 0; + // 党员服务次数 + int partymemberDemandServiceCount = 0; + // 居民服务次数 + int resiDemandServiceCount = 0; + + int serviceCountPageNo = 0; + int serviceCountPageSize = 1000; + while (true) { + + List damendServiceCounts = heartDemandService.listDemandServiceCountPage(customerId, endTime, serviceCountPageNo, serviceCountPageSize); + + for (DemandServiceCountResultDTO damendServiceCount : damendServiceCounts) { + String serverId = damendServiceCount.getServerId(); + if (partymemberVolunteerUserIds.contains(serverId)) { + partymemberDemandServiceCount++; + } else { + resiDemandServiceCount++; + } + } + + totalDemandServiceCount += damendServiceCounts.size(); + + if (damendServiceCounts.size() <= serviceCountPageSize) { + break; + } + } + + // 3.持久化 + FactVolunteerServiceDailyEntity insert = new FactVolunteerServiceDailyEntity(); + insert.setDateId(DimIdGenerator.getDateDimId(belongTime)); + insert.setCustomerId(customerId); + insert.setMonthId(DimIdGenerator.getMonthDimId(belongTime)); + insert.setPartyServiceTotal(partymemberDemandServiceCount); + insert.setServiceTotal(totalDemandServiceCount); + insert.setPartyTotal(partymemberVolunteerCount); + insert.setResiServiceTotal(resiDemandServiceCount); + insert.setResiTotal(resiVolunteerCount); + insert.setVolunteerTotal(volunteerTotalCount); + + demandStatsService.addVolunteerServiceDaily(insert); + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java new file mode 100644 index 0000000000..dec4ed26ef --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java @@ -0,0 +1,18 @@ +package com.epmet.service.stats; + +import com.epmet.entity.stats.FactVolunteerServiceDailyEntity; + +import java.util.List; + +/** + *@Description 统计客户下的志愿者需求服务数据 + *@Author wangxianzhang + *@Date 2021/12/8 + */ +public interface DemandStatsService { + + + void addVolunteerServiceDaily(FactVolunteerServiceDailyEntity entity); + + void clearVolunteerDemandServiceDailyStats(List customerIds, String dateDimId); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java new file mode 100644 index 0000000000..54a8525877 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java @@ -0,0 +1,36 @@ +package com.epmet.service.stats.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.stats.FactVolunteerServiceDailyDao; +import com.epmet.entity.stats.FactVolunteerServiceDailyEntity; +import com.epmet.service.stats.DemandStatsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/12/8 10:54 上午 + * @Version 1.0 + */ +@Service +@DataSource(DataSourceConstant.STATS) +public class DemandStatsServiceImpl implements DemandStatsService { + + @Autowired + private FactVolunteerServiceDailyDao factVolunteerServiceDailyDao; + + @Override + public void addVolunteerServiceDaily(FactVolunteerServiceDailyEntity entity) { + factVolunteerServiceDailyDao.insert(entity); + } + + @Override + public void clearVolunteerDemandServiceDailyStats(List customerIds, String dateDimId) { + factVolunteerServiceDailyDao.clearVolunteerDemandServiceDailyStats(customerIds, dateDimId); + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java index ffa464d4fa..1d0a500b0a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java @@ -146,4 +146,6 @@ public interface UserService { List getPatrolRecordList(MidPatrolFormDTO formDTO); List getPatrolDetailList(MidPatrolFormDTO formDTO); + + List filterUserIds(List userIds, String roleKey); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java index a8bf95d7f0..a2d56125a6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java @@ -1109,4 +1109,8 @@ public class UserServiceImpl implements UserService { return userDao.getPatrolDetailList(formDTO); } + @Override + public List filterUserIds(List userIds, String roleKey) { + return userDao.filterUserIds(userIds, roleKey); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql new file mode 100644 index 0000000000..7eade2a679 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql @@ -0,0 +1,21 @@ +CREATE TABLE epmet_data_statistical.`fact_volunteer_service_daily` +( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `DATE_ID` varchar(8) NOT NULL COMMENT 'yyyyMMdd', + `MONTH_ID` varchar(6) NOT NULL COMMENT 'yyyyMM', + `VOLUNTEER_TOTAL` int(11) NOT NULL COMMENT '截止到当前dateId，当前客户下，共有多少个爱心互助的志愿者', + `PARTY_TOTAL` int(11) NOT NULL COMMENT '截止到当前dateId，当前客户下，XX个爱心互助志愿者中，党员有多少个', + `RESI_TOTAL` int(11) NOT NULL COMMENT '截止到当前dateId，当前客户下，XX个爱心互助志愿者中，居民有多少个', + `SERVICE_TOTAL` int(11) NOT NULL COMMENT '服务总次数', + `PARTY_SERVICE_TOTAL` int(11) NOT NULL COMMENT '党员服务总次数', + `RESI_SERVICE_TOTAL` int(11) NOT NULL COMMENT '居民服务总次数', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + UNIQUE KEY `uni_vsd` (`CUSTOMER_ID`,`DATE_ID`,`DEL_FLAG`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='志愿者服务情况统计' \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml new file mode 100644 index 0000000000..1c13f56e87 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml new file mode 100644 index 0000000000..a426712a22 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml new file mode 100644 index 0000000000..59dfd96c12 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + delete + from fact_volunteer_service_daily + where DATE_ID=#{dateDimId} + and CUSTOMER_ID in + + #{customerId} + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index 4715f23c2a..6542440fb8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -1052,5 +1052,18 @@ order by created_time LIMIT #{offset},#{pageSize} + + + From 48e64d6161cdc6886780d8aefccac6d1909eff02 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 15:55:26 +0800 Subject: [PATCH 524/589] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/ResiBuzzDTO.java | 13 ++++++-- .../result/ResiBuzzLeftPieChartResultDTO.java | 2 ++ .../src/main/java/com/epmet/dao/IssueDao.java | 2 +- .../epmet/service/impl/IssueServiceImpl.java | 3 +- .../src/main/resources/mapper/IssueDao.xml | 33 ++++++++++++++----- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java index 72da12a996..c2c0960c0a 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @Author zxc @@ -72,7 +74,7 @@ public class ResiBuzzDTO implements Serializable { /** * 分类名字 */ - private String categoryName; + private List categoryName; public ResiBuzzDTO() { this.createdBy = ""; @@ -86,6 +88,13 @@ public class ResiBuzzDTO implements Serializable { this.oppositionCount = NumConstant.ZERO; this.voteAccount = ""; this.issueOriginator = ""; - this.categoryName = "其他"; + this.categoryName = getDefaultCategoryName(); + } + + @JsonIgnore + public List getDefaultCategoryName(){ + List list = new ArrayList<>(); + list.add("其他"); + return list; } } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java index 7349b7967b..c55641f333 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result; import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -23,6 +24,7 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable { /** * 分类编码 */ + @JsonIgnore private String categoryCode; /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index d81143c74c..a853364839 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -234,7 +234,7 @@ public interface IssueDao extends BaseDao { * @author zxc * @date 2021/12/8 4:08 下午 */ - List selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status); + List selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status,@Param("length")Integer length); /** * @Description 查询客户下1级分类的长度 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 3111b567b0..4e7a09fd26 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1586,7 +1586,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus())); + Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length)); List list = pageInfo.getList(); if (CollectionUtils.isEmpty(list)){ return new ResiBuzzResultDTO(); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 827f52b774..8a81f0ab47 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -579,22 +579,39 @@ - SELECT i.ID AS issueId, - i.ISSUE_TITLE, - i.SUGGESTION, - i.CREATED_BY, + i.ISSUE_TITLE AS issueTitle, + i.SUGGESTION AS suggestion, + i.CREATED_BY AS createdBy, (CASE WHEN i.ISSUE_STATUS = 'shift_project' THEN '已转项目' WHEN i.ISSUE_STATUS = 'voting' THEN '表决中' WHEN i.ISSUE_STATUS = 'closed' THEN '已关闭' ELSE '表决中' END ) AS `status`, - i.CREATED_TIME, - s.SUPPORT_COUNT, - s.OPPOSITION_COUNT, - CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount + i.CREATED_TIME AS createdTime, + s.SUPPORT_COUNT AS supportCount, + s.OPPOSITION_COUNT AS oppositionCount, + CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount, + cd.CATEGORY_NAME as cn FROM issue i LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0') + LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID) + LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID) WHERE i.DEL_FLAG = '0' AND i.ISSUE_STATUS = #{status} From 200d2849c8c1c537cb5b3a3db5ad5b3c99f50081 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 16:34:56 +0800 Subject: [PATCH 525/589] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 59e08ee55a..22cceba501 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2878,9 +2878,10 @@ public class ProjectServiceImpl extends BaseServiceImpl allCount = orgList.stream().map(m -> m.getCount()).collect(Collectors.toList()); Integer max = Collections.max(allCount); Integer min = Collections.min(allCount); From e331619802ffbbe7339a25c6456b229006a02e4f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 16:46:54 +0800 Subject: [PATCH 526/589] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/issue/IssueProjectCategoryDictDTO.java | 5 +++++ .../epmet/entity/issue/IssueProjectCategoryDictEntity.java | 5 +++++ .../main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java | 5 +++++ .../com/epmet/entity/IssueProjectCategoryDictEntity.java | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java index c07037ee92..d99c772f8b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java @@ -113,4 +113,9 @@ public class IssueProjectCategoryDictDTO implements Serializable { */ private Date updatedTime; + /** + * 颜色 + */ + private String colour; + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java index 67c82fee00..a029bb6f00 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java @@ -80,4 +80,9 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { */ private String isDisable; + /** + * 颜色 + */ + private String colour; + } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java index a93a616cbf..83920372a1 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java @@ -113,4 +113,9 @@ public class IssueProjectCategoryDictDTO implements Serializable { */ private Date updatedTime; + /** + * 颜色 + */ + private String colour; + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java index b99f37a2bf..7481f4f4ed 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java @@ -83,4 +83,9 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { */ private String isDisable; + /** + * 颜色 + */ + private String colour; + } From 2536b86b3ff29982a18ab5f4b9fd04e3308449d9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 10 Dec 2021 17:12:37 +0800 Subject: [PATCH 527/589] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDistributionAnalysisRightResultDTO.java | 13 ++++--------- .../com/epmet/service/impl/ProjectServiceImpl.java | 11 ++++------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java index 5b52084e9d..fb56a9f178 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java @@ -19,23 +19,18 @@ public class ProjectDistributionAnalysisRightResultDTO implements Serializable { /** * ..以上 */ - private String under; + private Integer under; - /** - * 中间区间 - */ - private String middle; /** * ..以下 */ - private String above; + private Integer above; private List list; public ProjectDistributionAnalysisRightResultDTO() { - this.under = ""; - this.middle = ""; - this.above = ""; + this.under = null; + this.above = null; this.list = new ArrayList<>(); } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 22cceba501..13b710ec7f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2830,7 +2830,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Fri, 10 Dec 2021 18:02:44 +0800 Subject: [PATCH 528/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 3 +- .../service/impl/IcPartyUnitServiceImpl.java | 10 +- .../dto/form/PartyMemberListFormDTO.java | 24 ++++ .../form/PartyMemberStatisticsFormDTO.java | 20 +++ .../dto/result/PartyMemberAgeResultDTO.java | 19 +++ .../result/PartyMemberEducationResultDTO.java | 19 +++ .../controller/IcResiUserController.java | 53 ++++++++ .../java/com/epmet/dao/IcResiUserDao.java | 47 +++++++ .../com/epmet/service/IcResiUserService.java | 37 +++++ .../service/impl/IcResiUserServiceImpl.java | 117 ++++++++++++++-- .../main/resources/mapper/IcResiUserDao.xml | 128 ++++++++++++++++++ 11 files changed, 467 insertions(+), 10 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 478e7d4376..e1fa6b1456 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -18,7 +18,8 @@ public enum DictTypeEnum { GENDER("gender", "性别", 8), USER_DEMAND_STATUS("user_demand_status", "居民需求状态",8), USER_DEMAND_REPORT_TYPE("user_demand_report_type","居民需求上报类型",9), - USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10) + USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10), + AGE_GROUP("age_group", "年龄范围", 11), ; private final String code; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 336c60f7be..10aa4239a9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -415,7 +415,15 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl distribution(PartyActivityFormDTO formDTO) { - return baseDao.getDistribution(formDTO.getAgencyId()); + Result> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode()); + List list = baseDao.getDistribution(formDTO.getAgencyId()); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + list.forEach(item -> { + item.setType(unitTypeMap.getData().get(item.getType())); + }); + return list; } private String getServiceMatter(Map map, String matter) { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java new file mode 100644 index 0000000000..a6ffad6477 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/10 15:49 + */ +@Data +public class PartyMemberListFormDTO implements Serializable { + + private static final long serialVersionUID = -6085134769034337175L; + @NotBlank(message = "组织类型不能为空") + private String orgType; + @NotBlank(message = "组织ID不能为空") + private String orgId; + private String code; + private Integer pageNo = 1; + private Integer pageSize = 20; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java new file mode 100644 index 0000000000..a5bb86915f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/10 15:46 + */ +@Data +public class PartyMemberStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = 1027174449735636944L; + @NotBlank(message = "组织类型不能为空") + private String orgType; + @NotBlank(message = "组织ID不能为空") + private String orgId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java new file mode 100644 index 0000000000..85b0ced524 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/10 17:05 + */ +@Data +public class PartyMemberAgeResultDTO implements Serializable { + private static final long serialVersionUID = 3421162784157903637L; + private String userId; + private String name; + private String age; + private String mobile; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java new file mode 100644 index 0000000000..421d0139a3 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/10 17:07 + */ +@Data +public class PartyMemberEducationResultDTO implements Serializable { + private static final long serialVersionUID = -5042362121277863249L; + private String userId; + private String name; + private String education; + private String mobile; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 5c76d8e578..aa88bf73ab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; @@ -505,4 +506,56 @@ public class IcResiUserController { ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class); return new Result>().ok(icResiUserService.queryDemandUsers(formDTO)); } + + /** + * 党员年龄范围统计 + * @Param formDTO + * @Return {@link Result< List< OptionDataResultDTO >>} + * @Author zhaoqifeng + * @Date 2021/12/10 15:52 + */ + @PostMapping("partymemberagestatistics") + public Result> partyMemberAgeStatistics(@RequestBody PartyMemberStatisticsFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icResiUserService.partyMemberAgeStatistics(formDTO)); + } + + /** + * 党员年龄列表 + * @Param formDTO + * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:54 + */ + @PostMapping("partymemberagelist") + public Result> partyMemberAgelist(@RequestBody PartyMemberListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icResiUserService.getPartyMemberAgeList(formDTO)); + } + + /** + * 党员学历统计 + * @Param formDTO + * @Return {@link Result< List< OptionDataResultDTO>>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:58 + */ + @PostMapping("partymembereducationstatistics") + public Result> partyMemberEducationStatistics(@RequestBody PartyMemberStatisticsFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icResiUserService.partyMemberEducationStatistics(formDTO)); + } + + /** + * 党员学历列表 + * @Param formDTO + * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:58 + */ + @PostMapping("partymembereducationlist") + public Result> partyMemberEducationlist(@RequestBody PartyMemberListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icResiUserService.getPartyMemberEducationList(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 09f467f6bf..c3f1da8654 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.ResiUserQueryValueDTO; import com.epmet.dto.result.*; @@ -179,4 +180,50 @@ public interface IcResiUserDao extends BaseDao { * @return */ List selectListFamilyMember(@Param("currentIcResiUserId") String currentIcResiUserId, @Param("homeId") String homeId); + + /** + * 组织内党员年龄范围统计 + * @Param orgType + * @Param orgId + * @Return {@link List< OptionDataResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:11 + */ + List getPartyMemberAgeStatistics(@Param("orgType") String orgType, @Param("orgId") String orgId); + + /** + * 获取年龄范围内党员列表 + * @Param orgType + * @Param orgId + * @Param min + * @Param max + * @Return {@link List< PartyMemberAgeResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:11 + */ + List getPartyMemberAgeList(@Param("orgType") String orgType, @Param("orgId") String orgId, + @Param("code") String code); + + + /** + * 党员文化程度统计 + * @Param orgType + * @Param orgId + * @Return {@link List< OptionDataResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:29 + */ + List getPartyMemberEducationStatistics(@Param("orgType") String orgType, @Param("orgId") String orgId); + + /** + * 按教育程度获取党员列表 + * @Param orgType + * @Param orgId + * @Param code + * @Return {@link List< PartyMemberAgeResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:24 + */ + List getPartyMemberEducationList(@Param("orgType") String orgType, @Param("orgId") String orgId, + @Param("code") String code); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 450ee74c70..db5ad290cf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -18,6 +18,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcResiUserDTO; @@ -153,4 +154,40 @@ public interface IcResiUserService extends BaseService { IcResiUserDTO getByIdCard(String customerId, String idNum,String icResiUserId); IcResiUserBriefDTO findFamilyMem(String icResiUserId); + + /** + * 党员年龄范围统计 + * @Param formDTO + * @Return {@link List< OptionDataResultDTO >} + * @Author zhaoqifeng + * @Date 2021/12/10 15:54 + */ + List partyMemberAgeStatistics(PartyMemberStatisticsFormDTO formDTO); + + /** + * 获取年龄范围内党员列表 + * @Param formDTO + * @Return {@link PageData< PartyMemberAgeResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:40 + */ + PageData getPartyMemberAgeList(PartyMemberListFormDTO formDTO); + + /** + * 党员文化程度统计 + * @Param formDTO + * @Return {@link List< OptionDataResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:40 + */ + List partyMemberEducationStatistics(PartyMemberStatisticsFormDTO formDTO); + + /** + * 按教育程度获取党员列表 + * @Param formDTO + * @Return {@link PageData< PartyMemberEducationResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:40 + */ + PageData getPartyMemberEducationList(PartyMemberListFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index d045c08f3d..0a697f0093 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.enums.FormItemTypeEnum; -import com.epmet.commons.tools.enums.GenderEnum; -import com.epmet.commons.tools.enums.HouseTypeEnum; -import com.epmet.commons.tools.enums.RelationshipEnum; +import com.epmet.commons.tools.dto.result.DictListResultDTO; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.commons.tools.enums.*; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; @@ -54,10 +54,7 @@ import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; -import com.epmet.feign.EpmetHeartOpenFeignClient; -import com.epmet.feign.EpmetMessageOpenFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; -import com.epmet.feign.OperCustomizeOpenFeignClient; +import com.epmet.feign.*; import com.epmet.service.IcResiUserService; import com.epmet.service.UserService; import com.github.pagehelper.Page; @@ -102,6 +99,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); @@ -883,4 +882,106 @@ public class IcResiUserServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2021/12/10 15:54 + */ + @Override + public List partyMemberAgeStatistics(PartyMemberStatisticsFormDTO formDTO) { + //获取年龄范围字典 + DictListFormDTO dictFormDTO = new DictListFormDTO(); + dictFormDTO.setDictType(DictTypeEnum.AGE_GROUP.getCode()); + Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + Map map = new HashMap<>(); + //统计组织下各年龄范围人数 + List list = baseDao.getPartyMemberAgeStatistics(formDTO.getOrgType(), formDTO.getOrgId()); + if (CollectionUtils.isNotEmpty(list)) { + map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); + } + Map finalMap = map; + return dictResult.getData().stream().map(item -> { + OptionDataResultDTO dto = new OptionDataResultDTO(); + dto.setCode(item.getValue()); + dto.setLabel(item.getLabel()); + dto.setValue(null == finalMap.get(item.getValue())?NumConstant.ZERO_STR:finalMap.get(item.getValue())); + return dto; + }).collect(Collectors.toList()); + } + + /** + * 获取年龄范围内党员列表 + * + * @param formDTO + * @Param formDTO + * @Return {@link List< PartyMemberAgeResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:40 + */ + @Override + public PageData getPartyMemberAgeList(PartyMemberListFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberAgeList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 党员文化程度统计 + * + * @param formDTO + * @Param formDTO + * @Return {@link List< OptionDataResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:40 + */ + @Override + public List partyMemberEducationStatistics(PartyMemberStatisticsFormDTO formDTO) { + //获取文化程度字典 + DictListFormDTO dictFormDTO = new DictListFormDTO(); + dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode()); + Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + Map map = new HashMap<>(); + //统计组织下文化程度党员人数 + List list = baseDao.getPartyMemberEducationStatistics(formDTO.getOrgType(), formDTO.getOrgId()); + if (CollectionUtils.isNotEmpty(list)) { + map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); + } + Map finalMap = map; + return dictResult.getData().stream().map(item -> { + OptionDataResultDTO dto = new OptionDataResultDTO(); + dto.setCode(item.getValue()); + dto.setLabel(item.getLabel()); + dto.setValue(null == finalMap.get(item.getValue())?NumConstant.ZERO_STR:finalMap.get(item.getValue())); + return dto; + }).collect(Collectors.toList()); + } + + /** + * 按教育程度获取党员列表 + * + * @param formDTO + * @Param formDTO + * @Return {@link List< PartyMemberEducationResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/10 17:40 + */ + @Override + public PageData getPartyMemberEducationList(PartyMemberListFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberEducationList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); + Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + }); + } + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 8414cf5e4b..b10e6e259f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -361,4 +361,132 @@ and m.HOME_ID=#{homeId} order by m.CREATED_TIME asc + + + + + From 6185d0bb7274df6e70a4fe2105766552a91a1ba7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 11 Dec 2021 10:03:52 +0800 Subject: [PATCH 529/589] bugfix --- .../form/demand/CategoryAnalysisFormDTO.java | 42 +++++++++ .../result/demand/CategoryAnalysisDTO.java | 19 +++++ .../result/demand/CategoryAnalysisDetail.java | 32 +++++++ .../result/demand/CategoryAnalysisResDTO.java | 17 ++++ .../epmet/dto/result/demand/LegendDTO.java | 26 ++++++ .../controller/IcUserDemandRecController.java | 14 +++ .../com/epmet/dao/IcUserDemandRecDao.java | 11 +++ .../epmet/service/IcUserDemandRecService.java | 8 ++ .../impl/IcUserDemandRecServiceImpl.java | 85 +++++++++++++++++-- .../resources/mapper/IcUserDemandRecDao.xml | 22 +++++ 10 files changed, 269 insertions(+), 7 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java new file mode 100644 index 0000000000..f4e792f75e --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form.demand; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + + +/** + * 服务措施分析-柱状图入参 + */ +@Data +public class CategoryAnalysisFormDTO implements Serializable { + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class) + private String orgId; + @NotBlank(message = "组织或网格的上级", groups = PageListAnalysisFormDTO.AddUserShowGroup.class) + private String pid; + @NotBlank(message = "组织:agency,网格：grid", groups = AddUserShowGroup.class) + private String orgType; + @NotBlank(message = "起止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class) + private String startDateId; + @NotBlank(message = "截止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class) + private String endDateId; + + @NotBlank(message = "先选择组织或网格", groups = AddUserInternalGroup.class) + private String cusotmerId; + + + /** + * orgType=agency时pid拼接上orgId + */ + private String gridPids; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java new file mode 100644 index 0000000000..fc7a8eaad8 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result.demand; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CategoryAnalysisDTO implements Serializable { + private static final long serialVersionUID = 3007202497989446585L; + private String categoryCode; + private String categoryName; + private Integer total; + private List detail; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java new file mode 100644 index 0000000000..c082d11074 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result.demand; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CategoryAnalysisDetail implements Serializable { + private static final long serialVersionUID = -4606305611297470078L; + /** + * 区域党建单位：party_unit； + * 社会组织：social_org； + * 社区自组织：community_org； + * 志愿者：volunteer； + * 未完成：unfinished + */ + private String legendCode; + + /** + * 服务方类型名称 + */ + private String legendName; + + /** + * 服务方的个数 + */ + private Integer totalService; + /** + * 需求个数 + */ + private Integer serviceDemandTotal; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java new file mode 100644 index 0000000000..1b39a2befd --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result.demand; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CategoryAnalysisResDTO implements Serializable { + private static final long serialVersionUID = -3112952115061180189L; + private List legend; + private List categoryList; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java new file mode 100644 index 0000000000..e1f6c9b282 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.result.demand; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 服务措施分析-柱状图 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LegendDTO implements Serializable { + private static final long serialVersionUID = 7205666632591639499L; + /** + * 区域党建单位：party_unit； + * 社会组织：social_org； + * 社区自组织：community_org； + * 志愿者：volunteer； + * 未完成：unfinished + */ + private String legendCode; + private String legendName; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 666243eee0..08a28e2f25 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -257,4 +257,18 @@ public class IcUserDemandRecController { } return new Result(); } + + /** + * 数据分析-服务措施分析-柱状图 + * + * @return + */ + @PostMapping("category-analysis") + public Result categoryAnalysis(@LoginUser TokenDto tokenDto,@RequestBody CategoryAnalysisFormDTO formDTO){ + formDTO.setCusotmerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,CategoryAnalysisFormDTO.AddUserShowGroup.class,CategoryAnalysisFormDTO.AddUserInternalGroup.class); + return new Result().ok(icUserDemandRecService.categoryAnalysis(formDTO)); + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java index aa7c3c68c1..299576cfcf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java @@ -21,8 +21,10 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.demand.IcResiUserDemandFromDTO; import com.epmet.dto.form.demand.PageListAnalysisFormDTO; import com.epmet.dto.form.demand.UserDemandPageFormDTO; +import com.epmet.dto.result.demand.CategoryAnalysisDTO; import com.epmet.dto.result.demand.DemandRecResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcUserDemandRecEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -65,4 +67,13 @@ public interface IcUserDemandRecDao extends BaseDao { * @return */ List pageListAnalysis(PageListAnalysisFormDTO formDTO); + + + List selectListCategoryAnalysisDTO(@Param("firstCategoryList") List firstCategoryList, + @Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType, + @Param("gridPids") String gridPids, + @Param("startDateId") String startDateId, + @Param("endDateId") String endDateId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index 685261ec33..1ffeca3931 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.demand.*; +import com.epmet.dto.result.demand.CategoryAnalysisResDTO; import com.epmet.dto.result.demand.DemandRecResultDTO; import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; @@ -161,4 +162,11 @@ public interface IcUserDemandRecService extends BaseService pageListAnalysis(PageListAnalysisFormDTO formDTO); + + /** + * 数据分析-服务措施分析-柱状图 + * + * @return + */ + CategoryAnalysisResDTO categoryAnalysis(CategoryAnalysisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 51bc5fc35c..8a8e9280af 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -45,9 +45,7 @@ import com.epmet.dto.form.demand.*; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.IcResiUserBriefDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; -import com.epmet.dto.result.demand.DemandRecResultDTO; -import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO; -import com.epmet.dto.result.demand.IcResiUserReportDemandRes; +import com.epmet.dto.result.demand.*; import com.epmet.entity.*; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -239,9 +237,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userInfoMap=new HashMap<>(); - List userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toList()); + Set userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); if(CollectionUtils.isNotEmpty(userIdList)){ - Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList)); if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){ throw new RenException("查询志愿者信息异常"); } @@ -654,9 +652,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userInfoMap=new HashMap<>(); - List userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toList()); + Set userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet()); if(CollectionUtils.isNotEmpty(userIdList)){ - Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList)); if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){ throw new RenException("查询志愿者信息异常"); } @@ -696,6 +694,79 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, total); } + /** + * 数据分析-服务措施分析-柱状图 + * + * @param formDTO + * @return + */ + @Override + public CategoryAnalysisResDTO categoryAnalysis(CategoryAnalysisFormDTO formDTO) { + //1、一级分类字典，没有分类直接退出 + SubCodeFormDTO subCodeFormDTO=new SubCodeFormDTO(); + subCodeFormDTO.setCustomerId(formDTO.getCusotmerId()); + subCodeFormDTO.setParentCategoryCode(NumConstant.ZERO_STR); + List firstCategoryList=demandDictService.querySubCodeList(subCodeFormDTO); + if(CollectionUtils.isEmpty(firstCategoryList)){ + return new CategoryAnalysisResDTO(Collections.EMPTY_LIST,Collections.EMPTY_LIST); + } + //2、没有服务类型直接退出 + Result> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); + if(!serviceTypeRes.success()||MapUtils.isEmpty(serviceTypeRes.getData())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询服务方类型异常，请检查是否已经配置字典信息"); + } + List legend=new ArrayList<>(); + serviceTypeRes.getData().forEach((code,name)->{ + LegendDTO legendDTO=new LegendDTO(code,name); + legend.add(legendDTO); + }); + LegendDTO unfinishLegend = new LegendDTO("unfinished", "未完成"); + legend.add(unfinishLegend); + // 3、传进来的是组织id的话，查询出全路径 + if("agency".equals(formDTO.getOrgType())){ + if(NumConstant.ZERO_STR.equals(formDTO.getPid())){ + //当前传入的组织id=客户的根组织 + formDTO.setGridPids(formDTO.getOrgId()); + }else{ + //找到当前组织的所有上级，再拼接上自己 + Result customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); + if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); + } + formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId())); + } + } + + // 4、查询出有数据的一级分类 + // 4、sql计算出detail + List haveDemandList=baseDao.selectListCategoryAnalysisDTO(firstCategoryList, + formDTO.getCusotmerId(), + formDTO.getOrgId(), + formDTO.getOrgType(), + formDTO.getGridPids(), + formDTO.getStartDateId(), + formDTO.getEndDateId()); + if(!CollectionUtils.isEmpty(haveDemandList)){ + for(CategoryAnalysisDTO analysisRes:haveDemandList){ + //todo + //List detail= + } + } + + + //构造最后的反参 + List list=new ArrayList<>(); + // firstCategoryList是所有的一级分类字典 + firstCategoryList.forEach(firstCategory->{ + CategoryAnalysisDTO categoryAnalysisDTO=new CategoryAnalysisDTO(firstCategory.getValue(),firstCategory.getLabel(),NumConstant.ZERO,Collections.EMPTY_LIST); + list.add(categoryAnalysisDTO); + }); + + CategoryAnalysisResDTO result=new CategoryAnalysisResDTO(); + result.setLegend(legend); + result.setCategoryList(list); + return null; + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 804ddac6d6..ffc3aa454f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -261,4 +261,26 @@ order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc + + + \ No newline at end of file From a021aefa0327ad260fb377cbb87eed45a5140e00 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 11 Dec 2021 11:09:25 +0800 Subject: [PATCH 530/589] test --- .../dto/result/demand/CategoryDetailDTO.java | 11 +++ .../com/epmet/dao/IcUserDemandRecDao.java | 13 ++- .../impl/IcUserDemandRecServiceImpl.java | 52 ++++++++---- .../resources/mapper/IcUserDemandRecDao.xml | 81 ++++++++++++++++++- 4 files changed, 134 insertions(+), 23 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java new file mode 100644 index 0000000000..9e2802362a --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java @@ -0,0 +1,11 @@ +package com.epmet.dto.result.demand; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CategoryDetailDTO extends CategoryAnalysisDetail implements Serializable { + private static final long serialVersionUID = 4459219163308113201L; + private String categoryCode; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java index 299576cfcf..1dfaf2cb85 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java @@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.demand.IcResiUserDemandFromDTO; import com.epmet.dto.form.demand.PageListAnalysisFormDTO; import com.epmet.dto.form.demand.UserDemandPageFormDTO; -import com.epmet.dto.result.demand.CategoryAnalysisDTO; -import com.epmet.dto.result.demand.DemandRecResultDTO; -import com.epmet.dto.result.demand.IcResiUserReportDemandRes; -import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.demand.*; import com.epmet.entity.IcUserDemandRecEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -69,6 +66,14 @@ public interface IcUserDemandRecDao extends BaseDao { List pageListAnalysis(PageListAnalysisFormDTO formDTO); + List selectDetail(@Param("categoryCode") String categoryCode, + @Param("orgType") String orgType, + @Param("orgId") String orgId, + @Param("gridPids") String gridPids, + @Param("customerId") String customerId, + @Param("startDateId") String startDateId, + @Param("endDateId") String endDateId); + List selectListCategoryAnalysisDTO(@Param("firstCategoryList") List firstCategoryList, @Param("customerId") String customerId, @Param("orgId") String orgId, diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 8a8e9280af..89d464e3fe 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -54,6 +55,7 @@ import com.epmet.service.IcResiDemandDictService; import com.epmet.service.IcUserDemandRecService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -71,6 +73,7 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2021-11-19 */ +@Slf4j @Service public class IcUserDemandRecServiceImpl extends BaseServiceImpl implements IcUserDemandRecService { @Autowired @@ -722,6 +725,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl list=new ArrayList<>(); + // firstCategoryList是所有的一级分类字典 + firstCategoryList.forEach(firstCategory->{ + CategoryAnalysisDTO categoryAnalysisDTO=new CategoryAnalysisDTO(firstCategory.getValue(),firstCategory.getLabel(),NumConstant.ZERO,Collections.EMPTY_LIST); + categoryAnalysisDTO.setDetail(constructDefaultDetail(legend)); + list.add(categoryAnalysisDTO); + }); + + log.info("阶段性胜利2："+ JSON.toJSONString(list)); + + // 5、查询出有数据的一级分类，sql计算出detail List haveDemandList=baseDao.selectListCategoryAnalysisDTO(firstCategoryList, formDTO.getCusotmerId(), formDTO.getOrgId(), @@ -747,25 +762,32 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl detail= + log.info("阶段性胜利3："+ JSON.toJSONString(haveDemandList)); + Map map = haveDemandList.stream().filter(temp -> CollectionUtils.isNotEmpty(temp.getDetail())).collect(Collectors.toMap(CategoryAnalysisDTO::getCategoryCode, dto -> dto)); + if(MapUtils.isNotEmpty(map)){ + for(CategoryAnalysisDTO result:list){ + if (map.containsKey(result.getCategoryCode()) && null != map.get(result.getCategoryCode())) { + result.setDetail(map.get(result.getCategoryCode()).getDetail()); + } + } } } - - //构造最后的反参 - List list=new ArrayList<>(); - // firstCategoryList是所有的一级分类字典 - firstCategoryList.forEach(firstCategory->{ - CategoryAnalysisDTO categoryAnalysisDTO=new CategoryAnalysisDTO(firstCategory.getValue(),firstCategory.getLabel(),NumConstant.ZERO,Collections.EMPTY_LIST); - list.add(categoryAnalysisDTO); - }); - + //返回结果，也不知道对不对 CategoryAnalysisResDTO result=new CategoryAnalysisResDTO(); result.setLegend(legend); result.setCategoryList(list); - return null; + return result; + } + + private List constructDefaultDetail(List legend) { + List l = new ArrayList<>(); + legend.forEach(legendDTO -> { + CategoryAnalysisDetail d = ConvertUtils.sourceToTarget(legendDTO, CategoryAnalysisDetail.class); + d.setServiceDemandTotal(NumConstant.ZERO); + d.setTotalService(NumConstant.ZERO); + }); + return l; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index ffc3aa454f..eff843c279 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -263,12 +263,29 @@ - select - #{category.value} as categoryCode, - #{category.label} as categoryName, - count(m.id) as total + #{category.value} as category_code, + #{category.label} as category_name, + count(m.id) as TOTAL, + #{orgType} as org_type, + #{orgId} as org_id, + #{gridPids} as grid_pids, + #{customerId} as customer_id, + #{startDateId} as start_date_id, + #{endDateId} as end_date_id from ic_user_demand_rec m where m.DEL_FLAG='0' and m.CUSTOMER_ID=#{customerId} @@ -281,6 +298,62 @@ and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{category.value},'%') + and m.status !='canceled' + + \ No newline at end of file From 0ceaf6c5d00626bef4bfd9e6dac0ec5b1718c718 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 11 Dec 2021 11:29:26 +0800 Subject: [PATCH 531/589] test2 --- .../impl/IcUserDemandRecServiceImpl.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 89d464e3fe..d80ea3de6e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -767,10 +767,31 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl resDetailList=tempDto.getDetail(); + Map detailMap = resDetailList.stream().collect(Collectors.toMap(CategoryAnalysisDetail::getLegendCode, dto -> dto)); + + //遍历之前构造好的图例 + for(CategoryAnalysisDetail resultDetail:result.getDetail()){ + if(detailMap.containsKey(resultDetail.getLegendCode())&&null!=detailMap.get(resultDetail.getLegendCode())){ + resultDetail.setTotalService(detailMap.get(resultDetail.getLegendCode()).getTotalService()); + resultDetail.setServiceDemandTotal(detailMap.get(resultDetail.getLegendCode()).getServiceDemandTotal()); + } + } + + } + } + } + } + } //返回结果，也不知道对不对 From 9a4e5e6b20c9b4aa8cb06d2297323a753b27e6e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 11 Dec 2021 11:40:54 +0800 Subject: [PATCH 532/589] test2.1 --- .../java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index d80ea3de6e..8446c84103 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -765,6 +765,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl map = haveDemandList.stream().filter(temp -> CollectionUtils.isNotEmpty(temp.getDetail())).collect(Collectors.toMap(CategoryAnalysisDTO::getCategoryCode, dto -> dto)); if(MapUtils.isNotEmpty(map)){ + log.info("阶段性胜利4："+ JSON.toJSONString(map)); for(CategoryAnalysisDTO result:list){ if (map.containsKey(result.getCategoryCode()) && null != map.get(result.getCategoryCode())) { //如果当前分类下有上报的需求,将原来的0改为实际的需求数量 @@ -807,6 +808,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Sun, 12 Dec 2021 21:45:10 +0800 Subject: [PATCH 533/589] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=9D=90=E6=A0=87=E5=88=86=E5=B8=83?= =?UTF-8?q?=202.=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=A1=E6=81=AF=E7=AE=80?= =?UTF-8?q?=E4=BB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VolunteerDemandServiceStatsResultDTO.java | 41 ++++ .../DataReportHeartDemandController.java | 38 ++++ .../fact/FactVolunteerServiceDailyDao.java | 43 +++++ .../FactVolunteerServiceDailyEntity.java | 83 ++++++++ .../service/heart/DemandService.java | 13 ++ .../service/heart/impl/DemandServiceImpl.java | 29 +++ .../fact/FactVolunteerServiceDailyDao.xml | 36 ++++ .../dto/form/resi/VolunteerCommonFormDTO.java | 26 +++ .../resi/PageVolunteerInfoResultDTO.java | 14 ++ .../feign/EpmetHeartOpenFeignClient.java | 10 + .../EpmetHeartOpenFeignClientFallback.java | 7 + .../controller/ResiVolunteerController.java | 19 ++ .../epmet/service/VolunteerInfoService.java | 3 + .../impl/VolunteerInfoServiceImpl.java | 20 ++ .../epmet/feign/GovOrgOpenFeignClient.java | 18 ++ .../GovOrgOpenFeignClientFallback.java | 9 + .../dto/form/IcFormOptionsQueryFormDTO.java | 27 +++ .../feign/OperCustomizeOpenFeignClient.java | 9 + .../OperCustomizeOpenFeignClientFallback.java | 6 + .../IcFormItemOptionsController.java | 20 ++ .../service/IcFormItemOptionsService.java | 9 + .../impl/IcFormItemOptionsServiceImpl.java | 47 ++++- .../dto/form/VolunteerCommonFormDTO.java | 26 +++ .../epmet/dto/result/IcResiUserBriefDTO.java | 61 ++++++ .../VolunteerDistributionResultDTO.java | 36 ++++ .../controller/IcResiUserController.java | 13 ++ .../epmet/controller/VolunteerController.java | 55 ++++++ .../com/epmet/service/IcResiUserService.java | 2 + .../com/epmet/service/VolunteerService.java | 15 ++ .../service/impl/IcResiUserServiceImpl.java | 73 +++++++ .../service/impl/VolunteerServiceImpl.java | 179 ++++++++++++++++++ 31 files changed, 981 insertions(+), 6 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java new file mode 100644 index 0000000000..2dfcb5426a --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result.heart; + +import lombok.Data; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/12/10 4:24 下午 + * @Version 1.0 + */ +@Data +public class VolunteerDemandServiceStatsResultDTO { + + private String customerId; + private String dateId; + /** + * 客户下志愿者总数 + */ + private Integer volunteerTotal; + /** + * 客户下志愿者中，党员数量 + */ + private Integer partyTotal; + /** + * 客户下志愿者中，居民数量 + */ + private Integer resiTotal; + /** + * 客户下志愿者服务总次数 + */ + private Integer serviceTotal; + /** + * 客户下党员志愿者服务次数 + */ + private Integer partyServiceTotal; + /** + * 客户下居民志愿者服务次数 + */ + private Integer resiServiceTotal; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java new file mode 100644 index 0000000000..86eabe2b3c --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java @@ -0,0 +1,38 @@ +package com.epmet.datareport.controller.heart; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.datareport.service.heart.DemandService; +import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description 描述 + * @Author wangxianzhang + * @Date 2021/12/10 3:55 下午 + * @Version 1.0 + */ +@RestController +@RequestMapping("heart/demand") +public class DataReportHeartDemandController { + + @Autowired + private DemandService demandService; + + /** + * 查询志愿者需求服务统计信息 + * @param loginUser + * @return + */ + @PostMapping("volunteer/service") + public Result getVolunteerServiceStats(@LoginUser TokenDto loginUser) { + String customerId = loginUser.getCustomerId(); + VolunteerDemandServiceStatsResultDTO r = demandService.getVolunteerServiceStats(customerId); + return new Result().ok(r); + } + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java new file mode 100644 index 0000000000..fd4d28afb0 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java @@ -0,0 +1,43 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.datareport.dao.fact; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.datareport.entity.heart.FactVolunteerServiceDailyEntity; +import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 志愿者服务情况统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-12-08 + */ +@Mapper +public interface FactVolunteerServiceDailyDao extends BaseDao { + + /** + * 查询最新一条"志愿者需求服务统计信息" + * @param customerId + * @return + */ + VolunteerDemandServiceStatsResultDTO getLatestVolunteerDemandServiceStats(@Param("customerId") String customerId); +} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java new file mode 100644 index 0000000000..a668e52a63 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java @@ -0,0 +1,83 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.datareport.entity.heart; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 志愿者服务情况统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-12-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("fact_volunteer_service_daily") +public class FactVolunteerServiceDailyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * yyyyMMdd + */ + private String dateId; + + /** + * yyyyMM + */ + private String monthId; + + /** + * 截止到当前dateId，当前客户下，共有多少个爱心互助的志愿者 + */ + private Integer volunteerTotal; + + /** + * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，党员有多少个 + */ + private Integer partyTotal; + + /** + * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，居民有多少个 + */ + private Integer resiTotal; + + /** + * 服务总次数 + */ + private Integer serviceTotal; + + /** + * 党员服务总次数 + */ + private Integer partyServiceTotal; + + /** + * 居民服务总次数 + */ + private Integer resiServiceTotal; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java new file mode 100644 index 0000000000..ccbbb319a1 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java @@ -0,0 +1,13 @@ +package com.epmet.datareport.service.heart; + +import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO; + +/** + * @Description 需求服务 + * @Author wangxianzhang + * @Date 2021/12/10 4:18 下午 + * @Version 1.0 + */ +public interface DemandService { + VolunteerDemandServiceStatsResultDTO getVolunteerServiceStats(String customerId); +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java new file mode 100644 index 0000000000..79ba0274ea --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java @@ -0,0 +1,29 @@ +package com.epmet.datareport.service.heart.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.datareport.dao.fact.FactVolunteerServiceDailyDao; +import com.epmet.datareport.entity.heart.FactVolunteerServiceDailyEntity; +import com.epmet.datareport.service.heart.DemandService; +import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description 需求服务 + * @Author wangxianzhang + * @Date 2021/12/10 4:20 下午 + * @Version 1.0 + */ +@Service +public class DemandServiceImpl implements DemandService { + + @Autowired + private FactVolunteerServiceDailyDao factVolunteerServiceDailyDao; + + @Override + public VolunteerDemandServiceStatsResultDTO getVolunteerServiceStats(String customerId) { + return factVolunteerServiceDailyDao.getLatestVolunteerDemandServiceStats(customerId); + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml new file mode 100644 index 0000000000..fbe645deb3 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java new file mode 100644 index 0000000000..c8893697a8 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form.resi; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @Description + * @Author wangxianzhang + * @Date 2021/12/10 6:10 下午 + * @Version 1.0 + */ +@Data +public class VolunteerCommonFormDTO { + + public interface VolunteerPage { + } + + @NotBlank(message = "客户ID不能为空", groups = {VolunteerPage.class}) + private String customerId; + + private Integer pageNo = 0; + + private Integer pageSize = 20; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java new file mode 100644 index 0000000000..d23f2023da --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * @Description 志愿者信息分页查询结果 + * @Author wangxianzhang + * @Date 2021/12/10 6:17 下午 + * @Version 1.0 + */ +@Data +public class PageVolunteerInfoResultDTO { + private String userId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index 7a4a6c8ad5..4bad8f25d7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -6,6 +6,8 @@ import com.epmet.dto.ActInfoDTO; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.CommonCustomerFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; +import com.epmet.dto.form.resi.VolunteerCommonFormDTO; +import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; @@ -56,4 +58,12 @@ public interface EpmetHeartOpenFeignClient { @PostMapping("/heart/icresidemanddict/demangnames") Result queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO); + + /** + * 分页查询志愿者列表 + * @param input + * @return + */ + @PostMapping("/heart/resi/volunteer/page") + Result> queryVolunteerPage(@RequestBody VolunteerCommonFormDTO input); } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index e0e140b02e..27c2c9bdc8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -7,6 +7,8 @@ import com.epmet.dto.ActInfoDTO; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.CommonCustomerFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; +import com.epmet.dto.form.resi.VolunteerCommonFormDTO; +import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.EpmetHeartOpenFeignClient; import java.util.List; @@ -53,4 +55,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli public Result queryDemandNames(UserDemandNameQueryFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDemandNames", formDTO); } + + @Override + public Result> queryVolunteerPage(VolunteerCommonFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryVolunteerPage", input); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java index e144e9c11f..e1d18e5536 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java @@ -26,7 +26,9 @@ import com.epmet.dto.form.CommonCustomerFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; +import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.service.VolunteerInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -125,4 +127,21 @@ public class ResiVolunteerController { public Result> queryListVolunteer(@LoginUser TokenDto tokenDto,@RequestBody ServiceQueryFormDTO formDTO){ return new Result>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(),formDTO.getServiceName())); } + + /** + * 分页查询志愿者列表 + * @param input + * @return + */ + @PostMapping("page") + public Result> queryVolunteerPage(@RequestBody VolunteerCommonFormDTO input) { + + ValidatorUtils.validateEntity(input, VolunteerCommonFormDTO.VolunteerPage.class); + + Integer pageNo = input.getPageNo(); + Integer pageSize = input.getPageSize(); + String customerId = input.getCustomerId(); + List l = volunteerInfoService.queryVolunteerPage(customerId, pageNo, pageSize); + return new Result>().ok(l); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java index 850c4367de..6a84fb67a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java @@ -25,6 +25,7 @@ import com.epmet.dto.form.CommonCustomerFormDTO; import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.entity.VolunteerInfoEntity; @@ -94,4 +95,6 @@ public interface VolunteerInfoService extends BaseService { * @return */ List queryListVolunteer(String customerId,String userRealName); + + List queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index a0ac541131..ac87cc6b4c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -18,6 +18,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -44,12 +45,14 @@ import com.epmet.dto.result.ResiUserBaseInfoResultDTO; import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.entity.VolunteerInfoEntity; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.HeartUserInfoService; import com.epmet.service.VolunteerInfoService; +import com.github.pagehelper.PageHelper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -258,4 +261,21 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(VolunteerInfoEntity::getCustomerId, customerId); + + PageHelper.startPage(pageNo, pageSize); + List volunteerInfoEntities = baseDao.selectList(query); + + List list = volunteerInfoEntities.stream().map(vi -> { + PageVolunteerInfoResultDTO p = new PageVolunteerInfoResultDTO(); + p.setUserId(vi.getUserId()); + return p; + }).collect(Collectors.toList()); + + return list; + } } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 5d713f13e4..f09e1f6ccf 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -540,4 +540,22 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/agency/getsonagencyid") Result> getSonAgencyId(@RequestParam("orgId")String orgId); + +// /icbuilding/{id}?id=demoData + + /** + * 根据ID查询楼栋信息 + * @param id + * @return + */ + @GetMapping("/gov/org/icbuilding/{id}") + Result getBuildingById(@PathVariable("id") String id); + + /** + * 通过ID查询小区信息 + * @param id + * @return + */ + @GetMapping("/gov/org/icneighborhood/{id}") + Result getIcNeighbordhoodById(@PathVariable("id") String id); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 46fcb2506c..f85e3471e6 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -344,4 +344,13 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); } + @Override + public Result getBuildingById(String id) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getBuildingById", id); + } + + @Override + public Result getIcNeighbordhoodById(String id) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getIcNeighbordhoodById", id); + } } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java new file mode 100644 index 0000000000..f7fa5bb1da --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description ic 表单options查询通用dto + * @Author wangxianzhang + * @Date 2021/12/12 1:07 下午 + * @Version 1.0 + */ +@Data +public class IcFormOptionsQueryFormDTO { + + public interface QueryByLabelAndCustomerIdForForm {} + + @NotBlank(message = "客户ID必填", groups = { QueryByLabelAndCustomerIdForForm.class }) + private String customerId; + + @NotBlank(message = "FormCode必填", groups = { QueryByLabelAndCustomerIdForForm.class }) + private String formCode; + + @NotBlank(message = "OptionsLabel必填", groups = { QueryByLabelAndCustomerIdForForm.class }) + private String label; + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 2882f9977f..9cda858533 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerFootBarDTO; +import com.epmet.dto.IcFormItemOptionsDTO; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiCategoryWarnConfigDTO; import com.epmet.dto.form.*; @@ -120,4 +121,12 @@ public interface OperCustomizeOpenFeignClient { @PostMapping("/oper/customize/icformitemoptions/volunteerlabelbyvalues") Result> volunteerLabelByValues(@RequestBody List volunteers,@RequestParam("customerId") String customerId); + /** + * 使用item相关条件查询关联的options + * @param input + * @return + */ + @PostMapping("/oper/customize/icformitemoptions/list-by-item-conditions") + Result> listOptionsByItemConditions(@RequestBody IcFormOptionsQueryFormDTO input); + } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index a75999eb0e..da282124bb 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -4,6 +4,7 @@ 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.CustomerFootBarDTO; +import com.epmet.dto.IcFormItemOptionsDTO; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiCategoryWarnConfigDTO; import com.epmet.dto.form.*; @@ -103,4 +104,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe public Result> volunteerLabelByValues(List volunteers,String customerId) { return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "volunteerLabelByValues",volunteers,customerId); } + + @Override + public Result> listOptionsByItemConditions(IcFormOptionsQueryFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listOptionsByItemConditions", input); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java index 262255826a..ed22604272 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java @@ -26,14 +26,17 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcFormItemOptionsDTO; +import com.epmet.dto.form.IcFormOptionsQueryFormDTO; import com.epmet.excel.IcFormItemOptionsExcel; import com.epmet.service.IcFormItemOptionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.tags.form.InputTag; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import java.util.function.IntUnaryOperator; /** @@ -102,4 +105,21 @@ public class IcFormItemOptionsController { return new Result>().ok(icFormItemOptionsService.volunteerLabelByValues(volunteers,customerId)); } + /** + * 使用item相关条件查询关联的options + * @param input + * @return + */ + @PostMapping("list-by-item-conditions") + public Result> listOptionsByItemConditions(@RequestBody IcFormOptionsQueryFormDTO input) { + ValidatorUtils.validateEntity(input, IcFormOptionsQueryFormDTO.QueryByLabelAndCustomerIdForForm.class); + String customerId = input.getCustomerId(); + String formCode = input.getFormCode(); + String label = input.getLabel(); + + List r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, label); + return new Result>().ok(r); + } + + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java index 387cc05412..7423f85289 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java @@ -100,4 +100,13 @@ public interface IcFormItemOptionsService extends BaseService volunteerLabelByValues(List volunteers, String customerId); + + /** + * 使用item相关条件查询options + * @param customerId + * @param formCode + * @param label + * @return + */ + List getOptionsByItemConditions(String customerId, String formCode, String label); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java index 144e56e568..970845cbee 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java @@ -17,23 +17,30 @@ package com.epmet.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.IcFormItemDao; import com.epmet.dao.IcFormItemOptionsDao; import com.epmet.dto.IcFormItemOptionsDTO; +import com.epmet.entity.IcFormItemEntity; import com.epmet.entity.IcFormItemOptionsEntity; import com.epmet.service.IcFormItemOptionsService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 表单项的选项 @@ -44,7 +51,9 @@ import java.util.Map; @Service public class IcFormItemOptionsServiceImpl extends BaseServiceImpl implements IcFormItemOptionsService { - + @Autowired + private IcFormItemDao icFormItemDao; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -61,8 +70,8 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -98,14 +107,40 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl volunteerLabelByValues(List volunteers,String customerId) { - return baseDao.volunteerLabelByValues(volunteers,customerId); + public List volunteerLabelByValues(List volunteers, String customerId) { + return baseDao.volunteerLabelByValues(volunteers, customerId); } + @Override + public List getOptionsByItemConditions(String customerId, String formCode, String label) { + + // 查询item + LambdaQueryWrapper formItemQuery = new LambdaQueryWrapper<>(); + formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId); + formItemQuery.eq(IcFormItemEntity::getFormCode, formCode); + formItemQuery.eq(IcFormItemEntity::getLabel, label); + IcFormItemEntity item = icFormItemDao.selectOne(formItemQuery); + + if (item == null) { + return new ArrayList<>(); + } + + // 通过item查询options + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcFormItemOptionsEntity::getItemId, item.getId()); + query.orderByAsc(IcFormItemOptionsEntity::getSort); + + // 属性拷贝 + return baseDao.selectList(query).stream().map(o -> { + IcFormItemOptionsDTO oDTO = new IcFormItemOptionsDTO(); + BeanUtil.copyProperties(o, oDTO); + return oDTO; + }).collect(Collectors.toList()); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java new file mode 100644 index 0000000000..a2c8dff5a1 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; +import lombok.Value; + +import javax.validation.constraints.NotBlank; + +/** + * @Description + * @Author wangxianzhang + * @Date 2021/12/10 5:47 下午 + * @Version 1.0 + */ +@Data +public class VolunteerCommonFormDTO { + + /** + * 查询志愿者分布 + */ + public interface GetVolunteerDistribution { + } + + @NotBlank(message = "客户ID不能为空", groups = {GetVolunteerDistribution.class}) + private String customerId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index ce955f1a56..9d5f1453d3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -3,7 +3,10 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 案件居民、家属列表 @@ -12,8 +15,66 @@ import java.util.List; @Data public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { private String houseId; + + private String gridId; + + private String gridName; + + /** + * 小区id + */ + private String villageId; + + /** + * 小区名 + */ + private String villageName; + + /** + * 是否本地户籍 + */ + private String isBdhj; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系人电话 + */ + private String contactsMobile; + + /** + * 志愿者类别 + * key:志愿者类型英文 + * value:志愿者类型中文 + */ + private Map volunteerCategories = new HashMap<>(); + /** * 同屋的其他人 */ private List houseUserList; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java new file mode 100644 index 0000000000..c1bb3d866c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * @Description + * @Author wangxianzhang + * @Date 2021/12/10 5:49 下午 + * @Version 1.0 + */ +@Data +public class VolunteerDistributionResultDTO { + + private List legends = new ArrayList<>(); + + private List distributions = new ArrayList<>(); + + @Data + public static class Legend { + private String optionLabel; + private String optionValue; + } + + @Data + public static class Distribution { + private Set volunteerTypes; + private String epmetUserId; + private String icResiUserId; + private String longitude; + private String latitude; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 5c76d8e578..d89449515e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -505,4 +505,17 @@ public class IcResiUserController { ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class); return new Result>().ok(icResiUserService.queryDemandUsers(formDTO)); } + + /** + * 根据居民id查询居民信息简介 + * @param resiUserId + * @return + */ + @PostMapping("resi-brief/{resi-user-id}") + public Result getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) { + String customerId = loginUser.getCustomerId(); + IcResiUserBriefDTO r = icResiUserService.getResiBrief(resiUserId, customerId); + return new Result().ok(r); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java new file mode 100644 index 0000000000..40ea2d8807 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java @@ -0,0 +1,55 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dao.IcResiUserDao; +import com.epmet.dto.form.VolunteerCommonFormDTO; +import com.epmet.dto.result.VolunteerDistributionResultDTO; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.service.VolunteerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description 志愿者controller + * @Author wangxianzhang + * @Date 2021/12/10 5:45 下午 + * @Version 1.0 + */ +@RestController +@RequestMapping("volunteer") +public class VolunteerController { + + /** + * 不知道为何用注解 注入不进来，暂时用构造方法注入 + */ + @Autowired + private VolunteerService volunteerService; + + //public VolunteerController(VolunteerService volunteerService, IcResiUserDao icResiUserDao, GovOrgOpenFeignClient govOrgOpenFeignClient) { + // this.volunteerService = volunteerService; + // System.out.println(this); + //} + + /** + * 志愿者分布查询 + * + * @param input + * @return + */ + @PostMapping("distribution") + public Result getVolunteerDistribution(@RequestBody VolunteerCommonFormDTO input) { + System.out.println(this); + ValidatorUtils.validateEntity(input, VolunteerCommonFormDTO.GetVolunteerDistribution.class); + + String customerId = input.getCustomerId(); + + VolunteerDistributionResultDTO r = volunteerService.getVolunteerDistributionAndLegends(customerId); + + return new Result().ok(r); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 450ee74c70..ee16cd596a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -153,4 +153,6 @@ public interface IcResiUserService extends BaseService { IcResiUserDTO getByIdCard(String customerId, String idNum,String icResiUserId); IcResiUserBriefDTO findFamilyMem(String icResiUserId); + + IcResiUserBriefDTO getResiBrief(String resiUserId, String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java new file mode 100644 index 0000000000..cd87cf7dd5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java @@ -0,0 +1,15 @@ +package com.epmet.service; + +import com.epmet.dto.result.VolunteerDistributionResultDTO; + +/** + * @Description 志愿者service + * @Author wangxianzhang + * @Date 2021/12/10 5:48 下午 + * @Version 1.0 + */ +public interface VolunteerService { + + VolunteerDistributionResultDTO getVolunteerDistributionAndLegends(String customerId); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index d045c08f3d..6fe81d27aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -102,6 +103,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); @@ -883,4 +886,74 @@ public class IcResiUserServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getId, resiUserId); + IcResiUserEntity resiEntity = baseDao.selectOne(query); + + IcResiUserBriefDTO r = new IcResiUserBriefDTO(); + + BeanUtil.copyProperties(resiEntity, r); + + r.setHouseId(resiEntity.getHomeId()); + r.setIcResiUserId(resiEntity.getId()); + r.setIcUserName(resiEntity.getName()); + + // 填充网格、小区名称 + String errorMsg = "【居民信息简介】查询网格、小区信息失败"; + IcNeighborHoodDTO neighborHood = getResultDataOrThrowsException(govOrgOpenFeignClient.getIcNeighbordhoodById(resiEntity.getVillageId()), + ServiceConstant.GOV_ORG_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + errorMsg, + errorMsg); + + CustomerGridFormDTO gridInfoForm = new CustomerGridFormDTO(); + gridInfoForm.setGridId(resiEntity.getGridId()); + CustomerGridDTO gridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(gridInfoForm), + ServiceConstant.GOV_ORG_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + errorMsg, + errorMsg); + + r.setGridName(gridInfo.getGridName()); + r.setVillageName(neighborHood.getNeighborHoodName()); + + // 2.志愿者类型填充 + List volunteers = icResiUserDao.selectVolunteerByUserId(resiEntity.getId()); + if (CollectionUtils.isNotEmpty(volunteers)) { + String[] vCategories = volunteers.get(0).split(","); + + // 志愿者类型字典 + Map categories = getVolunteerCategoryOptions(customerId); + + for (int i = 0; i < vCategories.length; i++) { + r.getVolunteerCategories().put(vCategories[i], categories.get(vCategories[i])); + } + } + + return r; + } + + /** + * 查询志愿者类别options + * @param customerId + * @return + */ + private Map getVolunteerCategoryOptions(String customerId) { + IcFormOptionsQueryFormDTO optionsQuery = new IcFormOptionsQueryFormDTO(); + optionsQuery.setCustomerId(customerId); + optionsQuery.setFormCode("resi_base_info"); + optionsQuery.setLabel("志愿者类别"); + List categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery), + ServiceConstant.OPER_CUSTOMIZE_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "【志愿者分布】志愿者简介-查询志愿者类别失败", + "【志愿者分布】志愿者简介-查询志愿者类别失败"); + + return categorieDtos.stream() + .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel)); + + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java new file mode 100644 index 0000000000..f0e2796a98 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java @@ -0,0 +1,179 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.dao.IcResiUserDao; +import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dto.IcBuildingDTO; +import com.epmet.dto.IcFormItemOptionsDTO; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.form.IcFormOptionsQueryFormDTO; +import com.epmet.dto.form.resi.VolunteerCommonFormDTO; +import com.epmet.dto.result.ResiUserBaseInfoResultDTO; +import com.epmet.dto.result.VolunteerDistributionResultDTO; +import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; +import com.epmet.feign.EpmetHeartOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OperCustomizeOpenFeignClient; +import com.epmet.service.VolunteerService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description + * @Author wangxianzhang + * @Date 2021/12/10 5:48 下午 + * @Version 1.0 + */ +@Service +public class VolunteerServiceImpl implements VolunteerService, ResultDataResolver { + + @Autowired + private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient; + + @Autowired + private UserBaseInfoDao userBaseInfoDao; + + @Autowired + private IcResiUserDao icResiUserDao; + + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + + @Autowired + private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient; + + /** + * 查询志愿者分布以及志愿者图例 + * + * @param customerId + * @return + */ + public VolunteerDistributionResultDTO getVolunteerDistributionAndLegends(String customerId) { + + // 1.查询分布 + VolunteerDistributionResultDTO volunteerDistribution = getVolunteerDistribution(customerId); + + // 2.补充图例 + IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); + optionsForm.setCustomerId(customerId); + optionsForm.setFormCode("resi_base_info"); + optionsForm.setLabel("志愿者类别"); + + String errorMsg = "【志愿者分布】查询志愿者图例失败"; + List options = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm), + ServiceConstant.OPER_CUSTOMIZE_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + errorMsg, + errorMsg); + + List legends = options.stream().map(o -> { + VolunteerDistributionResultDTO.Legend legend = new VolunteerDistributionResultDTO.Legend(); + legend.setOptionLabel(o.getOptionLabel()); + legend.setOptionValue(o.getOptionValue()); + return legend; + }).collect(Collectors.toList()); + + volunteerDistribution.setLegends(legends); + return volunteerDistribution; + } + + /** + * 查询志愿者分布 + * + * @param customerId + * @return + */ + public VolunteerDistributionResultDTO getVolunteerDistribution(String customerId) { + //epmetHeartOpenFeignClient.queryVolunteerPage() + + // 1.分页查询出所有志愿者列表 + int pageNo = 1; + int pageSize = 100; + + // 志愿者epmet user id + Set volunteerEpmetUserIds = new HashSet<>(); + + // 分页查询志愿者的epmet user id + while (true) { + + VolunteerCommonFormDTO volunteerForm = new VolunteerCommonFormDTO(); + volunteerForm.setCustomerId(customerId); + volunteerForm.setPageNo(pageNo); + volunteerForm.setPageSize(pageSize); + + String errorMsg = "【志愿者分布】分页查询志愿者列表失败"; + List volunteerPage = getResultDataOrThrowsException(epmetHeartOpenFeignClient.queryVolunteerPage(volunteerForm), + ServiceConstant.EPMET_HEART_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + errorMsg, + errorMsg); + + // 将本页userId添加到总集中去 + volunteerEpmetUserIds.addAll(volunteerPage.stream().map(v -> v.getUserId()).collect(Collectors.toSet())); + + if (volunteerPage.size() < pageSize) { + // 说明是最后一页了 + break; + } + + pageNo++; + } + + + VolunteerDistributionResultDTO r = new VolunteerDistributionResultDTO(); + + // 2.填充ic居民信息 + for (String volunteerEpmetUserId : volunteerEpmetUserIds) { + + VolunteerDistributionResultDTO.Distribution distribution = new VolunteerDistributionResultDTO.Distribution(); + + ResiUserBaseInfoResultDTO userBaseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(volunteerEpmetUserId); + + //使用身份证号查询ic resi信息 + IcResiUserDTO icResiUserInfo = icResiUserDao.selectIdByIdCard(customerId, userBaseInfo.getIdNum(), null); + if (icResiUserInfo == null) { + continue; + } + + List volunteer = icResiUserDao.selectVolunteerByUserId(icResiUserInfo.getId()); + if (CollectionUtils.isEmpty(volunteer)) { + // 此人没有志愿者信息 + continue; + } + + // 将志愿者类型列表字符串，切割放到set中 + Set volunteerTypes = new HashSet(); + for (String vTypesString : volunteer) { + String[] vTypes = vTypesString.split(","); + if (vTypes != null && vTypes.length > 0) { + volunteerTypes.addAll(Arrays.asList(vTypes)); + } + } + + + String msg = "【志愿者分布】查询楼栋信息失败"; + IcBuildingDTO building = getResultDataOrThrowsException(govOrgOpenFeignClient.getBuildingById(icResiUserInfo.getBuildId()), + ServiceConstant.GOV_ORG_SERVER, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + + distribution.setVolunteerTypes(volunteerTypes); + distribution.setEpmetUserId(userBaseInfo.getUserId()); + distribution.setIcResiUserId(icResiUserInfo.getId()); + Optional.of(building).ifPresent(b -> { + distribution.setLongitude(b.getLongitude()); + distribution.setLatitude(b.getLatitude()); + }); + + r.getDistributions().add(distribution); + } + + return r; + } + +} From 013283d7c945a3c2944bc4a36c526c627e766a87 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Dec 2021 08:51:04 +0800 Subject: [PATCH 534/589] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E8=BF=94=E5=8F=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/demand/DemandDataDTO.java | 13 +++++++++++++ .../demand/DemandResearchAnalysisResultDTO.java | 3 +-- .../service/impl/IcUserDemandRecServiceImpl.java | 11 ++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java new file mode 100644 index 0000000000..f5ca265feb --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.result.demand; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DemandDataDTO implements Serializable { + private String firstCategoryCode; + private String firstCategoryName; + private List demandList; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java index b8d6dae615..32f0737dc6 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java @@ -20,8 +20,7 @@ public class DemandResearchAnalysisResultDTO implements Serializable { private String houseId; private List houseUserList; - - private List demandList; + private List demandData; /** * 入参中给的，再返回去 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 8446c84103..152f147f5f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -574,6 +574,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl demandData=new ArrayList<>(); + DemandDataDTO demandDataDTO=new DemandDataDTO(); + demandDataDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode()); + demandDataDTO.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),formDTO.getFirstCategoryCode())); + demandDataDTO.setDemandList(new ArrayList<>()); + demandData.add(demandDataDTO); + //获取当前需求人，相同分类的需求列表。不分页，直接返回所有 List userIds=new ArrayList<>(); userIds.add(formDTO.getIcResiUserId()); @@ -604,7 +613,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Mon, 13 Dec 2021 09:29:15 +0800 Subject: [PATCH 535/589] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/AgencyGridList.java | 12 +++++++++ .../com/epmet/dto/result/AgencyResultDTO.java | 21 +++++++-------- .../controller/CustomerGridController.java | 10 +++++++ .../epmet/service/CustomerGridService.java | 6 +++++ .../service/impl/CustomerGridServiceImpl.java | 12 +++++++-- .../resources/mapper/CustomerAgencyDao.xml | 26 +++++++++++++++---- .../main/resources/mapper/CustomerGridDao.xml | 22 ++++++++++++++-- 7 files changed, 89 insertions(+), 20 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java index ad2c907fd5..ce787e045d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java @@ -40,5 +40,17 @@ public class AgencyGridList implements Serializable { * 机关-网格名称 */ private String agencyGridName = ""; + /** + * 网格名称 + */ + private String gridName = ""; + /** + * 网格经度【网格没有经纬度时获取客户根组织下的】 + */ + private String longitude = ""; + /** + * 网格维度【网格没有经纬度时获取客户根组织下的】 + */ + private String latitude = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java index 808e25d791..a7aec4fa28 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java @@ -30,23 +30,22 @@ import java.io.Serializable; */ @Data public class AgencyResultDTO implements Serializable { - private static final long serialVersionUID = 1L; - /** - * 机关组织Id - */ + //机关组织Id private String agencyId = ""; - /** - * 机关组织名称 - */ + //机关组织名称 private String agencyName = ""; - + //上级组织id private String pid; + //组织级别 private String level; - /** - * 所有上级组织机构ID(以英文:隔开) - */ + //所有上级组织机构ID(以英文:隔开) @JsonIgnore private String pids = ""; + //经度【没值则取跟客户的值】 + private String longitude; + //维度【没值则取跟客户的值】 + private String latitude; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 0b58b4d6f0..9528ff6704 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -309,4 +309,14 @@ public class CustomerGridController { List resultDTOS = customerGridService.getGridIListByAgency(agencyId); return new Result>().ok(resultDTOS); } + + /** + * @Author sun + * @Description 查询组织直属网格列表 + **/ + @PostMapping("getGridIListByAgency/{agencyId}") + public Result> gridListByAgencyId(@PathVariable("agencyId") String agencyId) { + return new Result>().ok(customerGridService.gridListByAgencyId(agencyId)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index d6ac66d201..2b2624ac54 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -348,4 +348,10 @@ public interface CustomerGridService extends BaseService { * @Date 2021/11/29 17:00 */ List getGridIListByAgency(String agencyId); + + /** + * @Author sun + * @Description 查询组织直属网格列表 + **/ + List gridListByAgencyId(String agencyId); } 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 9b6f41daad..b09d46e52b 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 @@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -47,7 +46,6 @@ import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.OperCrmOpenFeignClient; -import com.epmet.send.SendMqMsgUtil; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; import com.epmet.util.ModuleConstant; @@ -866,4 +864,14 @@ public class CustomerGridServiceImpl extends BaseServiceImpl gridListByAgencyId(String agencyId) { + List result = baseDao.selectAgencyGridMsgList(agencyId); + return result; + } + } 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 f35fe34fed..88ad6386d6 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 @@ -340,11 +340,27 @@ SELECT - cg.id AS "gridId", + cg.id gridId, CONCAT( ca.organization_name, "-", cg.grid_name - ) "agencyGridName" + ) agencyGridName, + cg.grid_name gridName, + + ( CASE WHEN cg.longitude is null THEN + ( SELECT longitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE cg.longitude + END + ) longitude, + ( CASE WHEN cg.latitude is null THEN + ( SELECT latitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE cg.latitude + END + ) latitude FROM customer_grid cg INNER JOIN customer_agency ca ON cg.pid = ca.id From 4cbfd6f1a765f801ccd514ff603a3c479c0f39f0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Dec 2021 09:35:37 +0800 Subject: [PATCH 536/589] wangle fuzhi --- .../java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 152f147f5f..9e1dcdd59d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -615,6 +615,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Mon, 13 Dec 2021 09:45:09 +0800 Subject: [PATCH 537/589] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=9D=90=E6=A0=87=E5=88=86=E5=B8=83?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DataStatisticalOpenFeignClient.java | 12 ++++++++++ ...ataStatisticalOpenFeignClientFallBack.java | 5 ++++ .../java/com/epmet/task/StatsDemandTask.java | 23 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 047a16e87b..dab2edf301 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -25,6 +25,7 @@ import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -341,4 +342,15 @@ public interface DataStatisticalOpenFeignClient { */ @PostMapping("/data/stats/datareporting/eventinfo") Result> getEventInfo(@RequestBody EventInfoFormDTO formDTO); + + /** + * wangxianzhang + * + * 计算客户下志愿者服务相关数据 + * + * @param customerId 客户ID，可以为空，为空则计算所有客户 + * @return + */ + @PostMapping("/data/stats/demand/volunteer/daily") + Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java index 43638c894e..56fea9c03f 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -334,4 +334,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp public Result> getEventInfo(EventInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getEventInfo", formDTO); } + + @Override + public Result statsVolunteerDemandServicesDaily(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId); + } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java new file mode 100644 index 0000000000..81c0be1c3b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java @@ -0,0 +1,23 @@ +package com.epmet.task; + +import com.epmet.feign.DataStatisticalOpenFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description + * @Author wangxianzhang + * @Date 2021/12/13 9:40 上午 + * @Version 1.0 + */ +@Component("statsDemandTask") +public class StatsDemandTask implements ITask { + + @Autowired + private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; + + @Override + public void run(String params) { + dataStatisticalOpenFeignClient.statsVolunteerDemandServicesDaily(null); + } +} From d97ffae9bc771b4f8496bc46e8b7844459d34333 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Dec 2021 10:01:10 +0800 Subject: [PATCH 538/589] =?UTF-8?q?=E7=9B=B4=E5=B1=9E=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AgencySubResultDTO.java | 12 +++++++ .../controller/CustomerGridController.java | 2 +- .../resources/mapper/CustomerAgencyDao.xml | 31 ++++++++++++++----- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java index 117976dee8..08bd0683b1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java @@ -49,4 +49,16 @@ public class AgencySubResultDTO implements Serializable { * 当前组织的所有上级组织Id */ private String pids = ""; + /** + * 组织级别 + */ + private String level = ""; + /** + * 组织经度【没值取根组织的值】 + */ + private String longitude = ""; + /** + * 组织维度【没值取根组织的值】 + */ + private String latitude = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 9528ff6704..8422de2c41 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -314,7 +314,7 @@ public class CustomerGridController { * @Author sun * @Description 查询组织直属网格列表 **/ - @PostMapping("getGridIListByAgency/{agencyId}") + @PostMapping("getgridilistbyagency/{agencyId}") public Result> gridListByAgencyId(@PathVariable("agencyId") String agencyId) { return new Result>().ok(customerGridService.gridListByAgencyId(agencyId)); } 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 88ad6386d6..f5bca602f9 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 @@ -178,13 +178,30 @@ - SELECT COUNT(issueId) AS count,categoryCode,categoryName,colour FROM + SELECT COUNT(issueId) AS count,categoryCode,categoryName,color FROM (SELECT i.ID AS issueId, IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode, IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName, - IFNULL(cd.colour,'#0091ed') AS colour + IFNULL(cd.color,'#0091ed') AS color FROM issue i LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0') LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 7730d467f4..2188bf2ea5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -251,7 +251,7 @@ CATEGORY_CODE, CATEGORY_NAME, LENGTH(CATEGORY_CODE) AS codeLength, - IFNULL(colour,'') AS colour + IFNULL(color,'') AS colour FROM issue_project_category_dict WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} From ffb4ce8b7a1141b6b329d6cf7b8df939046cae54 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Dec 2021 12:05:35 +0800 Subject: [PATCH 542/589] =?UTF-8?q?=E6=97=A7=E6=8E=A5=E5=8F=A3=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=8F=82=20=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E8=BF=94=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E6=B2=A1=E5=80=BC?= =?UTF-8?q?=E5=B0=B1=E5=8F=96=E6=A0=B9=E7=BB=84=E7=BB=87=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AgencyTreeResultDTO.java | 4 ++ .../epmet/dto/result/ExtGridResultDTO.java | 4 ++ .../result/ExtStaffPermissionResultDTO.java | 4 ++ .../impl/CustomerAgencyServiceImpl.java | 6 ++ .../resources/mapper/CustomerAgencyDao.xml | 59 ++++++++++++++++++- 5 files changed, 74 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java index 3afae3011a..d436feb7c3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java @@ -26,6 +26,10 @@ public class AgencyTreeResultDTO implements Serializable { private String pid; private String level; + //经度【没值则取跟客户的值】 + private String longitude; + //维度【没值则取跟客户的值】 + private String latitude; /** * 下级机关组织 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java index 90641f29d4..5040a89fde 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java @@ -28,4 +28,8 @@ public class ExtGridResultDTO implements Serializable { * 当前gridId所属的客户id add02.03 * */ private String customerId; + //经度【没值则取跟客户的值】 + private String longitude; + //维度【没值则取跟客户的值】 + private String latitude; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java index fbaf784c25..1621261359 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java @@ -50,4 +50,8 @@ public class ExtStaffPermissionResultDTO implements Serializable { * 当前agencyId所属的客户id add02.03 * */ private String customerId; + //经度【没值则取跟客户的值】 + private String longitude; + //维度【没值则取跟客户的值】 + private String latitude; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index de90539444..af54282dbf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1119,6 +1119,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl()); @@ -1153,6 +1157,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl()); } 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 f5bca602f9..eeca702112 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 @@ -275,11 +275,15 @@ + + + + @@ -310,7 +314,23 @@ agency.ID AS agencyId, agency.ORGANIZATION_NAME AS agencyName, agency.LEVEL AS level, - agency.CUSTOMER_ID as customerId + agency.CUSTOMER_ID as customerId, + ( CASE WHEN agency.longitude is null THEN + ( SELECT longitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE agency.longitude + END + ) longitude, + ( CASE WHEN agency.latitude is null THEN + ( SELECT latitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE agency.latitude + END + ) latitude FROM CUSTOMER_AGENCY agency WHERE @@ -334,9 +354,26 @@ SELECT cg.id AS gridId, cg.GRID_NAME AS gridName, - cg.CUSTOMER_ID AS customerId + cg.CUSTOMER_ID AS customerId, + ( CASE WHEN ca.longitude is null THEN + ( SELECT longitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE ca.longitude + END + ) longitude, + ( CASE WHEN ca.latitude is null THEN + ( SELECT latitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE ca.latitude + END + ) latitude FROM customer_grid cg + INNER JOIN customer_agency ca ON cg.PID = ca.ID WHERE cg.DEL_FLAG = '0' AND cg.PID =#{agencyId} @@ -347,7 +384,23 @@ agency.ID AS agencyId, agency.ORGANIZATION_NAME AS agencyName, agency.LEVEL AS level, - agency.CUSTOMER_ID as customerId + agency.CUSTOMER_ID as customerId, + ( CASE WHEN agency.longitude is null THEN + ( SELECT longitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE agency.longitude + END + ) longitude, + ( CASE WHEN agency.latitude is null THEN + ( SELECT latitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE agency.latitude + END + ) latitude FROM CUSTOMER_AGENCY agency WHERE From 76375c3c7880a47f1442c067cd7dba0b8181a96f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Dec 2021 13:41:31 +0800 Subject: [PATCH 543/589] =?UTF-8?q?=E8=8D=89=E4=BB=96=E5=A6=88=E7=9A=84?= =?UTF-8?q?=E9=83=BD=E8=A6=81=E6=9C=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govproject/result/ProjectStatusListResultDTO.java | 2 +- .../src/main/resources/mapper/govproject/ProjectDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java index 81ef72e7b0..bf74adac49 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java @@ -23,7 +23,7 @@ public class ProjectStatusListResultDTO implements Serializable { //经度 private String longitude; //纬度 - private String dimension; + private String latitude; //项目标题 private String title; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 29ccb588ad..0282677e40 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -163,7 +163,7 @@ origin origin, `status` status, locate_longitude longitude, - locate_dimension dimension, + locate_dimension latitude, title title FROM project From 9268b781f8a3f51962a2de1912f2f8af17cdf77c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 14:18:00 +0800 Subject: [PATCH 544/589] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AAorgLevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/AgencyTreeResultDTO.java | 5 +++++ .../com/epmet/service/impl/CustomerAgencyServiceImpl.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java index d436feb7c3..a11739f0a0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java @@ -30,6 +30,11 @@ public class AgencyTreeResultDTO implements Serializable { private String longitude; //维度【没值则取跟客户的值】 private String latitude; + + /** + * 前端level跟及联组件字段名一样，被覆盖，所以加了个一样的 + */ + private String orgLevel; /** * 下级机关组织 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index af54282dbf..df0330fca5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1119,6 +1119,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl()); @@ -1156,6 +1158,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl Date: Mon, 13 Dec 2021 14:32:36 +0800 Subject: [PATCH 545/589] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=94=B9=E4=B8=AA=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiDemandDictDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml index be50e98601..d9d79ecaec 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml @@ -141,7 +141,7 @@ AND m.CATEGORY_CODE =#{firstCategoryCode} ORDER BY - m.CREATED_TIME DESC + m.CREATED_TIME DESC,m.sort desc @@ -163,7 +163,7 @@ AND m.CUSTOMER_ID = #{customerId} AND m.PARENT_CODE = #{parentCode} ORDER BY - m.CREATED_TIME DESC + m.CREATED_TIME DESC,m.sort desc From e901deaff604606824384b472a91a1b13b2e837a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 14:45:55 +0800 Subject: [PATCH 546/589] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AAorgLevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/AgencyTreeResultDTO.java | 2 +- .../com/epmet/service/impl/CustomerAgencyServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java index a11739f0a0..4d48b54960 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java @@ -32,7 +32,7 @@ public class AgencyTreeResultDTO implements Serializable { private String latitude; /** - * 前端level跟及联组件字段名一样，被覆盖，所以加了个一样的 + * orgId-orgLevel */ private String orgLevel; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index df0330fca5..f70fdd035a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1119,7 +1119,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl()); @@ -1158,7 +1158,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl Date: Mon, 13 Dec 2021 15:19:59 +0800 Subject: [PATCH 547/589] total --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 4a2b4821e2..6835ce4b4b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1602,7 +1602,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp throw new EpmetException("查询人员姓名失败..."); } // 默认最多50 产品要求 - Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal())); + Integer total = pageInfo.getSize(); result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total); // 赋值展示名字 list.forEach(l -> { From 08ed2cefce3a4d477b36f218210040276ab5d12c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Dec 2021 15:36:22 +0800 Subject: [PATCH 548/589] warn --- .../main/java/com/epmet/service/impl/IcBuildingServiceImpl.java | 2 +- .../java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java | 2 +- .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index c1d5c440e3..ea85e2ce33 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -115,7 +115,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl getBuildingOptions(String neighborHoodId) { if (StringUtils.isBlank(neighborHoodId)) { - log.error("小区ID为空"); + log.warn("小区ID为空"); return Collections.emptyList(); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java index 2a4a325856..4b8cb1f094 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java @@ -115,7 +115,7 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl getUnitOptions(String buildingId) { if (StringUtils.isBlank(buildingId)) { - log.error("楼栋ID为空"); + log.warn("楼栋ID为空"); return Collections.emptyList(); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 914bc68a56..b6d0585694 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -127,7 +127,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHouseOption(HouseFormDTO formDTO) { if (StringUtils.isBlank(formDTO.getBuildingId()) && StringUtils.isBlank(formDTO.getUnitId())) { - log.error("楼栋和单元ID为空"); + log.warn("楼栋和单元ID为空"); return Collections.emptyList(); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); From 9616152d18c8218dd66d510dfc6457ffaeaec35e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 13 Dec 2021 15:43:02 +0800 Subject: [PATCH 549/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BF=97=E6=84=BF=E8=80=85=E5=88=86=E5=B8=83?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/heart/HeartVolunteerService.java | 2 +- .../heart/impl/HeartVolunteerServiceImpl.java | 12 ++-- .../epmet/service/impl/DemandServiceImpl.java | 59 ++++++++----------- 3 files changed, 31 insertions(+), 42 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java index abccaae1e6..b8e4414f60 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java @@ -11,5 +11,5 @@ import java.util.List; *@Date 2021/12/8 */ public interface HeartVolunteerService { - List listVolunteersPage(String customerId, Date endCreateTime, Integer pageNum, Integer pageSize); + List listVolunteers(String customerId, Date endCreateTime); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java index c95fd094fe..d9a931072b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java @@ -29,12 +29,10 @@ public class HeartVolunteerServiceImpl implements HeartVolunteerService { private VolunteerInfoDao volunteerInfoDao; @Override - public List listVolunteersPage(String customerId, Date endCreateTime, Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPage(() -> { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(VolunteerInfoEntity::getCustomerId, customerId); - query.lt(VolunteerInfoEntity::getCreatedTime, endCreateTime); - volunteerInfoDao.selectList(query); - }); + public List listVolunteers(String customerId, Date endCreateTime) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(VolunteerInfoEntity::getCustomerId, customerId); + query.lt(VolunteerInfoEntity::getCreatedTime, endCreateTime); + volunteerInfoDao.selectList(query); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java index 7782226923..e165e95a75 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java @@ -67,11 +67,12 @@ public class DemandServiceImpl implements DemandService { /** * 清理旧数据 - * @param yestoday + * @param targetDate 要清理哪天的数据 + * @param customerIds 要清理哪些客户的 */ - private void clearOldDatas(List customerIds, Date yestoday) { + private void clearOldDatas(List customerIds, Date targetDate) { - String dateDimId = DimIdGenerator.getDateDimId(yestoday); + String dateDimId = DimIdGenerator.getDateDimId(targetDate); demandStatsService.clearVolunteerDemandServiceDailyStats(customerIds, dateDimId); @@ -90,50 +91,40 @@ public class DemandServiceImpl implements DemandService { // 居民志愿者数量 Integer resiVolunteerCount = 0; + // 党员志愿者用户id列表 List partymemberVolunteerUserIds = new ArrayList<>(16); - int pageNum = 1; - int volunteerPageSize = 5; + List volunteers = heartVolunteerService.listVolunteers(customerId, endTime); - while (true) { - - int shardingStartIndex = 0; - int shardingSize = 2; + volunteerTotalCount = volunteers.size(); - List volunteersPage = heartVolunteerService.listVolunteersPage(customerId, endTime, pageNum, volunteerPageSize); + // 分片开始下标 + int shardingStartIndex = 0; + // 分片大小(条数) + int shardingSize = 2; + + // 分片去确定党员身份，防止in条件过大 + while (true) { + int realShardingSize = Math.min(shardingSize, volunteerTotalCount - shardingStartIndex); - // 如果查询结果为0，说明没有更多的志愿者了 - if (volunteersPage.size() == 0) { + if (realShardingSize <= 0) { break; } - volunteerTotalCount += volunteersPage.size(); - - // 分片去确定党员身份 - while (true) { - int realShardingSize = Math.min(shardingSize, volunteersPage.size() - shardingStartIndex); + int shardingEndIndex = shardingStartIndex + realShardingSize; + List volunteerUserIds = volunteers.subList(shardingStartIndex, shardingEndIndex) + .stream() + .map((volunteerInfoEntity) -> volunteerInfoEntity.getUserId()) + .collect(Collectors.toList()); - if (realShardingSize == 0) { - break; - } - - int shardingEndIndex = shardingStartIndex + realShardingSize; - List volunteerUserIds = volunteersPage.subList(shardingStartIndex, shardingEndIndex) - .stream() - .map((volunteerInfoEntity) -> volunteerInfoEntity.getUserId()) - .collect(Collectors.toList()); - - List tempPartymemberUserIds = userService.filterUserIds(volunteerUserIds, EpmetRoleKeyConstant.PARTYMEMBER); + List tempPartymemberUserIds = userService.filterUserIds(volunteerUserIds, EpmetRoleKeyConstant.PARTYMEMBER); - partymemberVolunteerUserIds.addAll(tempPartymemberUserIds); - - shardingStartIndex = shardingEndIndex; - } + partymemberVolunteerUserIds.addAll(tempPartymemberUserIds); - pageNum++; + shardingStartIndex = shardingEndIndex; } - partymemberVolunteerCount += partymemberVolunteerUserIds.size(); + partymemberVolunteerCount = partymemberVolunteerUserIds.size(); resiVolunteerCount = volunteerTotalCount - partymemberVolunteerCount; //2. 查询志愿者服务次数 From b5d1790bff3f6a67d51fd264faff66755e879b72 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 13 Dec 2021 15:57:28 +0800 Subject: [PATCH 550/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=86=E5=B8=83=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/VolunteerDistributionResultDTO.java | 2 +- .../main/java/com/epmet/service/impl/VolunteerServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java index c1bb3d866c..94a4d4ac88 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java @@ -27,7 +27,7 @@ public class VolunteerDistributionResultDTO { @Data public static class Distribution { - private Set volunteerTypes; + private Set volunteerCategories; private String epmetUserId; private String icResiUserId; private String longitude; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java index f0e2796a98..d259315211 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java @@ -162,7 +162,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); - distribution.setVolunteerTypes(volunteerTypes); + distribution.setVolunteerCategories(volunteerTypes); distribution.setEpmetUserId(userBaseInfo.getUserId()); distribution.setIcResiUserId(icResiUserInfo.getId()); Optional.of(building).ifPresent(b -> { From 302c72d7bbc0f578478b5f22776eb790e44a79f8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 13 Dec 2021 15:58:59 +0800 Subject: [PATCH 551/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=86=E5=B8=83=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java index d9a931072b..902a6a8713 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java @@ -33,6 +33,6 @@ public class HeartVolunteerServiceImpl implements HeartVolunteerService { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(VolunteerInfoEntity::getCustomerId, customerId); query.lt(VolunteerInfoEntity::getCreatedTime, endCreateTime); - volunteerInfoDao.selectList(query); + return volunteerInfoDao.selectList(query); } } From 5a420886a1fa7615e31e1e75c2795db1febbd098 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 16:00:37 +0800 Subject: [PATCH 552/589] =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IssueProjectCategoryDictDao.xml | 2 +- .../src/main/java/com/epmet/dto/result/CategoryListDTO.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 2188bf2ea5..06c1fc0000 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -251,7 +251,7 @@ CATEGORY_CODE, CATEGORY_NAME, LENGTH(CATEGORY_CODE) AS codeLength, - IFNULL(color,'') AS colour + IFNULL(color,'') AS color FROM issue_project_category_dict WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java index a32b7125ea..8003cdfd0b 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java @@ -25,6 +25,8 @@ public class CategoryListDTO implements Serializable { */ private String categoryName; + private String color; + /** * 个数 */ From 7112bd44c6aa0fe7f0db8fe0fe288ab74a329b22 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 13 Dec 2021 16:02:48 +0800 Subject: [PATCH 553/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/OptionDataResultDTO.java | 1 + .../service/impl/IcResiUserServiceImpl.java | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java index 78f77a850b..5f815c7f5c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java @@ -15,4 +15,5 @@ public class OptionDataResultDTO implements Serializable { private String label; private String value; private String code; + private String radio; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index cf10024449..2fad36a652 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -70,6 +70,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Date; import java.sql.Timestamp; import java.util.*; @@ -972,17 +974,28 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); Map map = new HashMap<>(); + int total = 0; //统计组织下各年龄范围人数 List list = baseDao.getPartyMemberAgeStatistics(formDTO.getOrgType(), formDTO.getOrgId()); if (CollectionUtils.isNotEmpty(list)) { map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); + total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum(); } Map finalMap = map; + int finalTotal = total; return dictResult.getData().stream().map(item -> { OptionDataResultDTO dto = new OptionDataResultDTO(); dto.setCode(item.getValue()); dto.setLabel(item.getLabel()); dto.setValue(null == finalMap.get(item.getValue())?NumConstant.ZERO_STR:finalMap.get(item.getValue())); + BigDecimal radio = new BigDecimal("0.00"); + if (NumConstant.ZERO != finalTotal) { + BigDecimal sum = new BigDecimal(finalTotal); + BigDecimal count = new BigDecimal(dto.getValue()); + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + radio = count.multiply(hundred).divide(sum, NumConstant.TWO, RoundingMode.HALF_UP); + } + dto.setRadio(radio.stripTrailingZeros().toString().concat("%")); return dto; }).collect(Collectors.toList()); } @@ -1022,15 +1035,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new HashMap<>(); //统计组织下文化程度党员人数 List list = baseDao.getPartyMemberEducationStatistics(formDTO.getOrgType(), formDTO.getOrgId()); + int total = 0; if (CollectionUtils.isNotEmpty(list)) { map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); + total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum(); } Map finalMap = map; + int finalTotal = total; return dictResult.getData().stream().map(item -> { OptionDataResultDTO dto = new OptionDataResultDTO(); dto.setCode(item.getValue()); dto.setLabel(item.getLabel()); dto.setValue(null == finalMap.get(item.getValue())?NumConstant.ZERO_STR:finalMap.get(item.getValue())); + BigDecimal radio = new BigDecimal("0.00"); + if (NumConstant.ZERO != finalTotal) { + BigDecimal sum = new BigDecimal(finalTotal); + BigDecimal count = new BigDecimal(dto.getValue()); + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + radio = count.multiply(hundred).divide(sum, NumConstant.TWO, RoundingMode.HALF_UP); + } + dto.setRadio(radio.stripTrailingZeros().toString().concat("%")); return dto; }).collect(Collectors.toList()); } From 974da27bc08a93f56f9cb26e2e7d6fdeb8a92f3a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 16:12:01 +0800 Subject: [PATCH 554/589] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IssueServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/IssueDao.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 6835ce4b4b..f433bd60ed 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1588,11 +1588,12 @@ public class IssueServiceImpl extends BaseServiceImpl imp } // 分类编码长度 Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length)); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + List allList = baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(), length); + if (CollectionUtils.isEmpty(allList)){ return new ResiBuzzResultDTO(); } + List list = allList.stream().skip(formDTO.getPageSize() * (formDTO.getPageNo() - NumConstant.ONE)) + .limit(formDTO.getPageSize()).collect(Collectors.toList()); AtomicReference no = new AtomicReference<>((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE); ResiBuzzResultDTO result = new ResiBuzzResultDTO(); UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); @@ -1602,8 +1603,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp throw new EpmetException("查询人员姓名失败..."); } // 默认最多50 产品要求 - Integer total = pageInfo.getSize(); - result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total); + result.setTotal(allList.size()); // 赋值展示名字 list.forEach(l -> { l.setSort(no.getAndSet(no.get() + NumConstant.ONE)); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index d955db65ef..8bfe2b9bf9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -622,7 +622,7 @@ AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) - ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC + ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50 From e4af2c23d23a0c002ad972a8f4a0ec775d926675 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Dec 2021 16:30:11 +0800 Subject: [PATCH 555/589] =?UTF-8?q?resi/group/topic/gettopicdetail?= =?UTF-8?q?=E8=BF=94=E5=9B=9EgridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ResiTopicIncludeIssueDetailResultDTO.java | 3 +++ .../modules/topic/service/impl/ResiTopicServiceImpl.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java index 2bce88383f..9af69706cd 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.topic.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -90,4 +91,6 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable { * 话题被屏蔽详情 */ private TopicHiddenDetailDTO hiddenDetail; + + private String gridName; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 9e67dcd909..a41c97fc27 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -886,6 +886,15 @@ public class ResiTopicServiceImpl extends BaseServiceImpl gridInfoRes=govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO); + if(gridInfoRes.success()&&null!=gridInfoRes.getData()){ + resultDTO.setGridName(gridInfoRes.getData().getGridNamePath()); + } + } //2.查询话题附件 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); From 950bb3fb142f35f78820bcc6f5cc7f54e0a079e7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Dec 2021 16:34:30 +0800 Subject: [PATCH 556/589] =?UTF-8?q?/resi/hall/issue/detail=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0shiftIssueTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/IssueResultDTO.java | 4 ++++ .../gov-issue-server/src/main/resources/mapper/IssueDao.xml | 3 ++- .../main/java/com/epmet/dto/result/IssueDetailResultDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/result/IssueResultDTO.java | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java index c2dbdb85eb..f63ea2d492 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -49,4 +51,6 @@ public class IssueResultDTO implements Serializable { */ private String gridName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date shiftIssueTime; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 8bfe2b9bf9..3d1d2bde61 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -36,7 +36,8 @@ issue_status AS issueStatus, suggestion AS issueSuggestion, grid_id AS gridId, - created_by AS userId + created_by AS userId, + CREATED_TIME as shiftIssueTime FROM issue WHERE diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index 295522ae79..69ebc4476c 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java @@ -1,9 +1,11 @@ package com.epmet.dto.result; import com.epmet.dto.TopicInfoDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -74,4 +76,7 @@ public class IssueDetailResultDTO implements Serializable { * 态度 - opposition（反对）support（赞成） */ private String attitude; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date shiftIssueTime; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java index b278b9f585..e1360eb01b 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -44,5 +46,7 @@ public class IssueResultDTO implements Serializable { */ private String topicId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date shiftIssueTime; } From ba13a313ad7cb6dc6ca6ed1e0f5119384afc34c1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 16:44:26 +0800 Subject: [PATCH 557/589] =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/{V0.0.15__add_colour.sql => V0.0.15__add_color.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.15__add_colour.sql => V0.0.15__add_color.sql} (100%) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_color.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_color.sql From 2d934e9892a0b939d943b9cddeee2ad221bf84b4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 13 Dec 2021 16:46:54 +0800 Subject: [PATCH 558/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcPartyActivityServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index cd80f55b72..819f7bb94f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -339,7 +339,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()); + wrapper.and(wp -> wp.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()).or(). + like(IcPartyActivityEntity::getPids, formDTO.getAgencyId())); wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter()); wrapper.ge(null != formDTO.getStartTime(),IcPartyActivityEntity::getActivityTime, formDTO.getStartTime()); wrapper.le(null != formDTO.getEndTime(), IcPartyActivityEntity::getActivityTime, formDTO.getEndTime()); From ef3eb202fabbaaee66e8e7d152d65d382ac890db Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 16:50:59 +0800 Subject: [PATCH 559/589] =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/{V0.0.15__add_color.sql => V0.0.16__add_color.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.15__add_color.sql => V0.0.16__add_color.sql} (100%) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_color.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.16__add_color.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_color.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.16__add_color.sql From afff88835ae6d6aab2d0d8a43d409f9e827df4c3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 13 Dec 2021 17:11:15 +0800 Subject: [PATCH 560/589] =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/{V0.0.16__add_color.sql => V0.0.17__add_color.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.16__add_color.sql => V0.0.17__add_color.sql} (100%) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.16__add_color.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.17__add_color.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.16__add_color.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.17__add_color.sql From 5b7ceebe5aec49d2abed54bbe8aaf747783abada Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 13 Dec 2021 17:45:58 +0800 Subject: [PATCH 561/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcPartyActivityServiceImpl.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 819f7bb94f..9258767df3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -72,6 +72,10 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl search(PartyActivityFormDTO formDTO) { @@ -152,7 +156,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class); dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); @@ -213,7 +217,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getLabel, OptionDTO::getValue)); //获取联建单位 IcPartyUnitDTO unitDTO = new IcPartyUnitDTO(); @@ -338,6 +342,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.and(wp -> wp.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()).or(). like(IcPartyActivityEntity::getPids, formDTO.getAgencyId())); @@ -351,11 +356,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + //获取服务事项字典 SubCodeFormDTO codeFormDTO = new SubCodeFormDTO(); codeFormDTO.setCustomerId(tokenDto.getCustomerId()); - codeFormDTO.setParentCategoryCode("1010"); + codeFormDTO.setParentCategoryCode(SERVICE_MATTER_CODE); Map categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + //数据组装 dtoList.forEach(dto -> { dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); dto.setUnitName(option.get(dto.getUnitId())); @@ -365,9 +373,16 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl(dtoList, pageInfo.getTotal()); } + /** + * 近30天开始时间和结束时间 （精确到秒） + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2021/12/13 17:40 + */ private void setDate(PartyActivityFormDTO formDTO) { String start = DateUtils.getBeforeNDay(30); - formDTO.setEndTime(DateUtils.parse(start.concat("000000"), DateUtils.DATE_TIME_NO_SPLIT)); + formDTO.setStartTime(DateUtils.parse(start.concat("000000"), DateUtils.DATE_TIME_NO_SPLIT)); String end = DateUtils.format(new Date(), DateUtils.DATE_PATTERN); formDTO.setEndTime(DateUtils.parse(end.concat(" 23:59:59"), DateUtils.DATE_TIME_PATTERN)); } From 5d6474621178e70a7bd45ad21688012895fbcc68 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 13 Dec 2021 22:35:47 +0800 Subject: [PATCH 562/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=86=E5=B8=83=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/DemandServiceCountResultDTO.java | 4 +++ .../dao/heart/IcUserDemandServiceDao.java | 2 +- .../service/heart/HeartDemandService.java | 2 +- .../heart/impl/HeartDemandServiceImpl.java | 4 +-- .../epmet/service/impl/DemandServiceImpl.java | 31 ++++++++++--------- .../mapper/heart/IcUserDemandServiceDao.xml | 7 +++-- .../epmet/controller/VolunteerController.java | 6 ---- .../service/impl/VolunteerServiceImpl.java | 13 ++++---- 8 files changed, 35 insertions(+), 34 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java index 57cc894ae4..16cbee4538 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java @@ -10,6 +10,10 @@ import lombok.Data; */ @Data public class DemandServiceCountResultDTO { + // 服务者ID private String serverId; + // 服务类型 private String serviceType; + // 服务次数 + private int serveTimes; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java index 602c04da5e..165ae6b91c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java @@ -40,5 +40,5 @@ public interface IcUserDemandServiceDao extends BaseDao listDemandServiceCountPage(@Param("customerId") String customerId, @Param("endTime") Date endTime, @Param("serviceType") String serviceType); + List listDemandServeTimes(@Param("customerId") String customerId, @Param("endTime") Date endTime, @Param("serviceType") String serviceType); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java index 1a106fa881..baaa29c97b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java @@ -11,5 +11,5 @@ import java.util.List; *@Date 2021/12/8 */ public interface HeartDemandService { - List listDemandServiceCountPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize); + List listDemandServeTimesPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java index a4192fcd30..c33f426ad5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java @@ -29,11 +29,11 @@ public class HeartDemandServiceImpl implements HeartDemandService { private IcUserDemandServiceDao demandServiceDao; @Override - public List listDemandServiceCountPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize) { + public List listDemandServeTimesPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize) { return PageHelper.startPage(serviceCountPageNo, serviceCountPageSize).doSelectPage(new ISelect() { @Override public void doSelect() { - demandServiceDao.listDemandServiceCountPage(customerId, endTime, "volunteer"); + demandServiceDao.listDemandServeTimes(customerId, endTime, "volunteer"); } }); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java index e165e95a75..66cbf1058d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java @@ -101,7 +101,7 @@ public class DemandServiceImpl implements DemandService { // 分片开始下标 int shardingStartIndex = 0; // 分片大小(条数) - int shardingSize = 2; + int shardingSize = 100; // 分片去确定党员身份，防止in条件过大 while (true) { @@ -130,43 +130,44 @@ public class DemandServiceImpl implements DemandService { //2. 查询志愿者服务次数 // 总服务次数 - int totalDemandServiceCount = 0; + int totalDemandServeTimes = 0; // 党员服务次数 - int partymemberDemandServiceCount = 0; + int partymemberDemandServeTimes = 0; // 居民服务次数 - int resiDemandServiceCount = 0; + int resiDemandServeTimes = 0; int serviceCountPageNo = 0; int serviceCountPageSize = 1000; while (true) { - List damendServiceCounts = heartDemandService.listDemandServiceCountPage(customerId, endTime, serviceCountPageNo, serviceCountPageSize); + // 取出每一个服务者的服务次数 + List damendServeTimes = heartDemandService.listDemandServeTimesPage(customerId, endTime, serviceCountPageNo, serviceCountPageSize); - for (DemandServiceCountResultDTO damendServiceCount : damendServiceCounts) { - String serverId = damendServiceCount.getServerId(); + for (DemandServiceCountResultDTO damendServiceTimes : damendServeTimes) { + String serverId = damendServiceTimes.getServerId(); if (partymemberVolunteerUserIds.contains(serverId)) { - partymemberDemandServiceCount++; + partymemberDemandServeTimes += damendServiceTimes.getServeTimes(); } else { - resiDemandServiceCount++; + resiDemandServeTimes += damendServiceTimes.getServeTimes(); } } - totalDemandServiceCount += damendServiceCounts.size(); - - if (damendServiceCounts.size() <= serviceCountPageSize) { + if (damendServeTimes.size() <= serviceCountPageSize) { break; } } + totalDemandServeTimes = partymemberDemandServeTimes + resiDemandServeTimes; + // 3.持久化 FactVolunteerServiceDailyEntity insert = new FactVolunteerServiceDailyEntity(); insert.setDateId(DimIdGenerator.getDateDimId(belongTime)); insert.setCustomerId(customerId); insert.setMonthId(DimIdGenerator.getMonthDimId(belongTime)); - insert.setPartyServiceTotal(partymemberDemandServiceCount); - insert.setServiceTotal(totalDemandServiceCount); + insert.setPartyServiceTotal(partymemberDemandServeTimes); + insert.setServiceTotal(totalDemandServeTimes); insert.setPartyTotal(partymemberVolunteerCount); - insert.setResiServiceTotal(resiDemandServiceCount); + insert.setResiServiceTotal(resiDemandServeTimes); insert.setResiTotal(resiVolunteerCount); insert.setVolunteerTotal(volunteerTotalCount); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml index 1c13f56e87..ddebabef66 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml @@ -20,14 +20,15 @@ - + select service.SERVER_ID, SERVICE_TYPE, count(1) as SERVE_TIMES from ic_user_demand_rec damend inner join ic_user_demand_service service on (damend.ID = service.DEMAND_REC_ID and service.DEL_FLAG = 0) where damend.DEL_FLAG = 0 and damend.STATUS = 'finished' - and damend.REPORT_TIME #{endTime} and damend.CUSTOMER_ID = #{customerId} + and service.SERVICE_END_TIME #{endTime} and service.SERVICE_TYPE = #{serviceType} + group by service.SERVER_ID, SERVICE_TYPE \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java index 40ea2d8807..aedfe54e49 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java @@ -29,11 +29,6 @@ public class VolunteerController { @Autowired private VolunteerService volunteerService; - //public VolunteerController(VolunteerService volunteerService, IcResiUserDao icResiUserDao, GovOrgOpenFeignClient govOrgOpenFeignClient) { - // this.volunteerService = volunteerService; - // System.out.println(this); - //} - /** * 志愿者分布查询 * @@ -42,7 +37,6 @@ public class VolunteerController { */ @PostMapping("distribution") public Result getVolunteerDistribution(@RequestBody VolunteerCommonFormDTO input) { - System.out.println(this); ValidatorUtils.validateEntity(input, VolunteerCommonFormDTO.GetVolunteerDistribution.class); String customerId = input.getCustomerId(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java index d259315211..edc1149e6f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java @@ -141,15 +141,16 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve continue; } - List volunteer = icResiUserDao.selectVolunteerByUserId(icResiUserInfo.getId()); - if (CollectionUtils.isEmpty(volunteer)) { - // 此人没有志愿者信息 - continue; - } + // 查询志愿者类别 + List volunteerCategories = icResiUserDao.selectVolunteerByUserId(icResiUserInfo.getId()); + //if (CollectionUtils.isEmpty(volunteerCategories)) { + // // 此人没有志愿者信息 + // continue; + //} // 将志愿者类型列表字符串，切割放到set中 Set volunteerTypes = new HashSet(); - for (String vTypesString : volunteer) { + for (String vTypesString : volunteerCategories) { String[] vTypes = vTypesString.split(","); if (vTypes != null && vTypes.length > 0) { volunteerTypes.addAll(Arrays.asList(vTypes)); From 93f1ef9feff590b9927ac4d2bafce3f4377aea3e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 14 Dec 2021 09:36:38 +0800 Subject: [PATCH 563/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcPartyActivityServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 9258767df3..57fda0e82e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -154,12 +154,18 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class); dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); + //获取单位名称 + IcPartyUnitDTO unitDTO = icPartyUnitService.get(dto.getUnitId()); + if (null != unitDTO) { + dto.setUnitName(unitDTO.getUnitName()); + } return dto; } From e8d5005f0dc4bc1ad5d9fc29ffa94053d5103840 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 10:41:18 +0800 Subject: [PATCH 564/589] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=8E=BB=E6=8E=89=E5=85=A5=E5=8F=82=E7=9A=84?= =?UTF-8?q?pid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/demand/CategoryAnalysisFormDTO.java | 3 +- .../form/demand/PageListAnalysisFormDTO.java | 6 ++-- .../impl/IcUserDemandRecServiceImpl.java | 29 ++++++++----------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java index f4e792f75e..30605910cf 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java @@ -22,8 +22,7 @@ public class CategoryAnalysisFormDTO implements Serializable { @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class) private String orgId; - @NotBlank(message = "组织或网格的上级", groups = PageListAnalysisFormDTO.AddUserShowGroup.class) - private String pid; + @NotBlank(message = "组织:agency,网格：grid", groups = AddUserShowGroup.class) private String orgType; @NotBlank(message = "起止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java index 9add161aca..b48063a722 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java @@ -27,10 +27,9 @@ public class PageListAnalysisFormDTO implements Serializable { @NotNull(message = "每页数量不能为空", groups = AddUserInternalGroup.class) private Integer pageSize; - @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class) + @NotBlank(message = "先选择组织或网格不能为空", groups = AddUserShowGroup.class) private String orgId; - @NotBlank(message = "组织或网格的上级", groups = AddUserShowGroup.class) - private String pid; + @NotBlank(message = "orgType=grid或者agency,不能为空", groups = AddUserInternalGroup.class) private String orgType; @@ -49,4 +48,5 @@ public class PageListAnalysisFormDTO implements Serializable { private String gridPids; private Boolean pageFlag; + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index ae0ec89577..b968fe4017 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -47,11 +47,6 @@ import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.IcResiUserBriefDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.demand.*; -import com.epmet.dto.result.demand.DemandRecResultDTO; -import com.epmet.dto.result.demand.FinishResultDTO; -import com.epmet.dto.result.demand.IcResiUserReportDemandRes; -import com.epmet.dto.result.demand.ServiceStatDTO; -import com.epmet.dto.result.demand.*; import com.epmet.entity.*; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -643,15 +638,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl pageListAnalysis(PageListAnalysisFormDTO formDTO) { if("agency".equals(formDTO.getOrgType())){ - if(NumConstant.ZERO_STR.equals(formDTO.getPid())){ + //找到当前组织的所有上级，再拼接上自己 + Result customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); + if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); + } + if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){ //当前传入的组织id=客户的根组织 formDTO.setGridPids(formDTO.getOrgId()); }else{ - //找到当前组织的所有上级，再拼接上自己 - Result customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); - if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); - } formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId())); } } @@ -754,15 +749,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); + if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); + } + if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){ //当前传入的组织id=客户的根组织 formDTO.setGridPids(formDTO.getOrgId()); }else{ - //找到当前组织的所有上级，再拼接上自己 - Result customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId()); - if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById"); - } formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId())); } } From a0776cc4426f0152052124040c7472c104f18afe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 11:09:39 +0800 Subject: [PATCH 565/589] yyyy-MM-dd --- .../dto/form/demand/CategoryAnalysisFormDTO.java | 4 ++-- .../dto/form/demand/PageListAnalysisFormDTO.java | 4 ++-- .../main/resources/mapper/IcUserDemandRecDao.xml | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java index 30605910cf..2e564db7cc 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java @@ -25,9 +25,9 @@ public class CategoryAnalysisFormDTO implements Serializable { @NotBlank(message = "组织:agency,网格：grid", groups = AddUserShowGroup.class) private String orgType; - @NotBlank(message = "起止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class) + @NotBlank(message = "起止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class) private String startDateId; - @NotBlank(message = "截止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class) + @NotBlank(message = "截止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class) private String endDateId; @NotBlank(message = "先选择组织或网格", groups = AddUserInternalGroup.class) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java index b48063a722..464d1062a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java @@ -35,9 +35,9 @@ public class PageListAnalysisFormDTO implements Serializable { @NotBlank(message = "分类编码不能为空", groups = AddUserInternalGroup.class) private String categoryCode; - @NotBlank(message = "上报时间起始日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class) + @NotBlank(message = "上报时间起始日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class) private String startDateId; - @NotBlank(message = "上报时间截止日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class) + @NotBlank(message = "上报时间截止日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class) private String endDateId; @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index ae5a8f6223..69dfd04d84 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -254,10 +254,10 @@ - AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') = ]]> #{startDateId} + AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') = ]]> #{startDateId} - AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') #{endDateId} + AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') #{endDateId} order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc @@ -295,8 +295,8 @@ and m.GRID_PIDS like concat(#{gridPids},'%') - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{category.value},'%') and m.status !='canceled' @@ -328,8 +328,8 @@ and m.GRID_PIDS like concat(#{gridPids},'%') - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{categoryCode},'%') group by s.SERVICE_TYPE @@ -352,8 +352,8 @@ and m.GRID_PIDS like concat(#{gridPids},'%') - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{categoryCode},'%') From 78a4b779d9c42fa98b9d69b5123527ed17c00bde Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 11:49:45 +0800 Subject: [PATCH 566/589] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcUserDemandRecDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 69dfd04d84..953db19cb8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -90,7 +90,7 @@ AND r.GRID_PIDS LIKE concat('%',#{gridPids},'%') - and r.PARENT_CODE=#{categoryCode} + and (r.PARENT_CODE=#{categoryCode} or r.CATEGORY_CODE=#{categoryCode}) and r.CATEGORY_CODE=#{categoryCode} From 6404899d130d3e0f3f51941a1fe14555942dcae1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 14 Dec 2021 13:53:13 +0800 Subject: [PATCH 567/589] emm --- .../gov-issue-server/src/main/resources/mapper/IssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 3d1d2bde61..27d3b05535 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -656,7 +656,7 @@ AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp - GROUP BY categoryCode + GROUP BY categoryName From e087d1a1f413d68630f434db3d55ac9503c862d7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 14:26:26 +0800 Subject: [PATCH 568/589] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E5=88=86=E6=9E=90=E8=BF=94=E5=9B=9EicResiUserId=E6=88=96?= =?UTF-8?q?=E8=80=85epmetUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demand/DemandResearchAnalysisFormDTO.java | 9 ++++- .../dto/result/demand/DemandRecResultDTO.java | 3 ++ .../epmet/constant/UserDemandConstant.java | 8 +++++ .../impl/IcUserDemandRecServiceImpl.java | 30 ++++++++++++++-- .../resources/mapper/IcUserDemandRecDao.xml | 36 +++++++++++++++++-- 5 files changed, 80 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index d40ed7cb8a..ea3f8bcdcd 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -23,7 +23,7 @@ public class DemandResearchAnalysisFormDTO implements Serializable { @NotBlank(message = "firstCategoryCode不能为空",groups = AddUserInternalGroup.class) private String firstCategoryCode; - @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) + //@NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class) private String icResiUserId; private List epmetUserIdList; @@ -31,4 +31,11 @@ public class DemandResearchAnalysisFormDTO implements Serializable { @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) private String customerId; + + /** + * 个人档案：personal-data + * 服务措施分析：demand-analysis + */ + @NotBlank(message = "个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) + private String queryOrigin; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java index feb5c70b84..06052f22cf 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java @@ -114,4 +114,7 @@ public class DemandRecResultDTO implements Serializable { * 完成情况 */ private String finishDesc; + + private String icResiUserId; + private String epmetUserId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java index c28768b30f..85168b8a32 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java @@ -50,4 +50,12 @@ public interface UserDemandConstant { String SOCIAL_ORG="social_org"; String COMMUNITY_ORG="community_org"; String PARTY_UNIT="party_unit"; + + + /** + * 个人档案：personal-data + * 服务措施分析：demand-analysis + */ + String PERSONAL_DATA="personal-data"; + String DEMAND_ANALYSIS="demand-analysis"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index b968fe4017..1edd9d20d5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -42,9 +42,11 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.ResiUserFormDTO; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.IcResiUserBriefDTO; +import com.epmet.dto.result.ResiUserResDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.demand.*; import com.epmet.entity.*; @@ -583,7 +585,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl demandData=new ArrayList<>(); @@ -593,12 +595,34 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl()); demandData.add(demandDataDTO); + //如果是服务措施分析来的，并且是pc录入的需求，需要先去找epmetUserIdList + if(UserDemandConstant.DEMAND_ANALYSIS.equals(formDTO.getQueryOrigin()) + &&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + ResiUserFormDTO resiUserFormDTO=new ResiUserFormDTO(); + resiUserFormDTO.setCustomerId(formDTO.getCustomerId()); + resiUserFormDTO.setIcResiUserId(formDTO.getIcResiUserId()); + Result resiRes=epmetUserOpenFeignClient.findEpmetUser(resiUserFormDTO); + if(!resiRes.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询小程序用户异常"); + } + if (null != resiRes.getData() && CollectionUtils.isNotEmpty(resiRes.getData().getEpmetUserIdList())) { + formDTO.setEpmetUserIdList(resiRes.getData().getEpmetUserIdList()); + } + } //获取当前需求人，相同分类的需求列表。不分页，直接返回所有 List userIds=new ArrayList<>(); - userIds.add(formDTO.getIcResiUserId()); + if(StringUtils.isNotBlank(formDTO.getIcResiUserId())){ + userIds.add(formDTO.getIcResiUserId()); + } if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ userIds.addAll(formDTO.getEpmetUserIdList()); } + if(StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + //需求人不能为空 + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "需求人不能为空，icResiUserId与epmetUserIdList不能同时为空"); + } + + IcResiUserDemandFromDTO icResiUserDemandFromDTO=new IcResiUserDemandFromDTO(); icResiUserDemandFromDTO.setUserIds(userIds); icResiUserDemandFromDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode()); @@ -625,6 +649,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Tue, 14 Dec 2021 14:36:08 +0800 Subject: [PATCH 569/589] =?UTF-8?q?heart=20=E6=97=A5=E5=BF=97=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/src/main/resources/logback-spring.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml index aacc15fdab..df57dd24a6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml @@ -138,10 +138,9 @@ - + - From 40ab38f7bec4a6951919b1d3bd37b9a70bec3ecf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 14 Dec 2021 14:37:20 +0800 Subject: [PATCH 570/589] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcPartyActivityServiceImpl.java | 3 +++ .../epmet/service/impl/IcResiDemandDictServiceImpl.java | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 57fda0e82e..4057d1ba41 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -154,6 +154,9 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl querySubCodeList(SubCodeFormDTO formDTO) { - return baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName()); + List list = baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName()); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list; } @Override From 20f1b885a0d58d538b5fca1dcdd9c2b091453251 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 14:57:12 +0800 Subject: [PATCH 571/589] status --- .../com/epmet/dto/result/demand/IcResiUserReportDemandRes.java | 2 +- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 1 + .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java index 869f1b01e9..19757a671c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java @@ -26,7 +26,7 @@ public class IcResiUserReportDemandRes implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date wantServiceTime; - @JsonIgnore + //@JsonIgnore private String status; private String statusName; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index b14d2d6c02..2725a3f9f3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2958,6 +2958,7 @@ public class ProjectServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (!userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index ed2c5ee690..ab54bfd340 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -688,6 +688,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (!userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); From eaed8608f49c4cc3c4986e686eb735996df8e340 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 14 Dec 2021 16:42:35 +0800 Subject: [PATCH 572/589] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/GovProjectController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 3d70bf2b96..422aa74f4c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -113,8 +113,9 @@ public class GovProjectController { * @author sun */ @PostMapping("projectanalysis") - public Result projectAnalysis(@RequestBody ProjectAnalysisFormDTO formDTO) { + public Result projectAnalysis(@LoginUser TokenDto tokenDto, @RequestBody ProjectAnalysisFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(govProjectService.projectAnalysis(formDTO)); } From e84ea6189827bff9c9b589fe90c30971ffe93a27 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 14 Dec 2021 16:47:18 +0800 Subject: [PATCH 573/589] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java | 2 +- .../epmet/dataaggre/service/epmetuser/EpmetUserService.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 4 ++-- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- .../src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java index 0ac5f211fc..e79c563c0a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java @@ -55,5 +55,5 @@ public interface UserBaseInfoDao extends BaseDao { * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 * @author sun */ - List getUserBaseList(@Param("userId") String userId); + List getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 8b898f8765..6979f5d8b4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -154,7 +154,7 @@ public interface EpmetUserService { * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 * @author sun */ - List getUserBaseList(String userId); + List getUserBaseList(String userId, String customerId); /** * @Description 根据身份证号查询负能平台用户信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ac6ee4a24e..181e037830 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -712,8 +712,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { * @author sun */ @Override - public List getUserBaseList(String userId) { - return userBaseInfoDao.getUserBaseList(userId); + public List getUserBaseList(String userId, String customerId) { + return userBaseInfoDao.getUserBaseList(userId, customerId); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 7c821cffaa..dc84f51bdc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -480,7 +480,7 @@ public class GovProjectServiceImpl implements GovProjectService { ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO(); resultDTO.setUserId(formDTO.getUserId()); //1.查询userId的身份证号在小程序用户中存在的多个userId值 - List userList = epmetUserService.getUserBaseList(formDTO.getUserId()); + List userList = epmetUserService.getUserBaseList(formDTO.getUserId(), formDTO.getCustomerId()); List userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList()); //2.查询对应负能平台用户家庭信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 195e586292..6c118e2ce0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -47,6 +47,7 @@ WHERE del_flag = '0' AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId}) + AND customer_id = #{customerId} \ No newline at end of file From f77aa6e8a26c5222605fef63616a08fc5c101cba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 16:58:15 +0800 Subject: [PATCH 574/589] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demand/DemandResearchAnalysisFormDTO.java | 2 +- .../DemandResearchAnalysisResultDTO.java | 10 +-- .../dto/result/demand/HouseMemResDTO.java | 22 +++++++ .../impl/IcUserDemandRecServiceImpl.java | 66 ++++++++++++++----- .../com/epmet/dto/form/FindIcUserFormDTO.java | 19 ++++++ .../epmet/dto/result/EpmetUserFamilyDTO.java | 35 ++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 9 +++ .../EpmetUserOpenFeignClientFallback.java | 11 ++++ .../com/epmet/controller/UserController.java | 12 ++++ .../src/main/java/com/epmet/dao/UserDao.java | 6 ++ .../java/com/epmet/service/UserService.java | 8 +++ .../epmet/service/impl/UserServiceImpl.java | 29 ++++++++ .../src/main/resources/mapper/UserDao.xml | 22 +++++++ 13 files changed, 225 insertions(+), 26 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index ea3f8bcdcd..a6adc0a695 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -36,6 +36,6 @@ public class DemandResearchAnalysisFormDTO implements Serializable { * 个人档案：personal-data * 服务措施分析：demand-analysis */ - @NotBlank(message = "个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) + @NotBlank(message = "queryOrigin不能为空：个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) private String queryOrigin; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java index 32f0737dc6..4828385812 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result.demand; -import com.epmet.dto.result.HouseUserDTO; import lombok.Data; import java.io.Serializable; @@ -10,15 +9,8 @@ import java.util.List; * 数据分析-个人档案-需求详情，研判分析 */ @Data -public class DemandResearchAnalysisResultDTO implements Serializable { +public class DemandResearchAnalysisResultDTO extends HouseMemResDTO implements Serializable { private static final long serialVersionUID = -1024304149893118204L; - /** - * 居民信息及家属列表 - */ - private String icResiUserId; - private String icUserName; - private String houseId; - private List houseUserList; private List demandData; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java new file mode 100644 index 0000000000..f8126473b5 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result.demand; + +import com.epmet.dto.result.HouseUserDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 数据分析-个人档案-需求详情，研判分析 + * 案件居民、家属 + */ +@Data +public class HouseMemResDTO implements Serializable { + /** + * 居民信息及家属列表 + */ + private String icResiUserId; + private String icUserName; + private String houseId; + private List houseUserList; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 1edd9d20d5..e77ff237cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -42,12 +42,10 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.FindIcUserFormDTO; import com.epmet.dto.form.ResiUserFormDTO; import com.epmet.dto.form.demand.*; -import com.epmet.dto.result.AllGridsByUserIdResultDTO; -import com.epmet.dto.result.IcResiUserBriefDTO; -import com.epmet.dto.result.ResiUserResDTO; -import com.epmet.dto.result.UserBaseInfoResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.result.demand.*; import com.epmet.entity.*; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -579,13 +577,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); - if (!userRes.success() || null == userRes.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); - } - IcResiUserBriefDTO icResiUserDTO = userRes.getData(); - DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, DemandResearchAnalysisResultDTO.class); - + HouseMemResDTO houseMemResDTO=queryDemandUserFamily(formDTO); + DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(houseMemResDTO, DemandResearchAnalysisResultDTO.class); + //log.info(JSON.toJSONString(formDTO)); //返参格式套一层类别和类别名称 List demandData=new ArrayList<>(); @@ -596,13 +590,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl resiRes=epmetUserOpenFeignClient.findEpmetUser(resiUserFormDTO); - if(!resiRes.success()){ + Result resiRes = epmetUserOpenFeignClient.findEpmetUser(resiUserFormDTO); + if (!resiRes.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询小程序用户异常"); } if (null != resiRes.getData() && CollectionUtils.isNotEmpty(resiRes.getData().getEpmetUserIdList())) { @@ -655,6 +650,45 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); + if (!userRes.success() || null == userRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); + } + houseMemResDTO=ConvertUtils.sourceToTarget(userRes.getData(),HouseMemResDTO.class); + } + //服务措施点击了，小程序用户上报的需求 + if (StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())) { + //需要找到当前这个epmetUserIdList相同身份证号的人， + //以及这个身份证号所对应的居民的家属 + FindIcUserFormDTO findIcUserFormDTO=new FindIcUserFormDTO(); + findIcUserFormDTO.setCustomerId(formDTO.getCustomerId()); + findIcUserFormDTO.setEpmetUserId(formDTO.getEpmetUserIdList().get(NumConstant.ZERO)); + Result epmetUserFamilyDTOResult=epmetUserOpenFeignClient.findIcUser(findIcUserFormDTO); + if (!epmetUserFamilyDTOResult.success() || null == epmetUserFamilyDTOResult.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据小程序用户id,获取ic居民信息接口异常"); + } + houseMemResDTO=ConvertUtils.sourceToTarget(epmetUserFamilyDTOResult.getData(),HouseMemResDTO.class); + formDTO.setEpmetUserIdList(epmetUserFamilyDTOResult.getData().getEpmetUserIdList()); + } + return houseMemResDTO; + } + /** * 数分析-服务措施分析-分页查询 * diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java new file mode 100644 index 0000000000..c42fdeac01 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +@Data +public class FindIcUserFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + @NotBlank(message = "epmetUserId不能为空", groups = AddUserInternalGroup.class) + private String epmetUserId; + + @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java new file mode 100644 index 0000000000..9b80c69701 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +@Data +public class EpmetUserFamilyDTO implements Serializable { + /** + * 当前客户下，与自己相同身份证号的所有账号 + */ + private List epmetUserIdList; + + /** + * 同身份证号对应的ic里的居民 + */ + private String icResiUserId; + /** + * ic里的姓名 + */ + private String icUserName; + + /** + * ic里的房子id + */ + private String houseId; + + /** + * 同屋的其他人 + */ + private List houseUserList; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 2fe940ead3..bff8b92a50 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -672,4 +672,13 @@ public interface EpmetUserOpenFeignClient { @GetMapping("/epmetuser/icresiuser/findfamilymem/{icResiUserId}") Result findFamilyMem(@PathVariable("icResiUserId") String icResiUserId); + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param formDTO + * @return + */ + @PostMapping(value = "/epmetuser/user/findicuser") + Result findIcUser(@RequestBody FindIcUserFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index fc6766d255..109c54c0ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -495,4 +495,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result findFamilyMem(String icResiUserId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findFamilyMem", icResiUserId); } + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param epmetUserIdList + * @return + */ + @Override + public Result findIcUser(FindIcUserFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findIcUser", formDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index 66d5d15d7a..5d5870439e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -198,4 +198,16 @@ public class UserController { ValidatorUtils.validateEntity(formDTO,ResiUserFormDTO.AddUserInternalGroup.class); return new Result().ok(userService.findEpmetUser(formDTO)); } + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param findIcUserFormDTO + * @return + */ + @PostMapping(value = "findicuser") + public Result findIcUser(@RequestBody FindIcUserFormDTO findIcUserFormDTO){ + ValidatorUtils.validateEntity(findIcUserFormDTO,FindIcUserFormDTO.AddUserInternalGroup.class); + return new Result().ok(userService.findIcUser(findIcUserFormDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java index e4c7a2cec5..0d77ea3ae3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java @@ -12,6 +12,8 @@ import com.epmet.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description 用户DAO * @IntefaceName UserDao @@ -63,4 +65,8 @@ public interface UserDao extends BaseDao { * @date 2021/9/10 8:51 上午 */ UserDTO selectByUserId(String userId); + + String selectIdNum(@Param("customerId") String customerId,@Param("epmetUserId") String epmetUserId); + + List selectCommonEpmetUser(@Param("idNum") String idNum, @Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 0790655742..132ef019a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -113,4 +113,12 @@ public interface UserService extends BaseService { * @return */ ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO); + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param findIcUserFormDTO + * @return + */ + EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 697fda9582..1d987951bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -385,4 +386,32 @@ public class UserServiceImpl extends BaseServiceImpl implem return resiUserResDTO; } + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param findIcUserFormDTO + * @return + */ + @Override + public EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO) { + EpmetUserFamilyDTO result=new EpmetUserFamilyDTO(); + String idNum=baseDao.selectIdNum(findIcUserFormDTO.getCustomerId(),findIcUserFormDTO.getEpmetUserId()); + if(StringUtils.isNotBlank(idNum)){ + //同客户下，相同身份证号的，epmetuser + List epmetUserIdList=baseDao.selectCommonEpmetUser(idNum,findIcUserFormDTO.getCustomerId()); + result.setEpmetUserIdList(epmetUserIdList); + //找到该身份证号的居民 + IcResiUserDTO icResiUserDTO=icResiUserService.getByIdCard(findIcUserFormDTO.getCustomerId(),idNum,null); + if(null!=icResiUserDTO){ + result.setIcResiUserId(icResiUserDTO.getId()); + result.setIcUserName(icResiUserDTO.getName()); + result.setHouseId(icResiUserDTO.getHomeId()); + IcResiUserBriefDTO icResiUserBriefDTO=icResiUserService.findFamilyMem(icResiUserDTO.getId()); + result.setHouseUserList(null!=icResiUserBriefDTO&&CollectionUtils.isNotEmpty(icResiUserBriefDTO.getHouseUserList())?icResiUserBriefDTO.getHouseUserList():new ArrayList<>()); + } + } + result.setEpmetUserIdList(Arrays.asList(findIcUserFormDTO.getEpmetUserId())); + return result; + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index 6d82e4c200..605350bde2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -82,4 +82,26 @@ u.DEL_FLAG = '0' AND u.id = #{userId} + + + + From 369915a942c5e08b00387ca1bbb4b6ec41680580 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Dec 2021 09:09:57 +0800 Subject: [PATCH 575/589] =?UTF-8?q?org=20=E4=BB=A3=E7=A0=81=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/BuildingServiceImpl.java | 8 ++++---- .../service/impl/IcPlacePatrolRecordServiceImpl.java | 6 +++--- .../impl/IcPlacePatrolReviewRecordServiceImpl.java | 6 +++--- .../service/impl/IcPlacePatrolTeamServiceImpl.java | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index f1c5d28379..24fe5e520a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -88,7 +88,7 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity(); icBuildingUnit.setCustomerId(customerId); icBuildingUnit.setBuildingId(entity.getId()); - icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元"); + icBuildingUnit.setUnitName((i + 1) +"单元"); icBuildingUnit.setUnitNum(String.valueOf(i+1)); unitList.add(icBuildingUnit); } @@ -103,7 +103,7 @@ public class BuildingServiceImpl implements BuildingService { log.error("com.epmet.service.impl.BuildingServiceImpl.treeList，没有找到工作人员所属的机关信息，用户Id：{}",staffId); return new ArrayList<>(); } - + // agency = new CustomerStaffAgencyDTO(); // agency.setAgencyId("77f6bc7f07064bf4c09ef848139a344c"); //1.获取所在组织及下级组织 @@ -275,7 +275,7 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity(); icBuildingUnit.setBuildingId(uuid); icBuildingUnit.setCustomerId(customerId); - icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元"); + icBuildingUnit.setUnitName((i + 1) +"单元"); icBuildingUnit.setUnitNum(String.valueOf(i+1)); unitList.add(icBuildingUnit); } @@ -464,7 +464,7 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity(); icBuildingUnit.setBuildingId(icBuilding.getId()); icBuildingUnit.setCustomerId(customerId); - icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元"); + icBuildingUnit.setUnitName((i + 1) +"单元"); icBuildingUnit.setUnitNum(String.valueOf(i+1)); unitList.add(icBuildingUnit); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java index 2b205e9ae6..5535988941 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java @@ -139,7 +139,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -188,7 +188,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -202,4 +202,4 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl teamDTOList = icPlacePatrolTeamStaffDao.getByTeamId(resultDTO.getPlacePatrolTeamId()); //3.封装九小场所数据 - StringBuffer inspectorsNames = new StringBuffer(""); + StringBuffer inspectorsNames = new StringBuffer(); for (String str : resultDTO.getInspectors().split(",")) { teamDTOList.forEach(r -> { if (str.equals(r.getId())) { @@ -195,7 +195,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -218,4 +218,4 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -200,7 +200,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl { if (str.equals(r.getValue())) { @@ -248,7 +248,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -257,7 +257,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl { if (str.equals(r.getValue())) { @@ -272,4 +272,4 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl Date: Wed, 15 Dec 2021 10:20:59 +0800 Subject: [PATCH 576/589] serviceShowFlag --- .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java | 4 ++++ .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 3 +++ .../src/main/java/com/epmet/controller/ProjectController.java | 1 + .../main/java/com/epmet/controller/ResiEventController.java | 1 + 4 files changed, 9 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java index 06052f22cf..e7b673d22f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java @@ -88,6 +88,10 @@ public class DemandRecResultDTO implements Serializable { * XXX(区域化党建单位) */ private String serviceShowName; + /** + * 只要有服务方就显示 + */ + private Boolean serviceShowFlag; /** * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index e77ff237cd..7fecdb9e18 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -323,6 +323,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); @@ -563,6 +564,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, total); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index db1af3d7a9..070fc8bba0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -301,6 +301,7 @@ public class ProjectController { /** * 个人档案-话题详情-研判分析 + * 只看来源于议题的项目 * @param tokenDto * @param formDTO * @return diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 5ebcafac13..ca48b13304 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -243,6 +243,7 @@ public class ResiEventController { /** * 数据分析-个人档案-上报事件列表-事件详情研判分析 + * 只看来源于需求上报的项目 * * @param formDTO * @return From 04f9bb0933b527b7fd6c6f1c82f821e0973ea3a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 15 Dec 2021 11:10:16 +0800 Subject: [PATCH 577/589] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=9A=84=E7=A0=94?= =?UTF-8?q?=E5=88=A4=E5=88=86=E6=9E=90=EF=BC=8C=E6=8E=92=E9=99=A4=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E9=9C=80=E6=B1=82=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/demand/DemandResearchAnalysisFormDTO.java | 5 +++++ .../com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java | 6 ++++++ .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 1 + .../src/main/resources/mapper/IcUserDemandRecDao.xml | 3 +++ 4 files changed, 15 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index a6adc0a695..893a383708 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -38,4 +38,9 @@ public class DemandResearchAnalysisFormDTO implements Serializable { */ @NotBlank(message = "queryOrigin不能为空：个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) private String queryOrigin; + + /** + * 当前查看的需求详情的需求id + */ + private String demandRecId; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java index 4589bbd9ed..ea0f862854 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java @@ -41,4 +41,10 @@ public class IcResiUserDemandFromDTO implements Serializable { * epmetUserIdList+userId */ private List userIds; + + + /** + * 当前查看的需求详情的需求id 可空 + */ + private String demandRecId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 7fecdb9e18..e66cb7cdc9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -623,6 +623,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl demandList = baseDao.selectUserDemand(icResiUserDemandFromDTO); if(CollectionUtils.isNotEmpty(demandList)){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 9e66aa8abc..11d3190a6c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -152,6 +152,9 @@ and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%') + + and r.id !=#{demandRecId} + ORDER BY r.WANT_SERVICE_TIME DESC From cbd0e286b6c02dc2b01566aa60cb23b299fd0551 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 15 Dec 2021 13:30:36 +0800 Subject: [PATCH 578/589] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?= =?UTF-8?q?=E4=B8=AD=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=AD=A3=E5=9C=A8=E6=9F=A5=E7=9C=8B=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java | 3 +++ .../service/govproject/impl/GovProjectServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java index d3d1a0e9a8..a620667571 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java @@ -24,6 +24,9 @@ public class ProjectAnalysisFormDTO implements Serializable { //一级分类Id集合 @NotNull(message = "分类Code集合不能为空", groups = {Analysis.class}) private List categoryCodeList; + //当前查看的项目Id + @NotBlank(message = "当前查看项目Id不能为空", groups = {Analysis.class}) + private String projectId; private String customerId; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index dc84f51bdc..200054ae6d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -539,7 +539,7 @@ public class GovProjectServiceImpl implements GovProjectService { }); //当前分类下来源楼院小组的项目 groupList.forEach(gr -> { - if (secondCodeMap.containsKey(gr.getCategoryCode())) { + if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) { ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); groupPrList.add(project); } @@ -548,7 +548,7 @@ public class GovProjectServiceImpl implements GovProjectService { groupProjectList.add(groupCa); //当前分类下来源事件上报的项目 eventList.forEach(gr -> { - if (secondCodeMap.containsKey(gr.getCategoryCode())) { + if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) { ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); eventPrList.add(project); } From d6f2b17edd026559a7ec8133c1787b933737d794 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Dec 2021 14:13:34 +0800 Subject: [PATCH 579/589] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=20stats=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/DemoController.java | 2 +- .../main/java/com/epmet/model/IndexExcelDataListener.java | 1 - .../service/crm/impl/CustomerRelationServiceImpl.java | 7 ++----- .../todata/impl/FactGridGovernDailyServiceImpl.java | 2 +- .../todata/impl/FactOriginTopicMainDailyServiceImpl.java | 4 ++-- .../screen/impl/ShiBeiScreenCollServiceImpl.java | 1 - .../com/epmet/service/impl/DataReportingServiceImpl.java | 4 ++-- .../java/com/epmet/service/impl/StatsUserServiceImpl.java | 6 +++--- .../epmet/service/stats/impl/DimQuarterServiceImpl.java | 4 ++-- .../com/epmet/support/normalizing/ScoreCalculator.java | 5 +---- 10 files changed, 14 insertions(+), 22 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 191c03bf7e..ef567e92f1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -158,7 +158,7 @@ public class DemoController { */ @GetMapping("testthreadpool") public void testThreadPool() { - System.out.println(LocalDateTime.now().getSecond());; + System.out.println(LocalDateTime.now().getSecond()); System.out.println("----------->>"); Future future1 = executorService.submit(() -> demoService.testThreadPool()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java index 690543f0d2..687e04e0a7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java @@ -35,7 +35,6 @@ public class IndexExcelDataListener extends AnalysisEventListener { * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收 */ private static volatile boolean isGroup = false; - ; AtomicInteger total = new AtomicInteger(0); Map indexDicMap = new HashMap<>(); Map indexGroupMap = new HashMap<>(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java index 06d2b580fc..e199d2f46c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java @@ -67,10 +67,7 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl list = baseDao.selectListByPids(customerId); - if (null == list || list.isEmpty()) { - return false; - } - return true; + return null != list && !list.isEmpty(); } /** @@ -86,4 +83,4 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl= month) { date[NumConstant.ONE] = NumConstant.ZERO_STR + month; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 21a7c06860..82d1a4a0e0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -147,8 +147,8 @@ public class DataReportingServiceImpl implements DataReportingService { if (StringUtils.isNotBlank(parentCustomer.getData())) { epmetCodeMap = customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData()); } - Map codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());; - //项目ID不为空时，因为只有一条，可以直接处理 + Map codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId()); + //项目ID不为空时，因为只有一条，可以直接处理 Map finalEpmetCodeMap = epmetCodeMap; if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) { list = projectList.stream().map(project -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java index bdc1999ff7..a3ccd6c5a1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java @@ -178,7 +178,7 @@ public class StatsUserServiceImpl implements StatsUserService { while (iterator.hasNext()) { GmUploadEventFormDTO.DataList m = iterator.next(); AtomicReference bl = new AtomicReference<>(false); - StringBuffer gridPids = new StringBuffer(""); + StringBuffer gridPids = new StringBuffer(); agencyList.forEach(ag -> { if (m.getAgencyId().equals(ag.getId())) { bl.set(true); @@ -239,8 +239,8 @@ public class StatsUserServiceImpl implements StatsUserService { while (iterator.hasNext()) { GmUploadDataFormDTO.DataList m = iterator.next(); AtomicReference bl = new AtomicReference<>(false); - StringBuffer pid = new StringBuffer(""); - StringBuffer pids = new StringBuffer(""); + StringBuffer pid = new StringBuffer(); + StringBuffer pids = new StringBuffer(); agencyList.forEach(ag -> { if (m.getAgencyId().equals(ag.getId())) { bl.set(true); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java index 5bad47d7f0..250a54f690 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java @@ -122,7 +122,7 @@ public class DimQuarterServiceImpl extends BaseServiceImpl { * @return */ protected boolean validSourceArray(T[] sourceArray) { - if (sourceArray == null || sourceArray.length == 0) { - return false; - } - return true; + return sourceArray != null && sourceArray.length != 0; } /** From 07eac61ef1c53edc3a457f1d5b033119d87d8ff1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 15 Dec 2021 15:27:30 +0800 Subject: [PATCH 580/589] =?UTF-8?q?admin=E6=96=B0=E5=A2=9E=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E8=8C=83=E5=9B=B4=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.7__add_dict_data_V3.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql new file mode 100644 index 0000000000..792aec0c87 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql @@ -0,0 +1,9 @@ +-- 1、增加字典类型 +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000011, 'age_group', '年龄范围', '', 11, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58'); + +-- 2、增加字典数据 +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000230, 1000000000000000011, '50岁以下', '0', '', 0, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000231, 1000000000000000011, '50-59岁', '1', '', 1, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000232, 1000000000000000011, '60-69岁', '2', '', 2, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000233, 1000000000000000011, '70-79岁', '3', '', 3, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000234, 1000000000000000011, '80岁以上', '4', '', 4, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42'); From d2379745752fbd11ef859226ccc11e52ca11dc1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 15 Dec 2021 15:44:52 +0800 Subject: [PATCH 581/589] =?UTF-8?q?=E5=8A=A0%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue-server/src/main/resources/mapper/IssueDao.xml | 4 ++-- .../src/main/resources/mapper/ProjectDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 27d3b05535..55648edcad 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -621,7 +621,7 @@ AND i.GRID_ID = #{orgId} - AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50 @@ -653,7 +653,7 @@ AND i.GRID_ID = #{orgId} - AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp GROUP BY categoryName diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 83332f7dfb..04b41b4180 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -407,7 +407,7 @@ FROM project p INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0) WHERE p.DEL_FLAG = 0 - AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') #{endDate} ORDER BY projectId @@ -478,7 +478,7 @@ COUNT(ID) AS count FROM project WHERE DEL_FLAG = '0' - AND ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') #{endDate} From abb76066cc831c76ceb4e3e47068efc8c833b861 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 15 Dec 2021 16:20:42 +0800 Subject: [PATCH 582/589] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 04b41b4180..2e5d52b4ca 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -402,7 +402,7 @@ SELECT a.ID AS AGENCY_ID, - a.`LEVEL`, + b.`LEVEL`, COUNT( b.PROJECT_ID ) AS "sum", SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count" FROM @@ -1078,7 +1078,8 @@ SELECT PROJECT_ID, main.PIDS, - ORG_TYPE + ORG_TYPE, + da.`LEVEL` FROM fact_origin_project_main_daily main INNER JOIN fact_origin_project_log_daily log ON main.ID = log.PROJECT_ID @@ -1086,17 +1087,16 @@ AND (ORG_TYPE = 'agency' OR ORG_TYPE = 'department') AND log.DEL_FLAG = '0' AND log.CUSTOMER_ID = #{customerId} + INNER JOIN dim_agency da ON log.AGENCY_ID = da.ID AND da.CUSTOMER_ID = #{customerId} WHERE main.CUSTOMER_ID = #{customerId} AND main.DATE_ID <= #{dateId} - - ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' ) WHERE a.CUSTOMER_ID = #{customerId} GROUP BY a.ID, - a.`LEVEL` + b.`LEVEL` From 02002fe33ff468fa933d1de5ce5213513f986f98 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Dec 2021 16:19:35 +0800 Subject: [PATCH 584/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91exc?= =?UTF-8?q?el=E5=AF=BC=E5=85=A5=E5=90=8E=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index f283ac5487..0b554c980e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -918,12 +918,21 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @throws IOException */ public void downLoadResults(HttpServletResponse response) throws IOException { - //public static final ThreadLocal>> errorRows = new ThreadLocal<>(); String fileName; - if (errorRows.get() == null || errorRows.get().size() == 0) { - fileName = "导入成功.xls"; - } else { + + // 判断是否有错误信息，以确定文件名 + boolean hasError = false; + Map> tableAndErrorRows = errorRows.get(); + for (Map.Entry> entry:tableAndErrorRows.entrySet()) { + if (entry.getValue().size() != 0) { + hasError = true; + } + } + + if (hasError) { fileName = "导入失败条目清单.xls"; + } else { + fileName = "导入成功.xls"; } response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("content-Type", "application/vnd.ms-excel"); From 31aa37d65020429cfed354bc33d0ed57012bd85b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 10:42:47 +0800 Subject: [PATCH 585/589] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.ic?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E6=89=80?= =?UTF-8?q?=E7=94=A8excel=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcResiUserController.java | 70 ++++++++++++++++-- ...ic_resi_info_import_cid_for_easy_excel.xls | Bin 0 -> 78848 bytes 2 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index d6df9f57e0..3a8a77eeec 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -51,6 +52,7 @@ import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.IcResiUserImportService; import com.epmet.service.IcResiUserService; +import jodd.io.FileUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; @@ -58,6 +60,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -66,6 +71,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -114,6 +120,30 @@ public class IcResiUserController { @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + /** + * 模板枚举 + */ + public enum IcUserTemplateEnums { + IC_RESI_IMPORT_TEMPLATE("excel/ic_resi_info_import_cid_for_easy_excel.xls", "居民信息导入模板.xls"), + IC_RESI_EXPORT_TEMPLATE("excel/ic_resi_info_cid_for_easy_excel.xlsx", "居民信息导出模板.xlsx"); + + private String pathInApp; + private String templateName; + + IcUserTemplateEnums(String pathInApp, String templateName) { + this.pathInApp = pathInApp; + this.templateName = templateName; + } + + public String getPathInApp() { + return pathInApp; + } + + public String getTemplateName() { + return templateName; + } + } + { // 初始化上传目录 String home = System.getProperty("user.home"); @@ -259,7 +289,7 @@ public class IcResiUserController { pageFormDTO.setPageFlag(false); //获取模版文件 - File file = getExportTemplateFile(customerId); + File file = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_EXPORT_TEMPLATE); ExcelWriter excelWriter = null; try { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("居民基本信息.xlsx", response)).withTemplate(file).build(); @@ -338,7 +368,7 @@ public class IcResiUserController { * @param customerId * @return */ - private File getExportTemplateFile(String customerId) throws Exception{ + private File getIcResiTemplateFile(String customerId, IcUserTemplateEnums template) throws Exception{ String fileType = ".xlsx"; String fileName = customerId + fileType; File file = new File(IC_RESI_DOWNLOAD_DIR.resolve(fileName).toString()); @@ -354,13 +384,12 @@ public class IcResiUserController { Result result = HttpClientManager.getInstance().getDownloadFilebytes(fileUrlResult.getData(), null); //获取模版失败 则把默认文件写入 if (result == null || !result.success()) { - log.warn("获取居民导出模版失败,path:{},走默认模版", ossFilePath); - String defaultTemplatePath = "excel/ic_resi_info_cid_for_easy_excel.xlsx"; - InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream(defaultTemplatePath); + log.warn("获取居民模版失败,path:{},走默认模版", ossFilePath); + InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream(template.getPathInApp()); FileUtils.copyInputStreamToFile(resourceAsStream,file); - log.warn("getExportTemplateFile copy default file to template,customerId:{}",customerId); + log.warn("getIcResiTemplateFile copy default file to template,customerId:{}",customerId); } else { - log.warn("getExportTemplateFile reload file form oss default file to template,customerId:{}",customerId); + log.warn("getIcResiTemplateFile reload file form oss default file to template,customerId:{}",customerId); FileUtils.writeByteArrayToFile(file,result.getData()); } redisUtils.hSet(RedisKeys.getResiTempChangedKey(customerId), serverIp, NumConstant.ZERO_STR); @@ -492,4 +521,31 @@ public class IcResiUserController { ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class); return new Result>().ok(icResiUserService.queryDemandUsers(formDTO)); } + + /** + * 下载ic居民信息导入excel模板 + * @param loginUserInfo + * @return + */ + @PostMapping("import/download-template") + public ResponseEntity downloadIcResiDownloadTemplate(@LoginUser TokenDto loginUserInfo) { + String customerId = loginUserInfo.getCustomerId(); + + try { + File icResiImportTemplateFile = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE); + + HttpHeaders headers = new HttpHeaders(); + headers.add("Access-Control-Expose-Headers", "Content-Disposition"); + headers.add("content-Type", "application/vnd.ms-excel"); + headers.add("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getTemplateName(), "UTF-8")); + + return new ResponseEntity<>(FileUtil.readBytes(icResiImportTemplateFile), headers, HttpStatus.OK); + } catch (Exception e) { + String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); + + log.error("下载IC居民信息导入模板失败:{}", errorStackTrace); + + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下载IC居民信息导入模板失败"); + } + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls new file mode 100644 index 0000000000000000000000000000000000000000..1523d6719badec2b9cb0a018e925d1afd4fbd3ec GIT binary patch literal 78848 zcmeHw2YePq`v1IdLJA}yoe)}p00BZsA%vdLdqN5&gc=M*0(gK33KBs?1q2&5?0UAd zw^J0bB9^l&o~MF{;@Qxjo?^@Y`R?=X%i)C{zreD~`WM3nh!F8>eWVEEwDk|hrFJ@2h)XE$qws5eeLdjIC|pi~ zk|&n`kQ#`LpbHt+NNkUODg22#p9rH1zF+voJ)uv~zYrf%m?BOQ(ZY9{m?;*DIbyk( zXT?qza|1})KYtlym0_k2W!ObR*54OTvgRkL3>A$?D#JyDh!oAOGR9l~3D*DJ)*g>p z|NTWg?JY#hXLe2MMSMu>m;NG)x5@f%XZ^>}zfU}D?ekX)$q|X-F!AeGZ-Ib|bA;cw zp{l$DIF^3~j{GA;aQ=TIJl_NN;>R5$Kg#0!T<3-3MjG-7r5fld9>aw&@XdIlA^*$< z@+tJlzpAz1^99~lxVO5`-Na}|wbRbpi}x+E;;lm`iq7=24(4?j z;9dv7Hm|H#&?V~QeI9(ern0&Z=FQ^+7m7l|dCd`BMULsb^z4Gq&ctZwP~Ay}lZ0=I zNOxVO&UBTghztr&d(JgLnW^Sol#F=o+?S-Yg}$?0X!B8dD<69(9XYL`-5V-_ z%4lDpKmV?t?t*gJl?L2LX$$|>-q0|P4${Q;!jY?q|Nk@Y6T$V|#IA=2geXcYN)w^U zR{e(u;i(oL%+IrM+?lQVyd*B}vL=@`5ux2Z^6|<)(&7th@m4-R;7VZO>mGdEf&f4A zDEVBT;Cxc7e1h?O4?NQY=lm0>#O`|F^9s&C+sX%HB#STWzpI6Z2jOij9OEcAzl#UI zg@re_`EQ7sMQPb7c6}zZ0JTA*sGaJ|Vg6?G2aW#1e&WGzwP^WF;$9UwQ?12a8&(}B3gCBf- zS`cA_Vy?z=YuC%>$n84JeKe@5$4RFr1}(h{*b_tnTGP{xOMZ9 z_36kzmiQ7!DY!m;aYeW?uJb~D3TlETJaAoH*9-jEI4Zx)M;+JZv%Cf4TD=*suS0GF z^2X&Se1=<2IDhN#{9X0qIIgSy9mjR?376-^_chL+ z@N850sXmv-1=>qcy#?gf*?yh!&-ttK3gjQC2R<&zt+6~-K7sb@ET@GBj+>dbG9po| z#0^p|3q`Nld)`|WF;J{>;Z#qSE+ditbMw$g+en8tXtN7iy=2K}R^L4-$o+VyjoLwiJTcp|JrA zH((J43}=S?>R-G<=7&N7D=b_lF^@A#B$|C@FOG3)GVL=vit52I#m=N=_Hkx{dzhUG zH84uqi(L{sjkU+=U?62@lA8xHwwGhbgyhwciBlwxA(Ix4OazIhT8<%;mX1tv^Fmb~ zq-#9t7SPI-iKzuR^0g~g7v9#y`QH=XZ@&3P3M$SF!u#VYAu*4u-Ntcdg4(!Rj-h(e zWF}TK`fQs#s$G(8HNRPswlWj+GA5BZie}VKW`dGD`_*59NM(fN6JLWVqsyS z+`;ZhotWK`Ix)K=bz*i$dh^XU%lvE!fT4m8YAu0!*9+B&HvaDw%G5xdh4&DK3@TIz zsVcp%ne#3h$fTPl44o+xzt!R3nmO-V9!KqB9o4?&nz}xNr07TODvydH8j7ilRyW5{ zUmRoV=8od1-Q`hnu63eLzwCN3v*iv)Sw{YCeoP^r!`=rob~hX>nghG{Ewm% z`#DNdUue1+97T)m?1;4$%|u5B{_=IDYP=NrL(@yC$EHk2QZ9AGPLGV zM49;L#u(h$u8PpP107so=Ccu2N@h1n)o8vA?@qN4Nhl z$NuiJn)lc1WrX8g-GhwadKu~9y2~2O9p&J<%N1M)qaEkq&ewbn`ZXAHjQi_#FxFAl z->QRR2iINJ;5sOAaDS@~#yQTxU52BpgVNu*f0<){_jw)N@ymbb{uPe>-F0`km#faU9F7m}^}6a1R97mil)6TgRa^2hX;4@oD7vtuHz+K4JY_jdZ8+c~EkNa{N1X#OqTii3{kYe`4L7WX1f~nxy1^2tdPqk-46p4wBd8ui zno~Vs3zs6C`dljPms5ia+ky)F9(y(l8heQy3{^^Jtu z&bvj5PTa%&Xz1aRtRC*iKo1v9K53!C7e4p$%hSk3?xKj+?)*by>q*BO*lHK5GYWO! zyyq|MG-G{D=A7U{5cHXTmxqmcx=}lcoy9O)XZluxVDI!k-twukI1bGs63kemO zb>UXW)(xfd?ypUauq&0Sp*{G7Lq%3y2pu9+bgzq~btK(INIX!P!Q#=Bt_rr;b(Pa_ zsZ4d%zQIzdy2?de&E7Dog0G!cSN2KRyJiS$0OTTmZp-)h>5f`+e{sdRY_ zUNO6Lp`uq^ge6D4>%wRqO@6de+93$q6%2`!(r#b$w&Z=w_h*0d6rk7 zn?l{2+720-6_HED-zHHQl{A z@cUwpVkQz6VdXY|#n$9ilscaREW=Kw6(2iu;mkQTi?fz5sEvMcY~!cWVvF{#y8g5+ z?-b11o-wrgz8CJ={tq#DTk62w*S&V_yKf&nu(seYA0)nc)#&KT%x&S(=hwWHb?(E5 zS7zSQ;?}>8X!%TL?f%_KAAh<$WzPef5+8&?cdz8?#>6_OMC0Vu5Y&eD)YT* zkEEa6f5Y&JhhG1_^M^w}>)Nrgzt=B5oS-W9m{wa~d6x_wX=I#7J&%H%w-7xRf z(PzDXdd6SFM$}DvZTf+pL$C55Y0_%(#I9vGoV@$Fw%w|yr+<0X{sS)_j(+6P#ox^w z^!Th78_k@z`|hc?|Jb@XB>AEqfB)gM;cGW%{dCQijOe(U&R_npB=hGxwzoO+lty1X zm(po($WIlYUw1*9(N}y?(WPD8%=D~#qi#7|`{eR9=_?PGcKGN}=+7M=xNrQOJ-bG> zyX~u+Gkgy}+%X}3#_H4dKUDI>X7E+3VvR6 z_aEM$f9vWdcMp7|{>RiavkwhQ?DkmL!5^MY-7#&^f>S?Bp0;-J$|cbs-2UZvfA2=D zoDQEZjh?!o$HUtpj7xj#oHsUJ6VYqWNxOGm({^v% z=)3Qp{__t%K9l#=cN=cGW%D)H4*2olw_hK4eR$y~J2IaNxn$TM_uui=&L4hyx8(7i z*R1;f?|UXLd@TFxo%P?ovuNj;pN2g-U~=y1N4|T#@S4I^M_&45^{9`*|gg_02r%!B2PXeevtdcV6*K#;~XFE6Vv{*`L3BVXy!FZSDX5xvl(pT5`W z{Q>R%vSs6Qd%N6p^Q*p*Y2BAJ8#v;@q^oW`K zuZ+3j>4S^Ujz2l<=h!`ahc52*$yw)p)+F+Z3$kmb6+S)a&$SExFzN0KzipA$=F11# zyt<;g{Uhn+m%Tjr>C4ai{N8y5!$yAmWX#CatM+bwCUI2aiifXQ`o!kTA0Pb2Y0rg> zD){41t)H0i=*!7#wqLic<&XVO z^Y>p^w)=wvPd~CEX2R2_Cwy6$@oN7bqZiHEoAgUD8^@Fb6)u_jHr--%B7f~D9$1DkeV@$=cwEl;^Is`#t?>AlYzvcFIKv}Z&Amipa2uRr|c>y?Y2e)8wHD(|?h z#q6xs{yhhmKUjLfQ=0~Ud}#Lk6&H7TZ~j9U?)W+@BIDhHwll}fzIgAlEpxktjo;|`yH%hus}>4zuWmv~>zFL(C%i^Vv)$9LWW5w~?db1s|LCD+ zlOJAOoUuJL^s$ZC-uT%yH?~cAW9!A0ZzLW#wfTfAr*8b~s{Te3T>@%D(bZ~E%{+xq`{*M=keFZm=b`O4eF zp89Zb;R|#3FYCW^^_o5FZn~vIMAhl>s=of#?gz>r-*Ris?QgVx<-tE6d5iCg=Al8nc2_i2N%X5* zuDzRhEvQQ1YvR0%GG8A81gdLn<0rEd&;EYRX%UMSz5ZzIg&p5J_mw-}2s!(s{OF#A z>7}245q(!?MArJ5JFb|w{j#g~B+SZvKWFaksS$lXz4Q-PKC$4>pI=Z^mRx+^JAF^O zXU3Wf78QJvH0Q$68Dl%9mt|z-T)sG_)2NHLy>foVk-EEj-MD$eN9}I>cFjceEZYKowvW)C1+g7+D?D^)_3u=w=ZjU@Z;F* z&Y%9V;?rw-|E>AOwVT`D^tbTz+a4Hj!LIu@T^%{2@VdcErY06VdwO;HUzR`r%Be@{ zy48kH*nCFs0ap%bdC`RLcW+3zUmd&0f27?%X9? zv&WwqmbvQg+$#^IRxFA=(rDPL*_oT4zWcK-_5DBF_@_lxbMF0mS>NZ=zUlqVM?ZG@ zIB(0wykDEHi0m7A`H@ARm5dwh^CyxD(;ge@RYe;}3z0_ug^|XJ;|$F5sQg3Vf}2Rb zG`2*#52`m)A_orIOYUPy;n5!qS+Hm~v=7F~yr6*T6r9bWp*_*mc)^}6X!P#f(|nqG z)5HE;x1){w8yg}QN?kC0RID;>L@nG|C@XG_k@Yl}eZaYt$Di)Ad zZye2mUnUmOR>c@Y*c_S@zmybGJ;e+k9a^lTnY5#ZqwGz516K4YA37zj_Q#2tbM}`k znlXNQP3hco*U@vsWi!AC_f0OHRN>sxQp{P2EscHem2BHuSp8_RdwZ&Q4n-D`zMRU` z;^3{tf8woT%Zlk&l|EYR%sW-A*~wc!I5QKBJdO z(B!Ve)+vgx!*hw(D4Y4n2L5Hp!(LOflnd$}0ox&$`hsl`3wZKiKe9bpZrR8SVX$a& zIEB_{`36!Y?DWNw)oGWnh~o8B!U*xR_@xng@AVW&sZmrtZA$6tescrSrc?Tq2cj$I zt*;_Y5gy3{$U{|kPNQh%oa~7O)nixE#@8#OD`+*ky3ZV1b(+z&jJDr#!7s&6Z1^7e z{8-xN)Ppr`=7b1eMcq#;A1$Wme2!ojB1|o&BTg);rf6l&eb&XI=+e>~H{~o|RY}py zsw!*tmmDspXwA5Xr{S7V^x)JfC4uP6XBIDbXz_z6~)kwzAn(w7sbM#u+GF z7?<(J8PA;hkD6~UrK-l3>Y1Ggplv9)y^Z$jKD%SZljZM~Q1tI-?Ja)w!mBT*Xlc!D zWsWHFA$!gp#c!8mOU&$N&)huCy0W+e8)rM?5a2`eDYM+_0`@(0pQgnSydC9uXKcj|UKl4ac*0g1i(o3dw zm=RhTwv?i{6k$tWg`7WBm4E8DXMR~ig;-YlR`K^60^(tJi$tj@om?8IoZ8K^<_Dr^ ze%)&hp%eob+*$@c)wdn(OAutls^sg@ws6%@w{#$IyA?k*y`Y*B+{*?ezNDnEy3>q| zO~eO&#>x$--B-(>*nqZ3(VBC6Y)W2jT}MO%7aTn?a-i(4Ew`^P)ui1+2V@w@KddKwd;TJYmPyBULl$mL^3TaN*1rbBN*W z@ln*$XeCoJ8a-#lbVwf&Zl2Y%22t8|-SqRS7Ot*27a~ksj!e9BLqJHLEKjLMnd#K- zS%QNF245 zoM+ZFt9R*D@fzK&tnLlB>CaA^HJ`GLE?%^z?6SBiOQ+GbSzouIczxaS6+2c=Tk*`P z^>q7KF9y@y0k<#QO88AWv934iH1R{1$x8*TI?%mlVYv{?$ge4x{EDJsMW7t~^d^s{ zRy>aW1>J1u7IWLzuZ^u9S2*3myI6Qv>wk@f)Dg#CI*_%7uDS0l+VX^@o=l=mYc2NK z)_+IIK2+Gr5zmnE!-bt4@$1Pf8A+ugYajhkCLzlH+Uvnd^FrIG(ttyCKC__-%ar9+9A*hZxrQ9jP?80PuY)%M1sm1}!z z8iI9BR@>W%ZLaNCW0Vj%n~F_?06%7F3mO1of#X$#KQ<7*#Hxf{zLP8r1B)r5E`Zfo z7!p&g2RfQt>>Fia7+_2Zyd7qjZ@7hFu%TlZbm$mHu{uTq6olad=sbEb3c?_zIu9BM z9fL&cShN8{UFkd;umxeUBdaVnBhkS9(xrW7QJQ%xuZ8RAqFr64_=il!9ghEp+=g2edzIBHW$ zF&;}XNX-t+VW)?$$%bEQfZKw$p*?aQEh)u$w4zv?l}85sw>IRU=b9DRvpaF|+`Pjo zcXnXU+`!g6N<%rr$Lm2UK3+b>@K~|KI-{O}y(Wv^f$e<=K@YscG79yT+wD>e3h)Ng z7MP7V*CCX`Oi@k^r4$}PI5mt?WMc}XhEoc)#oIu_omrCQ02FoKpI)ing`0B#*bu31R?`wsQAT&CC;R1G)R?3eU50$C2?? zg?W?{*N=~`+&t}<63C-D;q7G}sgz2SsTPzbK%Do>^|Db+)!x={+2Y-VOrDov)kQwsKG-j*%qlZoF><LXM6l)~H^&a)?_`pHxQrTWWMFG^wB3Nw3CDov*PP^wU-`ckS$ruvbRWuQ#; zr)`5|Y5=7M%TytyhR9SArH0DXKuQghsX>%Vqtp&+4?fC4muF6owOY526gl$(u?mXq zp!V$(<0-IEE1e z$1qOd7)A#i!p6xyJjZZfKUus@l3PqS&szTlet$?yUt{VG zkLQO`X&U9IkE+@luyzKly#Y%%U>yutM+4T$fMpo4&IYWD0qbhOG7VTa1D0jLx*M=; z1D0dJat&CX0qbGF@(ox|16E+bdKs|Z2CR<(>ubRJ8L<8aY=8kP)G&;PAb%{|kUEY* z);IA8}g=3HsjzKm!28rMpG47JNK)G5bMliUyNqG5Wi z|9D!z+6VnW5#^}&0|O1%AOkkofDJKVLk-w412)`%jWA#%4cI6HHrjxVF<@g2Sg`>s zF<|2iSg8RkGhpQ!hIWDL!PgpBfn%t9j-kdmhI-~0YL{cEQ;wk~IfnY<7;24Us4I@4 zhB$_L;TURzW2gg;;mkRP^W_-Ml4CeGj^T_TpP6EkUx<}Qd50R{j~5Tos6)`%3(^|# z(uzhwA@t&CO8F>Tiuta<;3@K;INgsy3Z|gr(GLnQJkF5O(t30e^vHq%w4i}A2E>8} z!WjJG#mE?<3L2UYqCD{+L2t*UUj^BY*y4k&P^#gmjFJzt_3#T76&`#2^tg)$UcYs7#=431kn5+1L_FU5`D|z%LqDj;n$i#J=Jdll zm3~;apdZ#Pts$tN&a0J`hEfW68~S0LMnA0E(huu))`OOx9)8+e>2!M30p7uK!1vQ2 zw4;^oM2|ASGw6r4^&VVWccCBBUFnB)CjGGPMn9~x=!bQ8`eBW?0%M&+Kdf`@T-hMYKvo5(3bCXTS^2D8AagrNb!*xMb4QzH`es+P zots>}a#~^O7bNF>%d58vF>L&0)2QKGvG59*{)Bj@=A0{p7&E{1nw-hwiWw_i-HFP4 z!RkkI%Rg%^X2PnzF9`? zvkX&X_FjqqPL&DtpE>8%6+(<({@El_R+Zy_&Ftvnh0CwRDFhCJ*0RG_Xgo-B9Hfaa zv*M~UA#SKEr~cve*@#2muChP_`i(3^@hxYPMcMj~wEo|n0K_f@+TIS|YGWx%QHoAJ z6ur^H$@7GOZR7Y~I-+N#U(R*Tx<8)`fYD0P~}_`1xQ zOeJYmhX3s=@V}`P|IwBBx2pq9a)&R^m=Uyh%^H!-ID-rp+sl)!Q(>t^3*O-?Fzyx* z^vF3v?5n|%`0UZxarSMgGn*69i~_dtLR~gmVhA;JdOrG1V+vJ=WlU*Kmtp1-A>KTl zPKyrn&oZV6G2=hRm@+SJFrB$=Oi2{EQ7TPJNHT7q52gEFz_@|B6P9|?Hg1r5!4GVg zuUZ;6lEfJTuoecar2%VY zz*-xyHW~&cAr`AQvJ_?z*M^K6lc@t?#5mTi6iXyLjn0MK6Fq-X z0VQcPjahKtVU=kNrRc5~NHwJt*^2|ISW00G!pt~IjhCr-N?{Dl+Y%^6U3MUqNGZA@ zQ<)lDJq1QhWZtHS6^wX?2V$`lV@3kShC=~Lj1Xcn120>%V>UO0%p;16PqQ#1RB}UU zNW}Suy0{oPF&741J7#n7kqnh@nB;~@ZkWtB%*73tTzn#i^9`5Wa2Gd1axn&DZiM7U zxVVv$8!5Swl8edts=SRQx3T0lmfXfJZWGCEBDqZ@w~31zCAm?O8zs3>E^f5sMoVtA zZ zE-v~~=HjgicFfK<-o-^9%ZvocO_2E}xVY$hnVTrNiISV>;-XJxZj$6CNp6yhi@ut< z$&#Baxyddr`f%prEeLkZKDTBrF8X$6q)2Xx%s0iwMW4^y=91f7a+|xjxEC-tRdQ1$ zH`T?(J%YJ-X@MQH%iF@m#l3?WEhV?5%(tbBi+c)lTS;y!$!+E0;$Fkt){@&=a$CE& zxCb#8FA%U}c6r-KE>!g`X`oT-|C_jko{sSZeLO!_)d!Ce+EO|6aYH);*4}`n8?X)r z472d{V{|fL83qiK<@J5L7%+U$Natl5uxe; zxp0TGWA?dqbaBy6m;rY=J7#k`xwvRQ%z!(c9kaO^E-u;?GvID#$82tA7Z>e~8C@i| zi#)e3E-u<3bGu4zSIO<_;-Y;rH&b#mB{$Q>MZ0BgH_7cLx!qh`v}fjKNp6FMI4pJGOVe-CVs0UK<6rM%G@E6J4AAaxVVsA z<_?wIp^`h)#f3~WcbMc3liXo0E@Yj#u*4=u?QzYYUvQ1@@F(Lan@44+n0}c)3(?F_Jcr;Ti#CB*{Oe$b3c)cpN z@&Y#m#9`8gH3gjXN1V=!Q2_5sTJPqOFLuN7kWc{DHgg8x=~ zUX(cOu;0NfUl}!xt_<7vV#tNKGO*ok&x@x^kFg(?cp7bDy~{`Uc)}op@d6*V7NU-3 zGy?-6K48zQ^G%iZJR7rZe6Z)~7(`abV9(Pr*zP4-+wO7K=L@HPgWWND|KL7BVt0%m>EVXNEoNWDFxZ$ zR0O3URh){X6y%9hjVT35;#3n#L54ULMJY%Rr=rCSL7p9C0fVH(&>JA|E2Z{kTk_yT zWd1oVd9Y<7M@)bjNwz;b1xp^>H+UN?d9cHC3YI+b<)I_-G|%buEpYw~x7Pd*WSVuC z#GNwE(>fPQ^~U!`Wrag8&zQ2dg-J|V)xssFtY;AtLr2fKL`qCq!x~FWS-qM_Oj)<0 zB&Mub(GpYEsu+nWt5j2oDeDtjESE}Inb2YxQ`RK3SjLpq2rZT|WgS9`WlULt&|(== z)*iH2#*|eDEtWB5y+Mm*Oj&8rVi{A`7_?Z%l+^_-mN8{rL5pQfSy4>Z5|dR#w|+o7 zkxLD$*8di{eP+?U|M-5mqoh%}oV@`sXp?meT4No9c38*K4Oj;Q2Cc5XFSNHh1}&|Q zK^v=M(7Ngvw5vJ>Evk+|TdHHwis~4&pE{Opz;X;&t^vz4U_A_2z5(lLzzPglF9X)w zfb}t8eGOPY0|srKUN6wf=@_(cPRz^70r}&$qO2JvtA)ur0r}&7l@$W=$C$Diq0 zRt3l(W6F8}`C}|Y_M?zL#*{Sx^2eCc`a}L0Q`&vVA7e_35BXzEY3m_>j47== zeTV!prnKykKgN_c9rDMR(wam57*pDD$RA@$3l8~XOli9ze~c-uHsp^nrM-syF{ZTC zkUz$hHX8EBn9@2!{uoo*Wyl|6N{ejL7Mrxfy7t%7^3rgn)_;8cr@a^YOlatwvJDKH zI30t=O~;^F(=m*rbZn>rgGNl}LGz_!&~WJ(G+8(0lTa$Jc zGQ|5TEi7b+F{N#V3^As(s*oYZl=c)d#MlVg7ea;@Q`%6-5MxT~2^nHcX*VH5j43T9 zWQZ}Pt%M9QrnHifA;y&U5i-P>(lSDZ7*pCr$Pi;nYX}))Olb!pLyRdcAY_O!rR{?Z zF{ZS7kRisD_6{<{n9|Zgh8R=YILHuVO6vw0VhoZqoF@AW5cDP{(w5o1(6Ox>i_gVP zqzv;P-bT+bX(Hk&EkEvr5~&) ztfsjmn|#yo@+=|n20H(ij8lQ`nZ{dDK_~;XV82trhzD`JeJSfIA^vfL5a-_ZpQB)e z7~9J}yg-4LeTBdM_9ZAccyYgdX-~vpg6#Ik;)=q_Ga$o|2Q(>8`Ddr&0ItCSz zj-f-*G1RJ#L8+u;5e5uxN#{Y$q+?Jv=@_nxjzM9mV^Bls7!;N|7E28@QLC3Y0~T+< z5)4?P0ZTGq$p);M0ZTDp%?((p0c&BvS{g8@KlD0)`a{Q{{%~Tf`uk6vfG~v=f>0VJ z(|-(glkQ)VR9qh26oeU+i&9+9lqo1KsZVw&E@#OU6qhH-6s925$P}g^%$6xkL6{>` zNtBvPDGXI{zvSVFb237V#9$Z%FGTX36A^44PecGORPvPiGnDFwbKyw{;Nix`m{N&0 zl02S(03MjkQ)<#M$>Yff;Dt+`Qk{lN9#1>~FGBLrw{p%AlE;${z>AbTrDBbgJf3g> zUSr8qYS+e+$CC}fYa)3{728Dec%lJ#QIeN20A5qcQ>xvjlE)JZz(aq>`zm!WJ_%`Kw!EMZWK5}m@qI@dvw7$j8B=QE zc**0*1UN4GO6Dn5af0OWL;~>8e=<+0kMTK18?%p#K9w=0QpUFxZOrDOpJhy`nUf`t zClBDb=zE!`RL{*Mk0%a*hyIv(N*$ddc|2(VJoM4bQz~kFP0_~e@}b{mOsTE$X+#^d zdFaa-Q>yG1lE)JTa9s57%v0)Ze9X|s?EFkBZ+w}Mc|1V?`I*$Bo zR3Ai26d&*gSt}3IvB8y1`O&- zeP5_6bqwlC9fP`3$Dpp%F{mqb4C+c9gSt}3psv)hYy*~Kz;X>(o&oD&!14`PPXkt9 zzCoWu5@CMZO9+D6?$ZsF}>@v?e5y0m0L;&z0&&*Tm_jGw&o&*3MWSn_QCEr2vcme=; zkbCASHGN0PW9NVH&=#1dRQH`Ej~)NPL;GM}hOEB~$z!K~@X%(Mr&Ro%C668c!9zP@ zo>Kec(~~x4*E8A{W6BiJRr1);ANirZF;AHXG9{0l{J}#TWS%k^bdx-G@COg=l6lIE zkR^HS+z%ewD)W?Sp}XXmn4}Apllt}}he6%q;KlB@nDKke;$z$hz zXGoB=B}U}XlZ+<;XWu<-_Lf&rUoz$O{6N&_}o z!ytE%4VF)G#FH^w7TMVzJje_4lxb$5lx=pj2M;pDJg1YrogX{dg9o`{p3}kJ=COl4 zc#t*bDYMQHd0cj`2M_YcJZ0(`DtYW!4<2NadCL4VO!C;N9z4h?^OQ+wxa6@zJ$R5^ z=8cf`H$w8*nI1gIGxL<`Xr$z^BRzPKapoy=(kRJeCwlN8_sml!rqPne4)oxmEig}+ zoyJHWJI{lM_Q5=5iW)0<>^Kh|+6?oQd8%0Q*l8X-v?JyzlU0f2vBNxgXj{xvW~_0N z$IkNLp}jFrnYKzLj~(T~LmOnCGIy0p9y`f{hjz(4WdbXgJa&)=4{eos$}CnPdF&hy z9@;PSl&NgIJmHb)8SaWr#OjAaFbHzLKtV2;`o zaZo6Cb$Ub4zr-Acw>?2se@x~m)Za0hqi{j+ezna;a}?B^&AQX)nZ}mjgC@0`?a#Cb z(WSUN2s`zZz6*5TJvFh_t1rdph48krzZ7?w^JMvTWxF@y+b{H`5BdHty!{y$A)cfF z>m9y(jYZmkA`S5^owk1=z9Tlb;;boA^{HiJtML-JH|OJ}Z861odE0^WPTHDW{oI+= z^Ko!|p$CV@mTNYTsiUh(u^!8BDUKia#ic@AvsrAx_C9l#lx`?aEygK>mt4(T@O?0R zHKxm)^QtbI}^SfT+- zGGNIDteF8zF<{LNSgHYoCRRTWXkB#-8de>HHdV)mF7$IDW*?NJ0H72|KpQ04E2|pC<#%mnqoPYGn$O0T##BOF=ZXYJ(c%Wmas61DXUkw#FT|ALSo9A6)7=gxoRvi zWuwV9v|~PBWf?*{W=vUu(2f~X79X@@ z#*}pj?U*rT$w512Oj&Kvju}%H8nk1^lr;wJm@#E}K|5wlSy@aL6_fSEWGOLOMRW@Y zv?L>_L+4i@9h*~_la2cfw9U>w0vI&QItDGWjzMFrW6%!kSO)_Jt*_35hF8a+&DAkz zZgmV=S{;K%R>z=y)iG#Vbqrcn9fJl{$Dl3Mu^a=IYryghSPui1Z@_vQumS_t%YgMZ zV0{c2G>ZDUL3^lU&=l$zw1PSY4WJW4|7fyym@FHRKW=BriUIj!Oj#@-e~c;X1muq~ zWr=|NF{Z2zkUz$hg#q%%n6f57{uoo11IQm^%1QwFV@z2DAb*T0?LXv?F{SB;{4u7q z`j9`ylm;L2$C%RAL;e_3nt8|{V@eAT`D09J+#!FADeXGsk1?f5hx{?7wC0dM#*~H} z^2eCchC}`sQ<`tcA7e_(ZPI9)wAUt0wMi?jYoJd|4sf?e^!?DpIol{OXx(%S8a5q+ zHciK%Inyy{$#e`FF&!&4U}XlZ+<;XWu<-_Lf&rUoz$O{6N&`08fK_Q2`aP2d+N5nZ zX_ie|WRu2tC>@vEl+q5HG{GjVuSvse(&j>5_!vra3wdEoX=x!Zj46#QG z7L*cL{xz@4Xz)V~ZdZ8J)-mcHQPscu)fl$U?5=0YbNvM&E_vm@Rc96>E{b6tnOo-t zuV~yqurw7zf^=R@<*P50&a0{BF%6xUjzQ<8V>~rw21{+=HTckZ={yL&jzQ<8W6*i& z7<67b2A!9VLFc7o(0SK_8sSB?4|Aj`jP94*+#c{Vdp^=KUeE;+w|Aa;=*79-F>*a(-%IwQ}LL+7N z**u|Zh4TFwB!=Pi(Fz6UG3_1o4gN{MNpkpUAQn8j_lwL0zgZ`HvG@l!Ot>P5aiB8k#&og9B&5_8gRom?`#T85G?KeS}| z$w{S?OO|>%(!bLa+KIP2Kye=YnFZ+NbYC~<0{&=%+z{8yZq?T0oF!e?oy(AAY%-5qcHcYYo11aT^r z+J3u(@dA(UhuQ242X-S* zc9>+dmmJu5GlH`eh;vE8C7b={zz+9hM@Tk%)`1=2$&Qq4_PGN)(v#g-ve_FC?8ct# zCX&s5dSEy4WJgIhd+>oB<;jkgZ1(K~8?SpZ*IlebPS$!ItEWV9qVAg;7OX0n0I9xdtrHfb}q7`39_~0V^Il!|0&p=JlSYZ%x2G2 zuroZ_Xlcx5pH;9sd$Q36na$p;V0ZCkqjfTy{anHB>d8jCWj1@jf}QEfMvG=P`^JLZ z&6AC`&g?9C_s{ZVqZeQ{`_m%t?w)M)56osyTd=b|+2}c#og+(<;g|V z`a5Q`=P=m4JlW_8naw`MVE6W9qmN`ZdmDq@$CHiTliB=c4Y2!qveBKN=! zItIIwj=}DvW3W5v80=0u2D_7v!S1AEusi7(>27w zR%*b?3|P4Vt1w{W4cG(&Hqn4hGGLVkY_b8XGGJ3Q45I_xI~tN(WRzU6b-!t_2YRw0 zcie^s$)0(TCmRyUY<^=0@*eEThO9Dsh|GJ4CmT}CZ1&Ga-a|dvkZ)!WlX(yGWJB_q zJzTPfd$Q3cm_0(WM|iT)T9`djvPXKd(T67R1H0Ihjh4)8_E87B#FLFS&TRHx2YZ|+8?B$&rLrWY zo^13B%w~^w?#IgxTyR4|ato8@&v(*?%7F@t$n-Kg?#&dax&W zve7d!n|`G5I`Z;E^2S3=8J=y31nO!BXWtArz zeItJeU;;TVXCL?7*=cz#a#&s)WgLg)mG&`NUXj<)T3%t?gkLzkone6uw!AhHzJH44 zHInWdn&lNQrG>!(Mx2-!+w!``DiF+vNwm#JYs`Z1Q^4Z4Fs%85p?*?q!wd$48{E*9v{W4?RbB`b34T3wM4ZYy7(1MIqjZx0pZ4&8%vC|@KUQM3=Rb`(wa-}G$RaG zBE~T5LdQ_|ItCHdG1Q`tp(*GXu7Zw1q;(9cu%+8XF~qCUf9-v`h)y2#uf!&kUz%QZU7AO#~51&fI#q{F~%BrV30q?SkDd&^2eBZTeYq;2T#|G1Jm{2 zC*JqrZjb2up`CNKQDD%)=@>L^ItG23jzMdtW6+K17&KryR%*b?3|P4Vt1w{W4cG(& zHqn4hGGLVkY_b8X(lE$k5n(LH^duID>3VDMbnP@ST?Y+J*E9ngDv!bXWMI117?`db z2BvF(f$4f)V7fLJn69%0rfX(_>H1e-x|S7~u1f_5dExqFjVUn53uCMo1qOLxjJ2P@ zATNxujuRNvEZKlHGhitOthoV8HDE0a7__1({R!8!%gY-wxyp9O` z;-uCsc-DlCIJItP1@dstp5Q#tB!g#2*oc}bF-oiDou|+_M;%r)wm^bI)I3p01??&pmU2dAjBj zJolUh=IPo@@Z7T%n1`#xBRkX^`~_fObo%5o5B(eS;v~;KLxFkd^O(n)P~_*Ho4`Eu zgUrLAhmY%?mB2jojm%?>De`mAM_?ZMOXjf_6+HJ$1m>X+Wgcr*!E?_+U>^Ea=CQUF zJooGa=Ao};9&2F1bI&_q9{OMAu~rs5_lyJPp-*NWYihxB&oy8k`f28|_7*(%ECc50 z8eQ<*^9z`#Yk9$Q&n#e`uK5MeJ*R+qx;7X*_iTbVdRO2Ov5{`}wf?s#cJgt2`I5h$ zg>eZqbk6$>Flgv>3>rEegN9DWpdr>VXoz(T8e$!ThFHg-A=WWyh;0fUB4uLEf4 zbPO6g9fO9>iQ#^#YltE5?s){NGoJ}%lX^Ri|Ax&8c^hc?YT*1AJp+#deS zLpx_4YvRFk`}Q*rZJ&90^0;oVe&(S+U>E-vyMUItYgqP>lif7ItGoijzQzBW6(J37&Oj0 z292|hLF24r;|y4-0V^|Lg`6Aaiy12)NkRT{9#2CT|}P0=vii*>67WY+D6 z&$6vsGQb;X=!13Z26%4Yd(IE?$8Fj6x{uYo?wJRfWS;GBA4}uk;JzPn$~@cCK34Oz z=lmeM%o`^AV7HGw^B~X6v%TwMDII)V$T;&x$o$-X^_(B%o_V%MJ-$5@oFCc(^K4&w z=p}-AXdle8z35@p3+AECFwgd%kJbF=xqN6x%(Fe`V>Qot=Amsd&-R&*)qLiehxW!i z+gmXCB%)^VqTkp4$_id1(90V`~$5ZXbB&p+8_ATcE&md%rUeeFXE^ zDg~a~@11$*H<-tkD)8JM@61DA!aTNKf#>#hXCC?&=2gl1b9=cn4}A{%x8Fr7?d;?F z#wMOzt#{o+DNenUW(i6pWfyEdaD-Ctx<8#%I9Q^|6`8%g;fC(FFsy-L{lDSu?e_A< z_cn3dotzLj{=UXt$#(447jwq+I*{h5!X)t#@aJqkNtja zLwP&OVec>3_I9EY?6dwkA0d9Ouc!2`dh^=e?zML8=i_{THm-G^BW*ms*YRvz-yf&M#}|S6G@lRE zk6qtJ9`Z-Mc^}7}ugz0y*hi0TK|#WN_6BwDVZC4$AuB1Yp46)$tLVp z3gHy6y@&!V!6PW3-A|$b%j;YUu(sk&{;)vTQJ|&nI{L$r?xCG-RrAHt^Mw8ANGUAcOs3i%0(KD#%9xRo|q+S2xU)>P!#4U7q9b2 zIsI?G^yap#7O@v!M(3Y-Ei6lkd{qCflGu^o%O zhW81|OjD6)oWTqBM}DY7?1wj;!4iKH1zPG3)1OsFT4VpwR2wB!CyVK8pC{3q-)7OC zgJ?aEz7u*9jm>JTFEnr-DCd%?@SiyIkG68MS7Mz!gFXl z>c1_8Y(nx$uhN@-`SdJ<(2GJ3+A_>Sdr~}~o?db(^dx2vdeX|H6!1Zm!?9m0Yo`-` z|5h~s8HF4|HX&D#Ukq^3N1z$Pivzt9WF372&vc?22@MS(Zy3&^k3ia^*4*CuSug;zL3_7t+zJPMLWtRnIy(OEyz(?1paAEVEt29Vpz5i zRtF)YWg;DYv6wHat#Zs~@EHE%h2Li%AM2yt^~~0gd_iYjL18(a`4BOa{%0O-1_53o z9UnQN?HtSTFG7Q(Wvp02XKo+6oJxTD;Cmr68vakEyUg*NznyC%y6>DyU!Pt;XO3%+ zZ%@y*$^c|3-G3Gl;=N?h`Qud3ZyfFUiN{Q8xvZr*JNX^C+B8VFQJY6gE+~fWl@9xaVI;>x(E{97qG(8i@ZwafB1g Izi$ovKmJGk=l}o! literal 0 HcmV?d00001 From ccdbe0818e5dfa6c9fe634f75f9fcd259571dd7f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 15:29:51 +0800 Subject: [PATCH 586/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E9=94=99=E8=AF=AF=E7=9A=84=E5=88=86=E4=B9=8B?= =?UTF-8?q?=E5=90=88=E5=B9=B6=EF=BC=8C=E5=B0=86=E5=8C=BA=E5=9D=97=E9=93=BE?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=88=E5=B9=B6=E5=88=B0=E4=BA=86=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E5=88=86=E6=94=AF=EF=BC=8C=E6=9A=82=E6=97=B6=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E6=8E=89=E5=85=B7=E4=BD=93=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E6=8E=A5=E5=8F=97=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/BlockChainProjectController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java index 2ec27b1e27..75701ac62a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java @@ -28,8 +28,8 @@ public class BlockChainProjectController { */ @PostMapping("create") public Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input) { - ValidatorUtils.validateEntity(input); - blockChainProjectService.blockChainCreateProject(input); + //ValidatorUtils.validateEntity(input); + //blockChainProjectService.blockChainCreateProject(input); return new Result(); } @@ -40,8 +40,8 @@ public class BlockChainProjectController { */ @PostMapping("process") public Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input) { - ValidatorUtils.validateEntity(input); - blockChainProjectService.blockChainProcessProject(input); + //ValidatorUtils.validateEntity(input); + //blockChainProjectService.blockChainProcessProject(input); return new Result(); } } From b26621f89933f1cf87d133aab4c7eee69b2731f6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 15:48:08 +0800 Subject: [PATCH 587/589] 1 --- .../com/epmet/service/impl/BlockChainUploadServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java index 0d745d23cc..9a8837f120 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -36,6 +36,10 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService { */ public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities, String projectStaffId) { + if (true) { + return; + } + // 1.项目主信息 BlockChainProjectFormDTO project = null; From 393ce22f97c6607e467b59fde7523c63da00982e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 17:12:50 +0800 Subject: [PATCH 588/589] =?UTF-8?q?=E6=95=B0=E6=8D=AE3=E7=89=88=20=20?= =?UTF-8?q?=E5=88=A0=E6=8E=89=E5=B7=B2=E7=BB=8F=E6=89=A7=E8=A1=8C=E7=9A=84?= =?UTF-8?q?sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.11__point_rule_sort.sql => uv11__point_rule_sort.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/{V0.0.11__point_rule_sort.sql => uv11__point_rule_sort.sql} (100%) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/uv11__point_rule_sort.sql similarity index 100% rename from epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql rename to epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/uv11__point_rule_sort.sql From 27362b45cbbc2e826f117d55f9f7b74d68121be6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 23:49:26 +0800 Subject: [PATCH 589/589] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20auth?= =?UTF-8?q?=E7=9A=84serviceListChangedListening=E9=80=89=E9=A1=B9=E5=BF=98?= =?UTF-8?q?=E8=AE=B0=E9=85=8D=E7=BD=AE=E5=88=B0yml=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/src/main/resources/bootstrap.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 42ec69d1ac..bf965caff7 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: namespace: @nacos.discovery.namespace@ #不把自己注册到注册中心的地址 register-enabled: @nacos.register-enabled@ + serviceListChangedListening: + enable: @nacos.service-list-changed-listening.enable@ config: enabled: @nacos.config-enabled@ server-addr: @nacos.server-addr@