From e38b864f1b73b935e797568755c61983c682adc4 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Jul 2020 09:59:22 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD=E5=92=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?0=E7=9A=84=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/project/ProjectDao.xml   | 32 +++++++++----------
 .../stats/FactAgencyProjectDailyEntity.java   | 28 ++++++++--------
 .../stats/FactAgencyProjectMonthlyEntity.java | 28 ++++++++--------
 .../stats/FactGridProjectDailyEntity.java     | 28 ++++++++--------
 .../stats/FactGridProjectMonthlyEntity.java   | 28 ++++++++--------
 5 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 108f2add31..6a0a73c526 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -27,8 +27,8 @@
         (
             SELECT
                 "处理中" AS "name",
-                pending_total AS "value",
-                pending_ratio AS "ratioInt"
+                IFNULL(pending_total,0) AS "value",
+                IFNULL(pending_ratio,0) AS "ratioInt"
             FROM
                 fact_agency_project_daily
             WHERE
@@ -42,8 +42,8 @@
         (
             SELECT
                 "已结案" AS "name",
-                closed_total AS "value",
-                closed_ratio AS "ratioInt"
+                IFNULL(closed_total,0) AS "value",
+                IFNULL(closed_ratio,0) AS "ratioInt"
             FROM
                 fact_agency_project_daily
             WHERE
@@ -84,9 +84,9 @@
                 SELECT
                     da.id AS "agencyId",
                     da.agency_name AS "name",
-                    fapd.pending_total AS "value",
+                    IFNULL(fapd.pending_total,0) AS "value",
                     "处理中" AS "type",
-                    fapd.project_total
+                    IFNULL(fapd.project_total,0)
                 FROM
                     fact_agency_project_daily fapd
                 LEFT JOIN dim_agency da ON fapd.agency_id = da.id
@@ -100,9 +100,9 @@
                 SELECT
                     da.id AS "agencyId",
                     da.agency_name AS "name",
-                    fapd.closed_total AS "value",
+                    IFNULL(fapd.closed_total,0) AS "value",
                     "已结案" AS "type",
-                    fapd.project_total
+                    IFNULL(fapd.project_total,0)
                 FROM
                     fact_agency_project_daily fapd
                 LEFT JOIN dim_agency da ON fapd.agency_id = da.id
@@ -124,9 +124,9 @@
                     SELECT
                         da.id AS "agencyId",
                         dg.grid_name AS "name",
-                        fgpd.pending_total AS "value",
+                        IFNULL(fgpd.pending_total,0) AS "value",
                         "处理中" AS "type",
-                        fgpd.project_total
+                        IFNULL(fgpd.project_total,0)
                     FROM
                         fact_grid_project_daily fgpd
                     LEFT JOIN dim_agency da ON fgpd.agency_id = da.id
@@ -143,9 +143,9 @@
                     SELECT
                         da.id AS "agencyId",
                         dg.grid_name AS "name",
-                        fgpd.closed_total AS "value",
+                        IFNULL(fgpd.closed_total,0) AS "value",
                         "已结案" AS "type",
-                        fgpd.project_total
+                        IFNULL(fgpd.project_total,0)
                     FROM
                         fact_grid_project_daily fgpd
                     LEFT JOIN dim_agency da ON fgpd.agency_id = da.id
@@ -167,7 +167,7 @@
             (
                 SELECT
                     DATE_FORMAT(date_id, "%Y/%m/%d") AS "date",
-                    pending_incr AS "value",
+                    IFNULL(pending_incr,0) AS "value",
                     "处理中" AS "type",
                     date_id
                 FROM
@@ -183,7 +183,7 @@
             (
                 SELECT
                     DATE_FORMAT(date_id, "%Y/%m/%d") AS "date",
-                    closed_incr AS "value",
+                    IFNULL(closed_incr,0) AS "value",
                     "已结案" AS "type",
                     date_id
                 FROM
@@ -203,7 +203,7 @@
             (
                 SELECT
                     DATE_FORMAT(CONCAT(month_id,"00"), "%Y/%m") AS "date",
-                    pending_incr AS "value",
+                    IFNULL(pending_incr,0) AS "value",
                     "处理中" AS "type",
                     month_id
                 FROM
@@ -219,7 +219,7 @@
             (
                 SELECT
                     DATE_FORMAT(CONCAT(month_id,"00"), "%Y/%m") AS "date",
-                    closed_incr AS "value",
+                    IFNULL(closed_incr,0) AS "value",
                     "已结案" AS "type",
                     month_id
                 FROM
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java
index 9f609723f4..baff107cf3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java
@@ -82,71 +82,71 @@ public class FactAgencyProjectDailyEntity extends BaseEpmetEntity {
     /**
      * 截止当日项目总数 【当前组织及下级项目总数】
      */
-	private Integer projectTotal;
+	private Integer projectTotal = 0;
 
     /**
      * 截止当日处理中项目数 【当前组织及下级所有未结案项目总数】
      */
-	private Integer pendingTotal;
+	private Integer pendingTotal = 0;
 
     /**
      * 截止当日处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal pendingRatio;
+	private BigDecimal pendingRatio = new BigDecimal("0");
 
     /**
      * 截止当日已结案项目数 【当前组织及下级已结案项目总数】
      */
-	private Integer closedTotal;
+	private Integer closedTotal = 0;
 
     /**
      * 截止当日已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal closedRatio;
+	private BigDecimal closedRatio = new BigDecimal("0");
 
     /**
      * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
      */
-	private Integer resolvedTotal;
+	private Integer resolvedTotal = 0;
 
     /**
      * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
      */
-	private BigDecimal resolvedRatio;
+	private BigDecimal resolvedRatio = new BigDecimal("0");
 
     /**
      * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
      */
-	private Integer unresolvedTotal;
+	private Integer unresolvedTotal = 0;
 
     /**
      * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
      */
-	private BigDecimal unresolvedRatio;
+	private BigDecimal unresolvedRatio = new BigDecimal("0");
 
     /**
      * 当日项目总数 【当前组织及下级项目总数】
      */
-	private Integer projectIncr;
+	private Integer projectIncr = 0;
 
     /**
      * 当日处理中项目数 【当前组织及下级前一日新增处理中项目数】
      */
-	private Integer pendingIncr;
+	private Integer pendingIncr = 0;
 
     /**
      * 当日已结案项目数 【当前组织及下级前一日新增结案项目数】
      */
-	private Integer closedIncr;
+	private Integer closedIncr = 0;
 
     /**
      * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
      */
-	private Integer resolvedIncr;
+	private Integer resolvedIncr = 0;
 
     /**
      * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
      */
-	private Integer unresolvedIncr;
+	private Integer unresolvedIncr = 0;
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java
index 8b147a3f18..7a9fc7c50a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java
@@ -72,71 +72,71 @@ public class FactAgencyProjectMonthlyEntity extends BaseEpmetEntity {
     /**
      * 截止当月项目总数 【当前组织及下级项目总数】
      */
-	private Integer projectTotal;
+	private Integer projectTotal = 0;
 
     /**
      * 截止当月处理中项目数 【当前组织及下级所有未结案项目总数】
      */
-	private Integer pendingTotal;
+	private Integer pendingTotal = 0;
 
     /**
      * 截止当月处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal pendingRatio;
+	private BigDecimal pendingRatio = new BigDecimal("0");
 
     /**
      * 截止当月已结案项目数 【当前组织及下级已结案项目总数】
      */
-	private Integer closedTotal;
+	private Integer closedTotal = 0;
 
     /**
      * 截止当月已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal closedRatio;
+	private BigDecimal closedRatio = new BigDecimal("0");
 
     /**
      * 截止当月已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
      */
-	private Integer resolvedTotal;
+	private Integer resolvedTotal = 0;
 
     /**
      * 截止当月已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
      */
-	private BigDecimal resolvedRatio;
+	private BigDecimal resolvedRatio = new BigDecimal("0");
 
     /**
      * 截止当月已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
      */
-	private Integer unresolvedTotal;
+	private Integer unresolvedTotal = 0;
 
     /**
      * 截止当月已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
      */
-	private BigDecimal unresolvedRatio;
+	private BigDecimal unresolvedRatio = new BigDecimal("0");
 
     /**
      * 当月项目总数 【当前组织及下级前一月新增项目数】
      */
-	private Integer projectIncr;
+	private Integer projectIncr = 0;
 
     /**
      * 当月处理中项目数 【当前组织及下级前一月新增处理中项目数】
      */
-	private Integer pendingIncr;
+	private Integer pendingIncr = 0;
 
     /**
      * 当月已结案项目数 【当前组织及下级前一月新增结案项目数】
      */
-	private Integer closedIncr;
+	private Integer closedIncr = 0;
 
     /**
      * 当月已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
      */
-	private Integer resolvedIncr;
+	private Integer resolvedIncr = 0;
 
     /**
      * 当月已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
      */
-	private Integer unresolvedIncr;
+	private Integer unresolvedIncr = 0;
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java
index 93c1f71499..e507f74500 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java
@@ -82,71 +82,71 @@ public class FactGridProjectDailyEntity extends BaseEpmetEntity {
     /**
      * 截止当日网格下项目总数 【当前组织及下级项目总数】
      */
-	private Integer projectTotal;
+	private Integer projectTotal = 0;
 
     /**
      * 截止当日网格下处理中项目数 【当前组织及下级所有未结案项目总数】
      */
-	private Integer pendingTotal;
+	private Integer pendingTotal = 0;
 
     /**
      * 截止当日网格下处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal pendingRatio;
+	private BigDecimal pendingRatio = new BigDecimal("0");
 
     /**
      * 截止当日网格下已结案项目数 【当前组织及下级已结案项目总数】
      */
-	private Integer closedTotal;
+	private Integer closedTotal = 0;
 
     /**
      * 截止当日网格下已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal closedRatio;
+	private BigDecimal closedRatio = new BigDecimal("0");
 
     /**
      * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
      */
-	private Integer resolvedTotal;
+	private Integer resolvedTotal = 0;
 
     /**
      * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
      */
-	private BigDecimal resolvedRatio;
+	private BigDecimal resolvedRatio = new BigDecimal("0");
 
     /**
      * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
      */
-	private Integer unresolvedTotal;
+	private Integer unresolvedTotal = 0;
 
     /**
      * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
      */
-	private BigDecimal unresolvedRatio;
+	private BigDecimal unresolvedRatio = new BigDecimal("0");
 
     /**
      * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
      */
-	private Integer resolvedIncr;
+	private Integer resolvedIncr = 0;
 
     /**
      * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
      */
-	private Integer unresolvedIncr;
+	private Integer unresolvedIncr = 0;
 
     /**
      * 当日网格下项目总数 【该网格下项目总数】
      */
-	private Integer projectIncr;
+	private Integer projectIncr = 0;
 
     /**
      * 当日网格下处理中项目数 【该网格下未结案项目总数】
      */
-	private Integer pendingIncr;
+	private Integer pendingIncr = 0;
 
     /**
      * 当日网格下已结案项目数 【该网格下已结案项目总数】
      */
-	private Integer closedIncr;
+	private Integer closedIncr = 0;
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java
index dd79ecc9fa..1ed377a64f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java
@@ -72,71 +72,71 @@ public class FactGridProjectMonthlyEntity extends BaseEpmetEntity {
     /**
      * 截止当月项目总数 【当前组织及下级项目总数】
      */
-	private Integer projectTotal;
+	private Integer projectTotal = 0;
 
     /**
      * 截止当月处理中项目数 【当前组织及下级所有未结案项目总数】
      */
-	private Integer pendingTotal;
+	private Integer pendingTotal = 0;
 
     /**
      * 截止当月处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal pendingRatio;
+	private BigDecimal pendingRatio = new BigDecimal("0");
 
     /**
      * 截止当月已结案项目数 【当前组织及下级已结案项目总数】
      */
-	private Integer closedTotal;
+	private Integer closedTotal = 0;
 
     /**
      * 截止当月已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
      */
-	private BigDecimal closedRatio;
+	private BigDecimal closedRatio = new BigDecimal("0");
 
     /**
      * 截止当月已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
      */
-	private Integer resolvedTotal;
+	private Integer resolvedTotal = 0;
 
     /**
      * 截止当月已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
      */
-	private BigDecimal resolvedRatio;
+	private BigDecimal resolvedRatio = new BigDecimal("0");
 
     /**
      * 截止当月已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
      */
-	private Integer unresolvedTotal;
+	private Integer unresolvedTotal = 0;
 
     /**
      * 截止当月已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
      */
-	private BigDecimal unresolvedRatio;
+	private BigDecimal unresolvedRatio = new BigDecimal("0");
 
     /**
      * 当月项目总数 【当前组织及下级前一月新增项目数】
      */
-	private Integer projectIncr;
+	private Integer projectIncr = 0;
 
     /**
      * 当月处理中项目数 【当前组织及下级前一月新增处理中项目数】
      */
-	private Integer pendingIncr;
+	private Integer pendingIncr = 0;
 
     /**
      * 当月已结案项目数 【当前组织及下级前一月新增结案项目数】
      */
-	private Integer closedIncr;
+	private Integer closedIncr = 0;
 
     /**
      * 当月已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
      */
-	private Integer resolvedIncr;
+	private Integer resolvedIncr = 0;
 
     /**
      * 当月已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
      */
-	private Integer unresolvedIncr;
+	private Integer unresolvedIncr = 0;
 
 }

From fd114ed3ade3ae36b90c3558f9f7312cde36e64f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Jul 2020 10:03:34 +0800
Subject: [PATCH 02/17] =?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 +-
 .../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 3d87107f55..b9bd8a3081 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.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.24
     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 b585d39d7a..6fd896409d 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">
 
-    <version>0.3.23</version>
+    <version>0.3.24</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>
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 3cea9aa7f5..4be99dbdd1 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.32
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.33
     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 35dc700f49..78d8b27df6 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.32</version>
+    <version>0.3.33</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

From 1e5e59e965012dd46d5cde0625e9f90e1d976ac3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Jul 2020 10:25:45 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectDao.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 6a0a73c526..cd08762de4 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -86,7 +86,7 @@
                     da.agency_name AS "name",
                     IFNULL(fapd.pending_total,0) AS "value",
                     "处理中" AS "type",
-                    IFNULL(fapd.project_total,0)
+                    IFNULL(fapd.project_total,0) AS "projectTotal"
                 FROM
                     fact_agency_project_daily fapd
                 LEFT JOIN dim_agency da ON fapd.agency_id = da.id
@@ -102,7 +102,7 @@
                     da.agency_name AS "name",
                     IFNULL(fapd.closed_total,0) AS "value",
                     "已结案" AS "type",
-                    IFNULL(fapd.project_total,0)
+                    IFNULL(fapd.project_total,0) AS "projectTotal"
                 FROM
                     fact_agency_project_daily fapd
                 LEFT JOIN dim_agency da ON fapd.agency_id = da.id
@@ -113,7 +113,7 @@
             )
         ) a
         ORDER BY
-            a.project_total DESC
+            a.projectTotal DESC
     </select>
 
     <select id="selectSubGrid" resultType="com.epmet.project.dto.result.ProjectSubGridResultDTO">
@@ -126,7 +126,7 @@
                         dg.grid_name AS "name",
                         IFNULL(fgpd.pending_total,0) AS "value",
                         "处理中" AS "type",
-                        IFNULL(fgpd.project_total,0)
+                        IFNULL(fgpd.project_total,0) AS "projectTotal"
                     FROM
                         fact_grid_project_daily fgpd
                     LEFT JOIN dim_agency da ON fgpd.agency_id = da.id
@@ -145,7 +145,7 @@
                         dg.grid_name AS "name",
                         IFNULL(fgpd.closed_total,0) AS "value",
                         "已结案" AS "type",
-                        IFNULL(fgpd.project_total,0)
+                        IFNULL(fgpd.project_total,0) AS "projectTotal"
                     FROM
                         fact_grid_project_daily fgpd
                     LEFT JOIN dim_agency da ON fgpd.agency_id = da.id
@@ -159,7 +159,7 @@
                 )
             ) a
         ORDER BY
-            a.project_total DESC, a.type ASC
+            a.projectTotal DESC, a.type ASC
     </select>
 
     <select id="selectIncrTrendDaily" resultType="com.epmet.project.dto.result.ProjectIncrTrendResultDTO">

From fbc78d8bb9c4cc65a70c66c11bbcad868031a297 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Jul 2020 10:26:37 +0800
Subject: [PATCH 04/17] =?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 b9bd8a3081..59824b4c30 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.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.25
     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 6fd896409d..78386a29db 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">
 
-    <version>0.3.24</version>
+    <version>0.3.25</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

From b74c5f7f92a764349c72abe35ab480d3a1aba746 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Jul 2020 10:28:36 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/GridVisitedDao.java    |  7 ++++-
 .../service/impl/GridVisitedServiceImpl.java  | 28 ++++++++++++-------
 .../main/resources/mapper/GridVisitedDao.xml  | 16 ++++++++++-
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
index efa4fb8189..4efb9ad241 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
@@ -23,6 +23,9 @@ import com.epmet.dto.GridVisitedDTO;
 import com.epmet.entity.GridLatestEntity;
 import com.epmet.entity.GridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 网格访问记录表 用户对网格访问的一个记录，只有在访问网格首页时才存储数据,一个用户一天对一个网格的访问只有一条记录
@@ -33,6 +36,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
 
-    GridVisitedDTO selectGridVisitedByGridIdAndUserId(GridVisitedDTO formDTO);
+    List<GridVisitedDTO> selectGridVisitedByGridIdAndUserId(GridVisitedDTO formDTO);
     int updateByVisitedId(GridVisitedDTO dto);
+    void deleteBatch(@Param("ids") List<String> ids);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
index 4faed63857..1b8f1aaa17 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
@@ -21,6 +21,7 @@ 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.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -42,10 +43,7 @@ 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.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 网格访问记录表 用户对网格访问的一个记录，只有在访问网格首页时才存储数据,一个用户一天对一个网格的访问只有一条记录
@@ -165,16 +163,26 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
         gridVisitedDTO.setVisitTime(date);
         gridVisitedDTO.setUpdatedTime(date);
         //查询是否存在历史数据( 一个用户一天对一个网格只存在一条访问记录)
-        GridVisitedDTO dto = baseDao.selectGridVisitedByGridIdAndUserId(gridVisitedDTO);
+        List<GridVisitedDTO> dto = baseDao.selectGridVisitedByGridIdAndUserId(gridVisitedDTO);
         GridVisitedEntity entity = null;
-        if (dto == null || dto.getId() == null) {
+        boolean result = false;
+        if(null == dto || dto.size() <= NumConstant.ZERO){
             entity = ConvertUtils.sourceToTarget(gridVisitedDTO, GridVisitedEntity.class);
             return insert(entity);
-        } else {
-            dto.setUpdatedBy(visitedFormDTO.getUserId());
-            dto.setUpdatedTime(date);
-            return BaseServiceImpl.retBool(gridVisitedDao.updateByVisitedId(dto));
+        }else{
+            dto.get(NumConstant.ZERO).setUpdatedBy(visitedFormDTO.getUserId());
+            dto.get(NumConstant.ZERO).setUpdatedTime(date);
+            result = BaseServiceImpl.retBool(gridVisitedDao.updateByVisitedId(dto.get(NumConstant.ZERO)));
+            if(dto.size() > NumConstant.ONE){
+                List<String> ids = new LinkedList<>();
+                dto.subList(NumConstant.ONE,dto.size()).forEach(obj -> {
+                    ids.add(obj.getId());
+                });
+                baseDao.deleteBatch(ids);
+            }
+
         }
+        return result;
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
index 8eb0c72a93..57d2470ebe 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
@@ -48,13 +48,27 @@
         <if test='visitTime != null'>
             AND to_days(vi.visit_time) = to_days(#{visitTime})
         </if>
+        ORDER BY
+        vi.visit_time DESC
     </select>
 
     <update id="updateByVisitedId">
         UPDATE grid_visited
-        SET updated_by = #{updatedBy},
+        SET
+            visit_time = #{updatedTime},
+            updated_by = #{updatedBy},
             updated_time = #{updatedTime}
         WHERE id = #{id}
     </update>
 
+
+    <update id="deleteBatch" parameterType="java.util.List">
+        UPDATE grid_visited
+        SET del_flag = '1',
+        updated_time = now()
+        WHERE
+        <foreach collection="ids" item="id" open="" separator="OR" close="">
+            ID = #{id}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file

From 3ef42758ea73b039090271b6915aa94d539b77c5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Jul 2020 10:34:42 +0800
Subject: [PATCH 06/17] =?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

---
 .../src/main/resources/mapper/project/ProjectDao.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index cd08762de4..01ed21f5e3 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -7,7 +7,7 @@
     <select id="selectProjectSummary" resultType="com.epmet.project.dto.result.ProjectSummaryResultDTO">
         SELECT
             agency_id AS "agencyId",
-            project_total AS "projectTotal",
+            IFNULL(project_total,0) AS "projectTotal",
             DATE_FORMAT(date_id, '%Y.%m.%d') AS "dateName",
             IFNULL(pending_total,0) AS "pendingTotal",
             /*CAST(pending_ratio AS DECIMAL (9, 2)) AS "pendingRatioInt",*/

From d05e718bce8c413afea1487b617285180745a0ec Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 3 Jul 2020 10:46:47 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=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

---
 .../modules/topic/service/impl/ResiTopicServiceImpl.java    | 6 +++++-
 .../main/java/com/epmet/modules/utils/ModuleConstant.java   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 9b007b526a..958b1b4424 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
@@ -599,7 +599,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             List<ResiTopicOperationEntity> records =
             resiTopicOperationDao.selectList(queryWrapper);
             if(null != records && records.size() > NumConstant.ZERO){
-                closeDetail.setCloseReason(records.get(0).getOperationReason());
+                if(StringUtils.isNotBlank(records.get(0).getOperationReason())){
+                    closeDetail.setCloseReason(String.format("%s%s",
+                            ModuleConstant.CLOSED_TOPIC_REASON_PREFIX,
+                            records.get(0).getOperationReason()));
+                }
                 closeDetail.setCloseDateTime(records.get(0).getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
                 ResiGroupMemberInfoRedisDTO closedBy =
                         resiGroupMemberRedis.get(group.getId(),records.get(0).getCreatedBy());
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 2d1bcc545f..094c58bda7 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
@@ -326,4 +326,6 @@ public interface ModuleConstant extends Constant {
 	String FILED_TOPIC_ID = "TOPIC_ID";
 
 	String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
+
+	String CLOSED_TOPIC_REASON_PREFIX="话题已关闭：";
 }

From 6ca78abf8369455848c0caca9d3b6d7abe393386 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 3 Jul 2020 10:48:27 +0800
Subject: [PATCH 08/17] =?UTF-8?q?resigroup+1=EF=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
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 da59714c77..d82eb93305 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.55
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.56
     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 ee5b14c6f8..eca8e1153f 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.55</version>
+    <version>0.3.56</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

From 5c5272d82743f6d400e16fb53ce79c724dfb1dc0 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 11:13:00 +0800
Subject: [PATCH 09/17] =?UTF-8?q?gateway=E6=8E=92=E9=99=A4=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/GatewayApplication.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
index 352ae0df92..5c8d111813 100644
--- a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
+++ b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
@@ -8,11 +8,13 @@
 
 package com.epmet;
 
+import com.epmet.commons.tools.aspect.ServletExceptionHandler;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 
 /**
  * 网关服务
@@ -20,9 +22,10 @@ import org.springframework.context.annotation.ComponentScan;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@SpringBootApplication
+@SpringBootApplication()
 @EnableDiscoveryClient
 @EnableFeignClients
+@ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {ServletExceptionHandler.class}))
 public class GatewayApplication {
 
 	public static void main(String[] args) {

From 7a0340c51fb919b11126b6e365568b12d771cc14 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Jul 2020 11:25:06 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9C=AC=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/service/impl/ResiGroupServiceImpl.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 e9162746bf..dd386b6ebb 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
@@ -675,6 +675,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					groupsInGridResultDTO.setStatus(group.getState());
 					groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
 					groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
+					resultList.add(groupsInGridResultDTO);
 			} else if(MemberStateConstant.APPROVED.equals(group.getState())) {
 				//缓存中获取组信息
 				ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId());
@@ -684,9 +685,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
 				groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
 				groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
+				resultList.add(groupsInGridResultDTO);
 			}
 
-			resultList.add(groupsInGridResultDTO);
+
 		});
 
 		return new Result<List<GroupsInGridResultDTO>>().ok(resultList);

From 63a9b33551198fa6a9bb40bc118a43ff03c021a4 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Jul 2020 11:38:54 +0800
Subject: [PATCH 11/17] =?UTF-8?q?user=E3=80=81group=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
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 +-
 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-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index d82eb93305..794e3f1eb6 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.56
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.57
     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 eca8e1153f..caa5ac9e36 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.56</version>
+    <version>0.3.57</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
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 7151b2b15d..8c9ec5d70f 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.68
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.69
     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 e1f620d602..cd2023d224 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.68</version>
+    <version>0.3.69</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From cf0402bb51f31ffaf8fa846b56f1e95d7b742e75 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 13:09:54 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E9=92=89=E9=92=89=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E6=B6=88=E6=81=AF=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/enums/EnvEnum.java    | 44 +++++++++++
 .../tools/filter/LogMsgSendFilter.java        | 10 +++
 .../tools/utils/DingdingMsgSender.java        | 73 +++++++++++++++++--
 .../data-statistical-server/pom.xml           |  8 ++
 .../com/epmet/controller/DemoController.java  |  6 +-
 .../src/main/resources/bootstrap.yml          |  7 +-
 .../src/main/resources/logback-spring.xml     |  8 +-
 .../epmet-job/epmet-job-server/pom.xml        |  8 +-
 .../src/main/resources/bootstrap.yml          |  5 ++
 .../src/main/resources/logback-spring.xml     |  8 +-
 10 files changed, 163 insertions(+), 14 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java

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
new file mode 100644
index 0000000000..ed265248e6
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java
@@ -0,0 +1,44 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * 系统环境变量枚举类
+ * dev|test|prod
+ *
+ * @author jianjun liu
+ * @date 2020-07-03 11:14
+ **/
+public enum EnvEnum {
+	DEV("dev", "开发环境"),
+	TEST("test", "体验环境"),
+	PROD("prod", "生产环境"),
+	UN_KNOWN("un_known", "未知"),
+	;
+
+	private String code;
+	private String name;
+
+
+
+	EnvEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+	public static EnvEnum getEnum(String code) {
+		EnvEnum[] values = EnvEnum.values();
+		for (EnvEnum value : values) {
+			if (code != null && value.getCode().equals(code)) {
+				return value;
+			}
+		}
+		return EnvEnum.UN_KNOWN;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getName() {
+		return name;
+	}
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
index f3c70840d6..2ffe50a5f4 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
@@ -7,6 +7,7 @@ import ch.qos.logback.classic.spi.IThrowableProxy;
 import ch.qos.logback.classic.spi.StackTraceElementProxy;
 import ch.qos.logback.core.spi.FilterReply;
 import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.DingdingMsgSender;
 import com.epmet.commons.tools.utils.IpUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +27,7 @@ public class LogMsgSendFilter extends LevelFilter {
 	private DingdingMsgSender msgSender = new DingdingMsgSender();
 	private String webHook;
 	private String secret;
+	private String activeEnv;
 
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
@@ -39,6 +41,10 @@ public class LogMsgSendFilter extends LevelFilter {
 
 				stringBuilder.append("告警级别：" + event.getLevel());
 				stringBuilder.append("\n");
+				if (StringUtils.isNotBlank(activeEnv)) {
+					stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName());
+					stringBuilder.append("\n");
+				}
 				String serverIp = IpUtils.getServerIp();
 				if (StringUtils.isNotBlank(serverIp)) {
 					stringBuilder.append("IP地址：" + serverIp);
@@ -112,6 +118,10 @@ public class LogMsgSendFilter extends LevelFilter {
 		return dateFormat.format(timestamp);
 	}
 
+	public void setActiveEnv(String activeEnv) {
+		this.activeEnv = activeEnv;
+	}
+
 	public void setWebHook(String webHook) {
 		this.webHook = webHook;
 	}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java
index 4250c158b8..59016ccc88 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java
@@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.google.common.collect.Lists;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
@@ -12,7 +13,12 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.concurrent.ArrayBlockingQueue;
 
@@ -48,7 +54,7 @@ public class DingdingMsgSender {
 			//阻塞取元素
 			msg = msgQueue.take();
 			if (msg != null) {
-				sendPostByJSON(msg);
+				sendMsg(msg);
 			} else {
 				Thread.sleep(1000);
 			}
@@ -81,7 +87,7 @@ public class DingdingMsgSender {
 			DingTalkTextMsg param = new DingTalkTextMsg();
 			param.setContent("待发送消息队列已满,当前队列个数" + msgQueue.size() + "\n" + "最新消息内容:" + JSON.toJSONString(messageParam));
 			param.setWebHook(messageParam.getWebHook());
-			sendPostByJSON(param);
+			sendMsg(param);
 		}
 		return flag;
 	}
@@ -94,7 +100,7 @@ public class DingdingMsgSender {
 	 * @throws IOException
 	 */
 	public Result<String> sendMsgSync(DingTalkTextMsg messageParam) {
-		return sendPostByJSON(messageParam);
+		return sendMsg(messageParam);
 	}
 
 	private Thread getThread() {
@@ -121,7 +127,7 @@ public class DingdingMsgSender {
 	 * @param param 请求参数，JSON格式
 	 * @return
 	 */
-	private Result<String> sendPostByJSON(DingTalkTextMsg param) {
+	private Result<String> sendMsg(DingTalkTextMsg param) {
 		if (StringUtils.isBlank(param.getWebHook())) {
 			param.setWebHook(webHook);
 		}
@@ -139,13 +145,70 @@ public class DingdingMsgSender {
 			String url = param.getWebHook();
 			url = url.concat("&timestamp=" + timestamp + "&sign=" + sign);
 			String jsonStrParam = param.getMsgContent();
-			result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam);
+			result = this.sendPostByJSON(url, jsonStrParam);
 		} catch (Exception e) {
 			logger.warn("sendPostByJSON error", e);
 		}
 		return result;
 	}
 
+	/**
+	 * 发送POST 请求
+	 *
+	 * @param url   发送请求的 URL
+	 * @param param 请求参数，JSON格式
+	 * @return
+	 */
+	public Result<String> sendPostByJSON(String url, String param) throws IOException {
+		if (StringUtils.isEmpty(url) || StringUtils.isEmpty(param)) {
+			throw new IllegalArgumentException("参数不能为空");
+		}
+		PrintWriter out = null;
+		BufferedReader in = null;
+		String result = "";
+		try {
+			URL realUrl = new URL(url);
+			// 打开和URL之间的连接
+			URLConnection conn = realUrl.openConnection();
+			// 设置通用的请求属性
+			conn.setRequestProperty("accept", "*/*");
+			conn.setRequestProperty("Content-Type", "application/json");
+			conn.setRequestProperty("connection", "Keep-Alive");
+			conn.setRequestProperty("user-agent",
+					"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+			// 发送POST请求必须设置如下两行
+			conn.setDoOutput(true);
+			conn.setDoInput(true);
+			// 获取URLConnection对象对应的输出流
+			out = new PrintWriter(conn.getOutputStream());
+			// 发送请求参数
+			out.print(param);
+			// flush输出流的缓冲
+			out.flush();
+			// 定义BufferedReader输入流来读取URL的响应
+			in = new BufferedReader(
+					new InputStreamReader(conn.getInputStream()));
+			String line;
+			while ((line = in.readLine()) != null) {
+				result += line;
+			}
+		} catch (Exception e) {
+			logger.warn("sendPostByJSON error", e);
+			return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+		} finally {
+			try {
+				if (out != null) {
+					out.close();
+				}
+				if (in != null) {
+					in.close();
+				}
+			} catch (IOException ex) {
+			}
+
+		}
+		return new Result<String>().ok(result);
+	}
 
 	public static void main(String[] args) {
 		for (int i = 0; i < 50; i++) {
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 35dc700f49..5c343b5600 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -175,6 +175,10 @@
                 <thread.pool.max-pool-size>8</thread.pool.max-pool-size>
                 <thread.pool.queue-capacity>10</thread.pool.queue-capacity>
                 <thread.pool.keep-alive>30</thread.pool.keep-alive>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -257,6 +261,10 @@
                 <thread.pool.max-pool-size>8</thread.pool.max-pool-size>
                 <thread.pool.queue-capacity>10</thread.pool.queue-capacity>
                 <thread.pool.keep-alive>30</thread.pool.keep-alive>
+
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>
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 5f562630dc..2bc11e4e43 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
@@ -27,9 +27,9 @@ public class DemoController {
 
     @GetMapping("testAlarm")
     public void testAlarm() {
-        for (int i = 0; i < 20; i++) {
-            log.error("测试消息"+i);
-        }
+        //for (int i = 0; i < 20; i++) {
+            log.error("测试消息");
+        //}
     }
 
     @GetMapping("testtx")
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
index ad6caadfa5..c2ed87bf1e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@@ -162,4 +162,9 @@ thread:
     corePoolSize: @thread.pool.core-pool-size@
     maxPoolSize: @thread.pool.max-pool-size@
     queueCapacity: @thread.pool.queue-capacity@
-    keepAlive: @thread.pool.keep-alive@
\ No newline at end of file
+    keepAlive: @thread.pool.keep-alive@
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 39e86ff5ba..3d93d8a331 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,9 @@
     <property name="log.path" value="logs/data-statistical"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="activeEnv" source="spring.profiles.active"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -130,8 +133,9 @@
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
-            <webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</webHook>
-            <secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</secret>
+            <activeEnv>${activeEnv}</activeEnv>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
         </filter>
     </appender>
 
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index 96844937f4..2458788f69 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-server/pom.xml
@@ -130,11 +130,14 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+           <!-- <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>
@@ -162,6 +165,9 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index e7ace5304a..b8faf3661a 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -113,3 +113,8 @@ hystrix:
 ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
index ba7a073bbe..9f63b9901f 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,9 @@
     <property name="log.path" value="logs/job"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="activeEnv" source="spring.profiles.active"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -129,8 +132,9 @@
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
-            <webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</webHook>
-            <secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</secret>
+            <activeEnv>${activeEnv}</activeEnv>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
         </filter>
     </appender>
 

From 81d8a6c82b861f4261e51195d1b098a8b4664aee Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 13:22:49 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E9=92=89=E9=92=89=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E6=B6=88=E6=81=AF=E6=94=B9=E9=80=A0-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/filter/LogMsgSendFilter.java        |  9 +++++
 .../src/main/resources/logback-spring.xml     |  1 +
 .../com/epmet/controller/DemoController.java  | 33 +++++++++++++++++++
 .../src/main/resources/logback-spring.xml     |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
index 2ffe50a5f4..f97e405ed0 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
@@ -28,6 +28,7 @@ public class LogMsgSendFilter extends LevelFilter {
 	private String webHook;
 	private String secret;
 	private String activeEnv;
+	private String appName;
 
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
@@ -41,6 +42,10 @@ public class LogMsgSendFilter extends LevelFilter {
 
 				stringBuilder.append("告警级别：" + event.getLevel());
 				stringBuilder.append("\n");
+				if (StringUtils.isNotBlank(appName)) {
+					stringBuilder.append("服务名称：" + appName);
+					stringBuilder.append("\n");
+				}
 				if (StringUtils.isNotBlank(activeEnv)) {
 					stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName());
 					stringBuilder.append("\n");
@@ -122,6 +127,10 @@ public class LogMsgSendFilter extends LevelFilter {
 		this.activeEnv = activeEnv;
 	}
 
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
 	public void setWebHook(String webHook) {
 		this.webHook = webHook;
 	}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 3d93d8a331..9a76a9c74f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -136,6 +136,7 @@
             <activeEnv>${activeEnv}</activeEnv>
             <webHook>${webHook}</webHook>
             <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java
new file mode 100644
index 0000000000..ccb3d23d6a
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 定时任务
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Slf4j
+@RestController
+@RequestMapping("demo")
+@Api(tags="定时任务")
+public class DemoController {
+	@GetMapping("testAlarm")
+	public void testAlarm() {
+		//for (int i = 0; i < 20; i++) {
+		log.error("测试消息");
+		//}
+	}
+}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
index 9f63b9901f..fcfb1de19e 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@@ -135,6 +135,7 @@
             <activeEnv>${activeEnv}</activeEnv>
             <webHook>${webHook}</webHook>
             <secret>${secret}</secret>
+            <appName>${appname}</appName>
         </filter>
     </appender>
 

From a6f8e96cc2afb4c540a3d011a079addb5ceb03c5 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 13:28:54 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=20stats=20gateway?=
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-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 +-
 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 f378a02aa6..531e9d965d 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.19
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.20
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 9567738a36..511b0bd1cc 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.19</version>
+    <version>0.3.20</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
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 4be99dbdd1..9e28314672 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.33
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.34
     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 add9bb7ac4..351aa17623 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.33</version>
+    <version>0.3.34</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
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 d708a35ccd..a24b925af0 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.19
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.20
     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 2458788f69..32aa2b4f6a 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.19</version>
+    <version>0.3.20</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

From 509d643d5070c4adf9d582f8c8f2117bdbfa7c2d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 3 Jul 2020 13:39:14 +0800
Subject: [PATCH 15/17] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9D=83=E9=99=90=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86?=
 =?UTF-8?q?:=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86:=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/enums/RequirePermissionEnum.java     | 1 +
 .../java/com/epmet/controller/PartyBranchManageController.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 9de4b0d167..b7ac652d93 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -111,6 +111,7 @@ public enum RequirePermissionEnum {
     /**
      * 基层治理-支部管理
      */
+    WORK_GRASSROOTS_PARTY_BRANCH_LIST("work_grassroots_party_branch_list","基层治理:支部管理:查询党支部列表","支部管理-查看党支部列表"),
     WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","基层治理:支部管理:添加党支部","支部管理-添加党支部"),
     WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","基层治理:支部管理:编辑党支部","支部管理-编辑党支部信息"),
     WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","基层治理:支部管理:删除党支部","支部管理-删除党支部"),
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
index c74412719a..6e4a6e9bf3 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -67,6 +67,7 @@ public class PartyBranchManageController {
      * @Date 2020/6/17 16:15
      **/
     @PostMapping("list")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_LIST)
     public Result<List<PartyBranchListResultDTO>> listPartyBranch(@RequestBody PartyBranchListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, PartyBranchListFormDTO.AddUserInternalGroup.class);
         return new Result<List<PartyBranchListResultDTO>>().ok(partyBranchManageService.listPartyBranch(formDTO));

From f12a823130eaaf7f4032b089e1d56df32900c8f6 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 13:40:54 +0800
Subject: [PATCH 16/17] =?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

---
 .../java/com/epmet/commons/tools/filter/LogMsgSendFilter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
index f97e405ed0..45302413dd 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
@@ -53,8 +53,8 @@ public class LogMsgSendFilter extends LevelFilter {
 				String serverIp = IpUtils.getServerIp();
 				if (StringUtils.isNotBlank(serverIp)) {
 					stringBuilder.append("IP地址：" + serverIp);
+					stringBuilder.append("\n");
 				}
-				stringBuilder.append("\n");
 				stringBuilder.append("故障时间：" + formatLongTime2Str(event.getTimeStamp()));
 				stringBuilder.append("\n");
 				stringBuilder.append("TraceId：" + Thread.currentThread().getName());

From de876a5f199644b791bea7d3d2d61c56470435c8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 3 Jul 2020 13:41:45 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=9Abug=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86:?=
 =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86:=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 73bfea684d..8dc3a8f8d0 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.35
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.36
     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 a291d902f1..049ac38b1c 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.35</version>
+    <version>0.3.36</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>
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 1cd20945f9..6a66266814 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.36
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.37
     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 4e0313a293..1defd4b89c 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.36</version>
+    <version>0.3.37</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>