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 01/21] =?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 02/21] =?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 03/21] =?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 04/21] =?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 05/21] =?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 06/21] =?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 07/21] =?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 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 08/21] =?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 09/21] =?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 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 10/21] =?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 11/21] =?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 de876a5f199644b791bea7d3d2d61c56470435c8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 3 Jul 2020 13:41:45 +0800
Subject: [PATCH 12/21] =?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>

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

---
 .../data-statistical-server/deploy/docker-compose-test.yml      | 2 +-
 .../epmet-job/epmet-job-server/deploy/docker-compose-test.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 db00d0fe81..5b0b665ec3 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.32
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.34
     ports:
       - "8108:8108"
     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 26ab09d090..b2f9908801 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.19
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.20
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

From c239953688f5840e0d7d96b8d02c7a5ded34b45c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 13:50:38 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2job=20stats=20gateway?=
 =?UTF-8?q?=20user=20grid=20group=20access?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/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 +-
 .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml
index 2a2be6f5b2..9d22015e43 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.19
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.20
     ports:
       - "8080:8080"
     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 77a2252acc..54b65bd131 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.35
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.36
     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 08aedd497f..06dfa3894a 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.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.37
     ports:
       - "8097:8097"
     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 0d9b45e248..d3b2202d4d 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.54
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.57
     ports:
       - "8095:8095"
     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 9ca5c16ba3..c317daf525 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.68
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.69
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

From 640e111ec04c4bdbdd06f9f225d34046e0ba5638 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 13:52:55 +0800
Subject: [PATCH 15/21] =?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-test.yml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4ee6c2d009..94c8568357 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.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.25
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

From 50bb2ffea7fc6020ed1f0c1f0fee97ce259b4f44 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 14:30:58 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user=20stats?=
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-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/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index 9e28314672..4b1fa17b96 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.34
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.35
     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 351aa17623..e2c39cb343 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.34</version>
+    <version>0.3.35</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
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 8c9ec5d70f..dc9bdcd365 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.69
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.70
     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 cd2023d224..d7d85858ba 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.69</version>
+    <version>0.3.70</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 48503ea793ec77fa42804d1ad8c10bd7bf6f2e1c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 14:32:30 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user=20stats?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-statistical-server/deploy/docker-compose-test.yml      | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 5b0b665ec3..829e338cb6 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.34
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.35
     ports:
       - "8108:8108"
     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 c317daf525..e645eed62a 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.69
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.70
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

From 43dc6b32870fdef6e8e545d4095ea8458bc4cf98 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 14:39:11 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user=20stats?=
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 dc9bdcd365..b19eb3ac18 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.70
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.71
     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 d7d85858ba..c5dcd5460e 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.70</version>
+    <version>0.3.71</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 8f0ce2c9ad470837be34aedffa4c580b6f4abcc5 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 14:42:38 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user=20stats?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e645eed62a..2bc28ef386 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.70
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.71
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

From dd16cb0362ba08e7e3fa75a5d3b6ac6cf417d36c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 14:45:12 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user?=
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 b19eb3ac18..3c6ab893a4 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.71
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.72
     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 c5dcd5460e..8a77775175 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.71</version>
+    <version>0.3.72</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From cab5e8d577d261499f0211c89b682c0a32f4c459 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 3 Jul 2020 14:46:10 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2bc28ef386..77b361f623 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.71
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.72
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络