From 798c4e95c96ef991dd7ed26e46a9a7fc1fcbe28c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 14 Aug 2020 10:21:48 +0800
Subject: [PATCH 01/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
index c1416cc71c..11e57ebe24 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.128
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.129
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From b84d4f68116bfdf38b7f25d6207a09abe77cd72c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 20 Aug 2020 17:50:31 +0800
Subject: [PATCH 02/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
index e368b27eda..9b72f3c260 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.131
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.132
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From 5c06fa9a41a18666b0cf79927e5282f42204abcc Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 20 Aug 2020 17:51:32 +0800
Subject: [PATCH 03/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index d10eea3729..ed16793dcc 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.131
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.132
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From d10fc9bf0b8ba780638961857d75c7c0b2e26672 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 24 Aug 2020 16:16:10 +0800
Subject: [PATCH 04/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-project-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-prod.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
index 0c08e7e115..e7aae13868 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.40
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.43
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index a9847b773c..36ea6d03ac 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.118
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.120
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

From b59e2a1a9fd3cac489697db187de744049c5ea68 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 25 Aug 2020 16:03:22 +0800
Subject: [PATCH 05/66] =?UTF-8?q?third=E6=8E=A5=E5=8F=A3=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2Token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/CommonCustomerIdAndSrcFormDTO.java   | 33 +++++++++++++
 .../dto/form/CommonCustomerIdFormDTO.java     | 27 ++++++++++
 .../AuthAccessTokenClientResultDTO.java       | 26 ++++++++++
 .../dto/result/CustomerTokensResultDTO.java   | 41 ++++++++++++++++
 .../com/epmet/constant/ModuleConstant.java    |  4 ++
 .../controller/PaCustomerController.java      | 14 ++++++
 .../com/epmet/dao/AuthorizationInfoDao.java   |  9 ++++
 .../epmet/dao/ComponentAccessTokenDao.java    |  9 ++++
 .../com/epmet/service/PaCustomerService.java  | 21 ++++++++
 .../service/impl/PaCustomerServiceImpl.java   | 49 +++++++++++++++++++
 .../resources/mapper/AuthorizationInfoDao.xml | 12 +++++
 .../mapper/ComponentAccessTokenDao.xml        | 11 +++++
 12 files changed, 256 insertions(+)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
new file mode 100644
index 0000000000..080e7fcd8f
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 公众号客户删除入参DTO
+ * @NEI  https://nei.netease.com/interface/detail/?pid=52285&id=323482
+ * @ClassName CommonCustomerIdAndSrcFormDTO
+ * @Auth wangc
+ * @Date 2020-08-25 11:02
+ */
+@Data
+public class CommonCustomerIdAndSrcFormDTO implements Serializable {
+    private static final long serialVersionUID = -2945388338786885295L;
+
+    public interface CustomerAndSrcGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 客户Id
+     * */
+    @NotBlank(message = "客户Id不能为空",groups = CustomerAndSrcGroup.class)
+    private String customerId;
+
+    /**
+     * 数据来源(dev:开发 test:体验 prod:生产)
+     * */
+    @NotBlank(message = "数据来源不能为空",groups = CustomerAndSrcGroup.class)
+    private String source;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java
new file mode 100644
index 0000000000..43860b8d8c
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 获取客户第三方token 入参DTO
+ * @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323480
+ * @ClassName CommonCustomerIdFormDTO
+ * @Auth wangc
+ * @Date 2020-08-25 10:57
+ */
+@Data
+public class CommonCustomerIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 3160741101286756024L;
+
+    public interface PaCustomerIdGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 客户Id
+     * */
+    @NotBlank(message = "客户Id不能为空" , groups = PaCustomerIdGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java
new file mode 100644
index 0000000000..69b1c4abb1
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 授权accessToken和app端的查询返参
+ * @ClassName AuthAccessTokenClientResultDTO
+ * @Auth wangc
+ * @Date 2020-08-25 13:41
+ */
+@Data
+public class AuthAccessTokenClientResultDTO implements Serializable {
+    private static final long serialVersionUID = -642465145534993509L;
+
+    /**
+     * 客户端类型
+     * */
+    private String clientType;
+
+    /**
+     * 调用令牌
+     * */
+    private String accessToken;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java
new file mode 100644
index 0000000000..212114a4cc
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName CustomerTokensResultDTO
+ * @Auth wangc
+ * @Date 2020-08-25 11:16
+ */
+@Data
+public class CustomerTokensResultDTO implements Serializable {
+    private static final long serialVersionUID = -6811282503588315365L;
+
+    /**
+     * 客户Id
+     * */
+    private String customerId = "";
+
+    /**
+     * 客户名称
+     * */
+    private String customerName = "";
+
+    /**
+     * 第三方token
+     * */
+    private String componentAccessToken = "";
+
+    /**
+     * 授权方居民端token
+     * */
+    private String resiAuthorizerToken = "";
+
+    /**
+     * 授权方工作端token
+     * */
+    private String workAuthorizerToken = "";
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
index 544e4da23e..4c1cec0015 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
@@ -116,5 +116,9 @@ public interface ModuleConstant {
     int EIGHTY_NINE_THOUSAND_AND_THREE = 89003;
     int EIGHTY_NINE_THOUSAND_AND_FOUR = 89004;
 
+    /**
+     * 数据来源 ： 生产环境
+     * */
+    String SRC_PROD = "prod";
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
index 13ad00fc9d..686985c317 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
@@ -192,5 +192,19 @@ public class PaCustomerController {
         return new Result<PageData>().ok(pageData);
     }
 
+    /**
+     * @Description 获取客户第三方token
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=52285&id=323480
+     * @param param CommonCustomerIdFormDTO.class
+     * @return Result<CustomerTokensResultDTO>
+     * @author wangc
+     * @date 2020.08.25 15:39
+    **/
+    @PostMapping("tokenlist")
+    public Result<CustomerTokensResultDTO> tokenList(@RequestBody CommonCustomerIdFormDTO param){
+        ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class);
+        return new Result<CustomerTokensResultDTO>().ok(paCustomerService.tokenList(param));
+    }
+
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
index b5c24edf2f..882a091b1b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
@@ -22,6 +22,7 @@ import com.epmet.dto.AuthorizationInfoDTO;
 import com.epmet.dto.form.AuthorizationInfoFormDTO;
 import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
 import com.epmet.dto.form.CustomerAccessTokenInfoFormDTO;
+import com.epmet.dto.result.AuthAccessTokenClientResultDTO;
 import com.epmet.dto.result.AuthCodeResultDTO;
 import com.epmet.dto.result.CustomerAccessTokenInfoResultDTO;
 import com.epmet.dto.result.WillOverDueResultDTO;
@@ -109,4 +110,12 @@ public interface AuthorizationInfoDao extends BaseDao<AuthorizationInfoEntity> {
      */
     List<CustomerAccessTokenInfoResultDTO> getCustomerAccessTokenInfo(CustomerAccessTokenInfoFormDTO customerAccessTokenInfoFormDTO);
 
+    /**
+     * @Description 查询来源端对应的accessToken
+     * @param customerId
+     * @return List<AuthAccessTokenClientResultDTO>
+     * @author wangc
+     * @date 2020.08.25 15:24
+    **/
+    List<AuthAccessTokenClientResultDTO> selectClientToken(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
index 10a5710c6e..85a5bac687 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
@@ -69,4 +69,13 @@ public interface ComponentAccessTokenDao extends BaseDao<ComponentAccessTokenEnt
      */
     String getComponentAccessToken();
 
+    /**
+     * @Description 查询ComponentAccessToken【唯一】
+     * @param
+     * @return String
+     * @author wangc
+     * @date 2020.08.25 15:14
+    **/
+    String selectComponentAccessToken();
+
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
index b9c77f90f3..8ea82c19de 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
@@ -213,4 +213,25 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
      * @return com.epmet.commons.tools.page.PageData
      */
     PageData getCustomerList(UploadListFormDTO formDTO);
+
+    /**
+     * @Description 获取客户第三方token
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=52285&id=323480
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.25 14:51
+    **/
+    CustomerTokensResultDTO tokenList(CommonCustomerIdFormDTO param);
+
+    /**
+     * @Description 公众号客户删除
+     * @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
+     * @param token
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.25 15:46
+    **/
+    void deletePublicCustomer(TokenDto token,CommonCustomerIdAndSrcFormDTO param);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
index c77f86e336..cf9f0666e7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
@@ -31,6 +31,8 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
+import com.epmet.constant.CodeConstant;
+import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.PaConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
@@ -102,6 +104,8 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
     private WxMaCodeService wxMaCodeService;
     @Autowired
     private AuthorizationInfoDao authorizationInfoDao;
+    @Autowired
+    private ComponentAccessTokenDao componentAccessTokenDao;
 
     @Override
     public PageData<PaCustomerDTO> page(Map<String, Object> params) {
@@ -641,4 +645,49 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         return new PageData<>(list, pageInfo.getTotal());
     }
 
+    /**
+     * @Description 获取客户第三方token
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=52285&id=323480
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.25 14:51
+     **/
+    @Override
+    public CustomerTokensResultDTO tokenList(CommonCustomerIdFormDTO param) {
+        CustomerTokensResultDTO result = new CustomerTokensResultDTO();
+        String customerName = baseDao.selectCustomerName(param.getCustomerId());
+        String componentAccessToken = componentAccessTokenDao.selectComponentAccessToken();
+        List<AuthAccessTokenClientResultDTO> clientList = authorizationInfoDao.selectClientToken(param.getCustomerId());
+        result.setCustomerId(param.getCustomerId());
+        result.setComponentAccessToken(StringUtils.isBlank(componentAccessToken) ? "" : componentAccessToken);
+        result.setCustomerName(StringUtils.isBlank(customerName) ? "" : customerName);
+        if(null != clientList || !clientList.isEmpty()){
+            clientList.forEach(client -> {
+                if(StringUtils.equals(CodeConstant.WORK,client.getClientType())){
+                    result.setWorkAuthorizerToken(client.getAccessToken());
+                }else if(StringUtils.equals(CodeConstant.RESI,client.getClientType())){
+                    result.setResiAuthorizerToken(client.getAccessToken());
+                }
+            });
+        }
+        return result;
+    }
+
+    /**
+     * @Description 公众号客户删除
+     * @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
+     * @param token
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.25 15:46
+     **/
+    @Override
+    public void deletePublicCustomer(TokenDto token , CommonCustomerIdAndSrcFormDTO param) {
+        if(StringUtils.equals(ModuleConstant.SRC_PROD,param.getSource())){
+            logger.warn("有人试图删除用户生产数据，试图删除的客户Id：{}，操作者Id：{}",param.getCustomerId(),token.getUserId());
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
index 61f441b6b8..c976e85ab8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
@@ -121,4 +121,16 @@
             </if>
     </select>
 
+    <!-- 查询来源端对应的accessToken -->
+    <select id="selectClientToken" resultType="com.epmet.dto.result.AuthAccessTokenClientResultDTO">
+        SELECT
+            CLIENT_TYPE,
+            AUTHORIZER_ACCESS_TOKEN
+        FROM
+            authorization_info
+        WHERE
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
index 3642c1d768..98d52d60b8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
@@ -48,4 +48,15 @@
             AND (UNIX_TIMESTAMP(expires_in_time) - UNIX_TIMESTAMP(NOW())) <![CDATA[ <= ]]> 900
     </select>
 
+    <!-- 查询ComponentAccessToken【唯一】 -->
+    <select id="selectComponentAccessToken" resultType="java.lang.String">
+        SELECT
+            COMPONENT_ACCESS_TOKEN
+        FROM
+            component_access_token
+        WHERE
+            DEL_FLAG = '0'
+        ORDER BY UPDATED_TIME DESC
+        LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

From c2943a450dacbdca8bdf41162330e2bcd0a786f0 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 26 Aug 2020 10:29:24 +0800
Subject: [PATCH 06/66] clearCustomerInfo

---
 .../java/com/epmet/dao/PaCustomerDao.java     |  2 +
 .../main/resources/mapper/PaCustomerDao.xml   | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
index 8a5e04675c..9707535c8b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
@@ -102,4 +102,6 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
      * @Description  查询客户及管理员信息
      */
     CustomerAndUserResultDTO selectCustomerAndUser(@Param("customerId") String customerId);
+
+    void clearCustomerInfo(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
index 40d5efbc3a..70c434194a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
@@ -146,4 +146,41 @@
         AND id = #{oldCustomerId}
     </update>
 
+    <!-- 清除用户信息 -->
+    <delete id="clearCustomerInfo">
+        DELETE FROM auth_code WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM auth_result_record WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM authorization_info WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM binding_account WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM business_info WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM code_audit_record WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM code_audit_result WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM code_customer WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM code_operation_history WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM customer_mp WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM func_info WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM mini_category_info WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM mini_info WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM mini_network_info WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM open_platform_account WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM pa_customer_agency WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM pa_customer_user_agency WHERE CUSTOMER_ID = #{customerId};
+    </delete>
+
 </mapper>
\ No newline at end of file

From 6cca1a5cf83a4a0bfd64d10f67dd8f93d6d9b1ff Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 26 Aug 2020 13:55:19 +0800
Subject: [PATCH 07/66] =?UTF-8?q?third=E6=8E=A5=E5=8F=A3=20=201=E3=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E7=9A=84tokenList=20=20=20?=
 =?UTF-8?q?2=E3=80=81=E6=B8=85=E9=99=A4=E5=AE=A2=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/CommonCustomerIdAndSrcFormDTO.java    |  3 +++
 .../epmet/controller/PaCustomerController.java | 16 ++++++++++++++++
 .../main/java/com/epmet/dao/PaCustomerDao.java | 18 +++++++++++++++++-
 .../com/epmet/service/PaCustomerService.java   |  3 +--
 .../service/impl/PaCustomerServiceImpl.java    | 13 ++++++++++---
 .../resources/mapper/AuthorizationInfoDao.xml  |  2 +-
 .../main/resources/mapper/PaCustomerDao.xml    | 13 +++++++++++++
 7 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
index 080e7fcd8f..56b920d911 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
@@ -30,4 +30,7 @@ public class CommonCustomerIdAndSrcFormDTO implements Serializable {
      * */
     @NotBlank(message = "数据来源不能为空",groups = CustomerAndSrcGroup.class)
     private String source;
+
+    @NotBlank(message = "用户Id不能为空",groups = CustomerAndSrcGroup.class)
+    private String userId;
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
index 686985c317..de5cc61d7a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
@@ -206,5 +206,21 @@ public class PaCustomerController {
         return new Result<CustomerTokensResultDTO>().ok(paCustomerService.tokenList(param));
     }
 
+    /**
+     * @Description 公众号客户删除
+     * @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
+     * @param token
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.25 15:46
+     **/
+    @PostMapping("deletepubliccustomer")
+    public Result deletePublicCustomer(@LoginUser TokenDto token , @RequestBody CommonCustomerIdAndSrcFormDTO param){
+        param.setUserId(token.getUserId());
+        ValidatorUtils.validateEntity(param, CommonCustomerIdAndSrcFormDTO.CustomerAndSrcGroup.class);
+        paCustomerService.clearPublicCustomer(param);
+        return new Result();
+    }
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
index 9707535c8b..573ad48cf3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
@@ -102,6 +102,22 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
      * @Description  查询客户及管理员信息
      */
     CustomerAndUserResultDTO selectCustomerAndUser(@Param("customerId") String customerId);
-
+    
+    /**
+     * @Description 清除第三方库中客户的信息
+     * @param customerId
+     * @return
+     * @author wangc
+     * @date 2020.08.26 10:44
+    **/
     void clearCustomerInfo(@Param("customerId") String customerId);
+
+    /**
+     * @Description 根据客户Id查询当前客户的来源
+     * @param customerId
+     * @return
+     * @author wangc
+     * @date 2020.08.26 10:59
+    **/
+    String selectSourceById(@Param("customerId") String customerId,@Param("source") String source);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
index 8ea82c19de..a1b30bd255 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
@@ -227,11 +227,10 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
     /**
      * @Description 公众号客户删除
      * @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
-     * @param token
      * @param param
      * @return
      * @author wangc
      * @date 2020.08.25 15:46
     **/
-    void deletePublicCustomer(TokenDto token,CommonCustomerIdAndSrcFormDTO param);
+    void clearPublicCustomer(CommonCustomerIdAndSrcFormDTO param);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
index cf9f0666e7..5b683027b5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
@@ -677,17 +677,24 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
     /**
      * @Description 公众号客户删除
      * @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
-     * @param token
      * @param param
      * @return
      * @author wangc
      * @date 2020.08.25 15:46
      **/
     @Override
-    public void deletePublicCustomer(TokenDto token , CommonCustomerIdAndSrcFormDTO param) {
+    @Transactional(rollbackFor = Exception.class)
+    public void clearPublicCustomer(CommonCustomerIdAndSrcFormDTO param) {
         if(StringUtils.equals(ModuleConstant.SRC_PROD,param.getSource())){
-            logger.warn("有人试图删除用户生产数据，试图删除的客户Id：{}，操作者Id：{}",param.getCustomerId(),token.getUserId());
+            logger.warn("有人试图删除用户的生产数据，试图删除的客户Id：{}，操作者Id：{}",param.getCustomerId(),param.getUserId());
+            throw new RenException("禁止对生产环境数据进行删除操作！");
+        }
+        String check = baseDao.selectSourceById(param.getCustomerId(),param.getSource());
+        if (!StringUtils.equals(check,param.getCustomerId())) {
+            logger.warn("com.epmet.service.impl.PaCustomerServiceImpl.clearPublicCustomer，客户来源信息不匹配，客户Id:{}，来源:{}",param.getCustomerId(),param.getSource());
+            return ;
         }
+        baseDao.clearCustomerInfo(param.getCustomerId());
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
index c976e85ab8..77e38472e8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
@@ -125,7 +125,7 @@
     <select id="selectClientToken" resultType="com.epmet.dto.result.AuthAccessTokenClientResultDTO">
         SELECT
             CLIENT_TYPE,
-            AUTHORIZER_ACCESS_TOKEN
+            AUTHORIZER_ACCESS_TOKEN AS accessToken
         FROM
             authorization_info
         WHERE
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
index 70c434194a..11d1b50262 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
@@ -181,6 +181,19 @@
         DELETE FROM pa_customer_agency WHERE CUSTOMER_ID = #{customerId};
 
         DELETE FROM pa_customer_user_agency WHERE CUSTOMER_ID = #{customerId};
+
+        DELETE FROM pa_customer WHERE ID = #{customerId};
     </delete>
 
+    <!-- 根据客户Id查询当前客户的来源 -->
+    <select id="selectSourceById" resultType="java.lang.String">
+        SELECT
+            ID
+        FROM
+            PA_CUSTOMER
+        WHERE
+            ID = #{customerId}
+        AND
+            SOURCE = #{source}
+    </select>
 </mapper>
\ No newline at end of file

From 03d56aa35459a2d05e1a6c0d9a2383dd6807e117 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 14:45:20 +0800
Subject: [PATCH 08/66] =?UTF-8?q?NEI=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/UpdateCustomerParameterFormDTO.java    | 2 +-
 .../main/java/com/epmet/service/impl/CustomerServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
index f522bfab50..ddf4551a57 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
@@ -25,7 +25,7 @@ public class UpdateCustomerParameterFormDTO implements Serializable {
     /**
      * 最大允许创建网格数
      */
-    private Integer gridNumber;
+    private Integer maxGridNumber;
 
     public interface Customer{}
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 323388de35..759c1eeae2 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -691,7 +691,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             throw new RenException(ModuleConstant.SELECT_CUSTOMER_ERROR);
         }
         //2.校验数据合格性
-        if (entity.getGridNumber() > formDTO.getGridNumber()) {
+        if (entity.getGridNumber() > formDTO.getMaxGridNumber()) {
             throw new RenException(ModuleConstant.GRID_NUMBER_ERROR);
         }
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -703,7 +703,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         //3.更新数据
         CustomerEntity customerEntity = new CustomerEntity();
         customerEntity.setId(formDTO.getCustomerId());
-        customerEntity.setGridNumber(formDTO.getGridNumber());
+        customerEntity.setGridNumber(formDTO.getMaxGridNumber());
         customerEntity.setValidityTime(dt1);
         if (baseDao.updateById(customerEntity) < NumConstant.ONE) {
             throw new RenException(ModuleConstant.UPDATE_CUSTOMER_ERROR);

From 6cab8cc3cab33c7be5ad7f3146f8e5aebb1d7dfb Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 14:56:58 +0800
Subject: [PATCH 09/66] =?UTF-8?q?NEI=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/UpdateCustomerParameterFormDTO.java   | 0
 .../main/java/com/epmet/controller/CustomerController.java   | 5 ++++-
 .../src/main/java/com/epmet/service/CustomerService.java     | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename epmet-module/{gov-org/gov-org-client => oper-crm/oper-crm-client}/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java (100%)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
similarity index 100%
rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
rename to epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
index 30bde5bb69..e4ae80fc6e 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
@@ -31,7 +31,10 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CustomerDetailResultDTO;
+import com.epmet.dto.result.CustomerInfoResultDTO;
+import com.epmet.dto.result.GridCountResultDTO;
+import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.excel.CustomerExcel;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.CustomerService;
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
index 6749bd9763..c9745552ed 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
@@ -22,7 +22,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CustomerDetailResultDTO;
+import com.epmet.dto.result.CustomerInfoResultDTO;
+import com.epmet.dto.result.GridCountResultDTO;
+import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.CustomerEntity;
 
 import java.text.ParseException;

From b86bb0e139a51a1855ccb031e5066539ccea8683 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 26 Aug 2020 15:01:20 +0800
Subject: [PATCH 10/66] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/CustomerListResultDTO.java   | 2 +-
 .../oper-crm-server/src/main/resources/mapper/CustomerDao.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerListResultDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerListResultDTO.java
index 3d08316bb9..e55e97197a 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerListResultDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerListResultDTO.java
@@ -34,7 +34,7 @@ public class CustomerListResultDTO implements Serializable {
 	/**
 	 * 客户组织级别：0.省级，1市级，2.区县级，3.乡镇街道级 字典表key：organizationlevel
 	 */
-	private String organizationLevels;
+	private String organizationLevel;
 	/**
 	 * 客户logo
 	 */
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index b1d219013a..d50ab9ce85 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -110,7 +110,7 @@
         CUSTOMER_NAME,
         TITLE,
         VALIDITY_TIME,
-        ORGANIZATION_LEVELS,
+        ORGANIZATION_LEVEL,
         LOGO,
         GRID_NUMBER
         FROM customer

From 941b7ae0d7bd439ab9745a29d170cdee3552d533 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 15:41:39 +0800
Subject: [PATCH 11/66] =?UTF-8?q?=E6=97=A7=E6=8E=A5=E5=8F=A3=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=AE=A2=E6=88=B7Id=E6=9F=A5=E8=AF=A2=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/CustomerInfoDTO.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerInfoDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerInfoDTO.java
index 6c2bd282bf..6ef2596917 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerInfoDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerInfoDTO.java
@@ -6,4 +6,5 @@ import lombok.Data;
 public class CustomerInfoDTO {
     private String customerName;
     private String organizationLevel;
+    private String logo;
 }

From cd41458c40f882c5196fa37b624655a64f91c46f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 26 Aug 2020 15:43:42 +0800
Subject: [PATCH 12/66] =?UTF-8?q?compose=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
index 9a7eb3e9b9..aeefe23068 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.70
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

From 6be7a5b8b5beefc0c643f887914f53010cb61d85 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 26 Aug 2020 17:35:00 +0800
Subject: [PATCH 13/66] =?UTF-8?q?EXT=20staffInfo=20=20=20=20staffPermissio?=
 =?UTF-8?q?n=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

---
 .../java/com/epmet/dao/CustomerAgencyDao.java |  9 ++++++-
 .../impl/CustomerAgencyServiceImpl.java       | 25 +++++++++----------
 .../resources/mapper/CustomerAgencyDao.xml    | 16 ++++++++++++
 .../epmet/feign/EpmetUserOpenFeignClient.java |  9 -------
 .../EpmetUserOpenFeignClientFallback.java     |  5 ----
 .../StaffAgencyVisitedController.java         | 12 ---------
 .../com/epmet/dao/StaffAgencyVisitedDao.java  |  1 -
 .../service/StaffAgencyVisitedService.java    |  8 ------
 .../impl/StaffAgencyVisitedServiceImpl.java   | 16 +-----------
 .../mapper/StaffAgencyVisitedDao.xml          | 16 +-----------
 10 files changed, 38 insertions(+), 79 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 26ec50ed8e..613f4d82bb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -133,7 +133,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @date 2020.08.17 09:50
     **/
     ExtStaffInfoResultDTO selectAgencyAndGridInfoExt(@Param("gridId") String gridId);
-
+    /**
+     * @Description 当没有工作人员最近访问的gridId时查询该用户所属的组织机关信息
+     * @param staffId
+     * @return
+     * @author wangc
+     * @date 2020.08.17 09:50
+     **/
+    ExtStaffInfoResultDTO selectAgencyInfoWhenGridIdIsNull(@Param("staffId")String staffId);
     /**
      * @Description 根据agencyId查找指定机构的信息，直属网格、部门
      * @param agencyId
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index c401f89afc..224a33571f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -848,8 +848,12 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     public ExtStaffInfoResultDTO staffInfoExt(ExtStaffInfoResultDTO result) {
 
         //1.查找对应的所属关系，通过最近一次登陆的网格，通过网格查找对应的机关和客户
-        ExtStaffInfoResultDTO orgInfo =
-            baseDao.selectAgencyAndGridInfoExt(result.getGridId());
+        ExtStaffInfoResultDTO orgInfo;
+        if(StringUtils.isNotBlank(result.getGridId())){
+            orgInfo = baseDao.selectAgencyAndGridInfoExt(result.getGridId());
+        }else{
+            orgInfo = baseDao.selectAgencyInfoWhenGridIdIsNull(result.getUserId());
+        }
         mergeObject(orgInfo,result);
         //2.查找客户名称
         CustomerDTO customerParam = new CustomerDTO();
@@ -881,22 +885,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     @Override
     public ExtStaffPermissionResultDTO staffPermissionExt(String staffId) {
 
-        //1.通过staffId去user服务查询最近一次登陆的agencyId
-        Result<String> agency =
-                epmetUserOpenFeignClient.latestAgency(staffId);
-        if(agency.success() && StringUtils.isNotBlank(agency.getData())){
-        //2.根据此agencyId查询数据权限
-            ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(agency.getData());
-            return res;
-        }else{
-            logger.error("com.epmet.service.impl.CustomerAgencyServiceImpl.staffPermissionExt，没有找到工作人员最近一次登陆的Agency信息，用户Id：{}",staffId);
+
+        CustomerStaffAgencyDTO agency = customerStaffAgencyDao.selectLatestCustomerByStaff(staffId);
+        if(null == agency || StringUtils.isBlank(agency.getAgencyId())){
+            logger.error("com.epmet.service.impl.CustomerAgencyServiceImpl.staffPermissionExt，没有找到工作人员所属的机关信息，用户Id：{}",staffId);
             ExtStaffPermissionResultDTO emptyResult = new ExtStaffPermissionResultDTO();
             checkFieldAndSetDefault(emptyResult);
             return emptyResult;
         }
 
-
-
+        ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(agency.getAgencyId());
+        return res;
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 3018846910..106ff99da5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -169,6 +169,22 @@
         ORDER BY created_time DESC
     </select>
 
+    <!-- 当没有工作人员最近访问的gridId时查询该用户所属的组织机关信息 -->
+    <select id="selectAgencyInfoWhenGridIdIsNull" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
+       SELECT
+        agency.ID AS agencyId,
+        agency.ORGANIZATION_NAME AS agencyName,
+        agency.PIDS AS agencyIdPath,
+        agency.ALL_PARENT_NAME AS agencyNamePath,
+        agency.CUSTOMER_ID AS customerId
+    FROM
+     CUSTOMER_STAFF_AGENCY staff
+     LEFT JOIN CUSTOMER_AGENCY agency ON staff.AGENCY_ID = agency.ID AND agency.DEL_FLAG = '0'
+    WHERE
+       staff.DEL_FLAG = '0'
+        AND staff.USER_ID = #{staffId}
+    </select>
+
     <!-- 查询一个工作人员最近登录的网格以及机关信息 -->
     <select id="selectAgencyAndGridInfoExt" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
     SELECT
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 63e3380b6b..21a70de787 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -269,15 +269,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("epmetuser/customerstaff/getstaffinfolist")
     Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestBody UserIdsFormDTO formDTO);
 
-    /**
-     * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-     * @param staffId
-     * @return
-     * @author wangc
-     * @date 2020.08.17 17:45
-     **/
-    @GetMapping("/epmetuser/staffagencyvisited/latestagency/{staffId}")
-    Result<String> latestAgency(@PathVariable("staffId") String staffId);
 
     /**
      * 修改根管理员信息
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 480ba8862e..8b81b57dd2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -189,11 +189,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffInfoList", formDTO);
     }
 
-    @Override
-    public Result<String> latestAgency(String staffId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestAgency", staffId);
-    }
-
     @Override
     public Result updateRootManage(UpdateRootManageFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateRootManage", formDTO);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
index 69ffa0ebd8..71ad8f1962 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
@@ -63,16 +63,4 @@ public class StaffAgencyVisitedController {
 	}
 
 
-	/**
-	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-	 * @param staffId
-	 * @return
-	 * @author wangc
-	 * @date 2020.08.17 17:45
-	 **/
-	@GetMapping(value = "latestagency/{staffId}")
-	public Result<String> latestAgency(@PathVariable("staffId") String staffId){
-		return new Result<String>().ok(staffAgencyVisitedService.getLatestStaffAgencyId(staffId));
-	}
-
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java
index 4e55a5e731..4358e4910e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java
@@ -40,5 +40,4 @@ public interface StaffAgencyVisitedDao extends BaseDao<StaffAgencyVisitedEntity>
     StaffLatestAgencyResultDTO selectLatestStaffWechatLoginRecord(String openId);
 
 
-    StaffLatestAgencyResultDTO selectLatestCustomer(String userId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java
index d70addb077..9d584aa2e6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java
@@ -114,13 +114,5 @@ public interface StaffAgencyVisitedService extends BaseService<StaffAgencyVisite
 	 **/
 	Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO);
 
-	/**
-	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-	 * @param staffId
-	 * @return
-	 * @author wangc
-	 * @date 2020.08.17 17:45
-	**/
-	String getLatestStaffAgencyId(String staffId);
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
index 7e2e2fd706..8118bbe6f6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
@@ -127,20 +127,6 @@ public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVi
 		return new Result();
 	}
 
-	/**
-	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-	 * @param staffId
-	 * @return
-	 * @author wangc
-	 * @date 2020.08.17 17:45
-	 **/
-	@Override
-	public String getLatestStaffAgencyId(String staffId) {
-		StaffLatestAgencyResultDTO latestAgency =
-			baseDao.selectLatestCustomer(staffId);
-		if(null != latestAgency)
-			return latestAgency.getAgencyId();
-		return null;
-	}
+
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml
index 82bc2cace3..faaa5757e9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml
@@ -35,19 +35,5 @@
             sav.CREATED_TIME DESC
             LIMIT 1
     </select>
-    <select id="selectLatestCustomer" parameterType="java.lang.String"
-            resultType="com.epmet.dto.result.StaffLatestAgencyResultDTO">
-        SELECT
-            sav.CUSTOMER_ID,
-            sav.STAFF_ID,
-            sav.AGENCY_ID
-        FROM
-            staff_agency_visited sav
-        WHERE
-            sav.DEL_FLAG = '0'
-          AND sav.STAFF_ID =#{userId}
-        ORDER BY
-            sav.CREATED_TIME DESC
-        LIMIT 1
-    </select>
+
 </mapper>
\ No newline at end of file

From 2a90995608b51451702772d592272f321a89b5e0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 18:17:56 +0800
Subject: [PATCH 14/66] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=AA=8C=E8=AF=81=E7=A0=81=E9=9D=9E=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
index aa999da0f6..0f2a2ab82d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
@@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	/**
 	 * 手机验证码
 	 */
-	@NotBlank(message = "手机验证码不能为空")
+	//@NotBlank(message = "手机验证码不能为空")
 	@Length(max=6,message = "手机验证码不能超过6位")
 	private String mobileCode;
 

From 768eec9b7adb25138f67ce1e57da806fc3e773cc Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 27 Aug 2020 14:24:46 +0800
Subject: [PATCH 15/66] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E5=8A=A8=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/enums/RequirePermissionEnum.java     | 1 +
 1 file changed, 1 insertion(+)

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 bc4358bd93..284ef67e74 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
@@ -51,6 +51,7 @@ public enum RequirePermissionEnum {
     ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"),
     ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"),
     ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"),
+    ORG_STAFF_TRANSFER("org_staff_transfer", "组织:工作人员:调动", "组织:工作人员:调动"),
 
     /**
      * 组织-部门

From d85fb62cbc96db5d6da80e8a24f2742080d0fafd Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 27 Aug 2020 14:40:09 +0800
Subject: [PATCH 16/66] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ProjectDetailResultDTO.java |  4 ++++
 .../src/main/java/com/epmet/dao/ProjectStaffDao.java |  9 +++++++++
 .../java/com/epmet/service/ProjectStaffService.java  |  9 +++++++++
 .../com/epmet/service/impl/ProjectServiceImpl.java   |  7 +++++++
 .../epmet/service/impl/ProjectStaffServiceImpl.java  |  5 +++++
 .../src/main/resources/mapper/ProjectStaffDao.xml    | 12 ++++++++++++
 6 files changed, 46 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
index 62f3100301..8ad21b2082 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
@@ -48,6 +48,10 @@ public class ProjectDetailResultDTO implements Serializable {
 	 * 处理状态(是否由我处理)
 	 */
 	private Boolean processable;
+	/**
+	 * 是否是转项目节点
+	 */
+	private Boolean isCreated;
 	/**
 	 * 当前跟进部门
 	 */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
index 78a7927b43..88bc5dadf2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
@@ -70,4 +70,13 @@ public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
 	 * @Description 查询当前处于项目节点中的切工作未处理的工作人员
 	 **/
     List<ProjectStaffDTO> selectProjectTransferStaffList(ProjectStaffDTO dto);
+
+    /**
+     * 获取未处理的转项目节点
+     * @author zhaoqifeng
+     * @date 2020/8/27 14:26
+     * @param dto
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> selectCreatedProcess(ProjectStaffDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
index 349068ce2c..af0ee6061d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
@@ -131,4 +131,13 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
      * @return java.util.List<java.lang.String>
      */
     List<String> getStaffsByProjectId(String projectId);
+
+    /**
+     * 获取未处理的转项目节点
+     * @author zhaoqifeng
+     * @date 2020/8/27 14:30
+     * @param dto
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> getCreatedProcess(ProjectStaffDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 31566fc96b..ddacb38fed 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -266,6 +266,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
+			resultDTO.setIsCreated(false);
 		} else {
 			//获取我未处理的部门
 			ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@@ -277,6 +278,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			} else {
 				resultDTO.setProcessable(false);
 			}
+			List<String> created = projectStaffService.getCreatedProcess(projectStaffDTO);
+			if (null != created && created.size() > NumConstant.ZERO) {
+				resultDTO.setIsCreated(true);
+			} else {
+				resultDTO.setIsCreated(false);
+			}
 		}
 
 		//获取当前跟进部门
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
index 9dfa87eed5..e33943f2e4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -150,4 +150,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
         return baseDao.selectStaffsByProjectId(projectId);
     }
 
+    @Override
+    public List<String> getCreatedProcess(ProjectStaffDTO dto) {
+        return baseDao.selectCreatedProcess(dto);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index ebeb87a063..0b8cbe9bc6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -53,5 +53,17 @@
             AND project_id = #{projectId}
             AND is_handle = #{isHandle}
     </select>
+    <select id="selectCreatedProcess" resultType="java.lang.String" parameterType="com.epmet.dto.ProjectStaffDTO">
+        SELECT
+            pp.ID
+        FROM
+            project_staff ps
+        INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0' AND pp.OPERATION = 'created'
+        WHERE
+            ps.DEL_FLAG = '0'
+          AND ps.PROJECT_ID = #{projectId}
+          AND STAFF_ID = #{staffId}
+          AND IS_HANDLE = 'unhandled'
+    </select>
 
 </mapper>
\ No newline at end of file

From 9233c82076d3b0300275580c9c60e3f386ae27ee Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 27 Aug 2020 15:10:39 +0800
Subject: [PATCH 17/66] staffGridVisited

---
 .../com/epmet/dao/StaffGridVisitedDao.java     |  9 +++++++++
 .../resources/mapper/StaffGridVisitedDao.xml   | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
index 6869f1a5bf..38a2781abb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
@@ -41,4 +41,13 @@ public interface StaffGridVisitedDao extends BaseDao<StaffGridVisitedEntity> {
      **/
     String selectStaffLatestGrid(LatestGridFormDTO latestGridFormDTO);
 
+    /**
+     * @Description 根据staffId和customerId查询当前用户上一次登陆的网格信息
+     * @param latestGridFormDTO
+     * @return StaffGridVisitedEntity
+     * @author wangc
+     * @date 2020.08.27 15:05
+    **/
+    StaffGridVisitedEntity selectVistedRecordByStaffId(LatestGridFormDTO latestGridFormDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml
index 73978e23f3..8c84188b9f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml
@@ -33,4 +33,22 @@
         LIMIT 1
     </select>
 
+
+    <select id="selectVistedRecordByStaffId" resultType="com.epmet.entity.StaffGridVisitedEntity">
+        SELECT
+        ID,
+        GRID_ID,
+        CREATED_TIME
+        FROM
+        STAFF_GRID_VISITED
+        WHERE
+        DEL_FLAG = '0'
+        AND
+        CUSTOMER_ID = #{customerId}
+        AND
+        STAFF_ID = #{staffId}
+        ORDER BY
+        CREATED_TIME DESC
+        LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

From ce18a79262db121333588f9fb704f5419fbc1409 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 27 Aug 2020 16:06:46 +0800
Subject: [PATCH 18/66] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B0=83=E5=8A=A8=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/StaffTransferRecordDTO.java | 101 +++++++++++++++++
 .../StaffTransferRecordController.java        |  94 ++++++++++++++++
 .../com/epmet/dao/StaffTransferRecordDao.java |  33 ++++++
 .../entity/StaffTransferRecordEntity.java     |  71 ++++++++++++
 .../epmet/excel/StaffTransferRecordExcel.java |  74 +++++++++++++
 .../epmet/redis/StaffTransferRecordRedis.java |  47 ++++++++
 .../service/StaffTransferRecordService.java   |  95 ++++++++++++++++
 .../impl/StaffTransferRecordServiceImpl.java  | 104 ++++++++++++++++++
 .../V0.0.2__staff_transfer_record.sql         |  16 +++
 .../mapper/StaffTransferRecordDao.xml         |   8 ++
 10 files changed, 643 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffTransferRecordDao.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/StaffTransferRecordExcel.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/StaffTransferRecordRedis.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffTransferRecordService.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffTransferRecordServiceImpl.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__staff_transfer_record.sql
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffTransferRecordDao.xml

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
new file mode 100644
index 0000000000..79899e2e05
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@Data
+public class StaffTransferRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 调动人员Id(操作人)
+     */
+	private String operateStaffId;
+
+    /**
+     * 被调动人员Id
+     */
+	private String operatedStaffId;
+
+    /**
+     * 调动前组织Id
+     */
+	private String oldAgencyId;
+
+    /**
+     * 调动后组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 备注说明
+     */
+	private String remarks;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
new file mode 100644
index 0000000000..4cd9ea0e05
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.StaffTransferRecordDTO;
+import com.epmet.excel.StaffTransferRecordExcel;
+import com.epmet.service.StaffTransferRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@RestController
+@RequestMapping("stafftransferrecord")
+public class StaffTransferRecordController {
+    
+    @Autowired
+    private StaffTransferRecordService staffTransferRecordService;
+
+    @GetMapping("page")
+    public Result<PageData<StaffTransferRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<StaffTransferRecordDTO> page = staffTransferRecordService.page(params);
+        return new Result<PageData<StaffTransferRecordDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<StaffTransferRecordDTO> get(@PathVariable("id") String id){
+        StaffTransferRecordDTO data = staffTransferRecordService.get(id);
+        return new Result<StaffTransferRecordDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody StaffTransferRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        staffTransferRecordService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody StaffTransferRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        staffTransferRecordService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        staffTransferRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<StaffTransferRecordDTO> list = staffTransferRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, StaffTransferRecordExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffTransferRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffTransferRecordDao.java
new file mode 100644
index 0000000000..73b5217498
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffTransferRecordDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.StaffTransferRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@Mapper
+public interface StaffTransferRecordDao extends BaseDao<StaffTransferRecordEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
new file mode 100644
index 0000000000..b52c91c45e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("staff_transfer_record")
+public class StaffTransferRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 调动人员Id(操作人)
+     */
+	private String operateStaffId;
+
+    /**
+     * 被调动人员Id
+     */
+	private String operatedStaffId;
+
+    /**
+     * 调动前组织Id
+     */
+	private String oldAgencyId;
+
+    /**
+     * 调动后组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 备注说明
+     */
+	private String remarks;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/StaffTransferRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/StaffTransferRecordExcel.java
new file mode 100644
index 0000000000..6729be83f9
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/StaffTransferRecordExcel.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@Data
+public class StaffTransferRecordExcel {
+
+    @Excel(name = "ID")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "调动人员Id(操作人)")
+    private String operateStaffId;
+
+    @Excel(name = "被调动人员Id")
+    private String operatedStaffId;
+
+    @Excel(name = "调动前组织Id")
+    private String oldAgencyId;
+
+    @Excel(name = "调动后组织Id")
+    private String agencyId;
+
+    @Excel(name = "备注说明")
+    private String remarks;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/StaffTransferRecordRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/StaffTransferRecordRedis.java
new file mode 100644
index 0000000000..deb0f9f76a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/StaffTransferRecordRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@Component
+public class StaffTransferRecordRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffTransferRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffTransferRecordService.java
new file mode 100644
index 0000000000..8f326cdb27
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffTransferRecordService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.StaffTransferRecordDTO;
+import com.epmet.entity.StaffTransferRecordEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+public interface StaffTransferRecordService extends BaseService<StaffTransferRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<StaffTransferRecordDTO>
+     * @author generator
+     * @date 2020-08-27
+     */
+    PageData<StaffTransferRecordDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<StaffTransferRecordDTO>
+     * @author generator
+     * @date 2020-08-27
+     */
+    List<StaffTransferRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return StaffTransferRecordDTO
+     * @author generator
+     * @date 2020-08-27
+     */
+    StaffTransferRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-08-27
+     */
+    void save(StaffTransferRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-08-27
+     */
+    void update(StaffTransferRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-08-27
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffTransferRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffTransferRecordServiceImpl.java
new file mode 100644
index 0000000000..6ef500a018
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffTransferRecordServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.StaffTransferRecordDao;
+import com.epmet.dto.StaffTransferRecordDTO;
+import com.epmet.entity.StaffTransferRecordEntity;
+import com.epmet.redis.StaffTransferRecordRedis;
+import com.epmet.service.StaffTransferRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作人员调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-27
+ */
+@Service
+public class StaffTransferRecordServiceImpl extends BaseServiceImpl<StaffTransferRecordDao, StaffTransferRecordEntity> implements StaffTransferRecordService {
+
+    @Autowired
+    private StaffTransferRecordRedis staffTransferRecordRedis;
+
+    @Override
+    public PageData<StaffTransferRecordDTO> page(Map<String, Object> params) {
+        IPage<StaffTransferRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, StaffTransferRecordDTO.class);
+    }
+
+    @Override
+    public List<StaffTransferRecordDTO> list(Map<String, Object> params) {
+        List<StaffTransferRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, StaffTransferRecordDTO.class);
+    }
+
+    private QueryWrapper<StaffTransferRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<StaffTransferRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public StaffTransferRecordDTO get(String id) {
+        StaffTransferRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, StaffTransferRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(StaffTransferRecordDTO dto) {
+        StaffTransferRecordEntity entity = ConvertUtils.sourceToTarget(dto, StaffTransferRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(StaffTransferRecordDTO dto) {
+        StaffTransferRecordEntity entity = ConvertUtils.sourceToTarget(dto, StaffTransferRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__staff_transfer_record.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__staff_transfer_record.sql
new file mode 100644
index 0000000000..3b447e519e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__staff_transfer_record.sql
@@ -0,0 +1,16 @@
+CREATE TABLE `staff_transfer_record` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `OPERATE_STAFF_ID` varchar(64) NOT NULL COMMENT '调动人员Id(操作人)',
+  `OPERATED_STAFF_ID` varchar(64) NOT NULL COMMENT '被调动人员Id',
+  `OLD_AGENCY_ID` varchar(64) NOT NULL COMMENT '调动前组织Id',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '调动后组织Id',
+  `REMARKS` varchar(255) DEFAULT NULL COMMENT '备注说明',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='工作人员调动记录表';
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffTransferRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffTransferRecordDao.xml
new file mode 100644
index 0000000000..7a9e787e1c
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffTransferRecordDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.StaffTransferRecordDao">
+
+
+
+</mapper>
\ No newline at end of file

From 1762cb64d6b73a5eb623f0cecf535d2460a3088a Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 27 Aug 2020 17:19:07 +0800
Subject: [PATCH 19/66] getStaffLasrGridVisitedId

---
 .../service/impl/StaffAgencyServiceImpl.java  |  8 ++++
 .../com/epmet/dao/StaffGridVisitedDao.java    | 16 +++++++-
 .../impl/StaffGridVisitedServiceImpl.java     | 24 ++++++++++--
 .../resources/mapper/StaffGridVisitedDao.xml  | 39 ++++++++++++-------
 4 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
index de87b9eea4..6c42e6e7dc 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
@@ -220,6 +220,14 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
             Result<CustomerGridByUserIdResultDTO> staffGridResult =
                     govOrgFeignClient.getStaffGrid(latestGridFormDTO);
             if (staffGridResult.success() && null != staffGridResult.getData() && StringUtils.isNotBlank(staffGridResult.getData().getGridId())) {
+                StaffGridVisitedFormDTO gridRecordParam = new StaffGridVisitedFormDTO();
+                gridRecordParam.setGridId(staffGridResult.getData().getGridId());
+                gridRecordParam.setCustomerId(latestGridFormDTO.getCustomerId());
+                gridRecordParam.setStaffId(latestGridFormDTO.getStaffId());
+                Result writeRecordResult = epmetUserFeignClient.saveStaffGridVisitedRecord(gridRecordParam);
+                if(writeRecordResult.success()){
+                    logger.warn("com.epmet.service.impl.StaffAgencyServiceImpl.getLatestGrid,工作人员网格访问网格写入失败，staffId:{}，gridId:{}",latestGridFormDTO.getStaffId(),staffGridResult.getData().getGridId());
+                }
                 return staffGridResult;
             }
         }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
index 38a2781abb..554da4a12d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
@@ -23,6 +23,8 @@ import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Date;
+
 /**
  * 工作人员进入网格日志表
  *
@@ -42,12 +44,22 @@ public interface StaffGridVisitedDao extends BaseDao<StaffGridVisitedEntity> {
     String selectStaffLatestGrid(LatestGridFormDTO latestGridFormDTO);
 
     /**
-     * @Description 根据staffId和customerId查询当前用户上一次登陆的网格信息
+     * @Description 根据staffId和customerId查询当前用户上一次登陆的网格Id,Id,创建时间
      * @param latestGridFormDTO
      * @return StaffGridVisitedEntity
      * @author wangc
      * @date 2020.08.27 15:05
     **/
-    StaffGridVisitedEntity selectVistedRecordByStaffId(LatestGridFormDTO latestGridFormDTO);
+    StaffGridVisitedEntity selectVisitedRecordByStaffId(LatestGridFormDTO latestGridFormDTO);
+
+    /**
+     * @Description 更新工作人员网格登陆记录的时间
+     * @param id
+     * @param date
+     * @return
+     * @author wangc
+     * @date 2020.08.27 16:28
+    **/
+    void updateRecordTime(String id, Date date);
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
index 5b0ab6bf60..d76e08c884 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
@@ -43,9 +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.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 工作人员进入网格日志表
@@ -124,10 +122,28 @@ public class StaffGridVisitedServiceImpl extends BaseServiceImpl<StaffGridVisite
 
     @Override
     public Result<CustomerGridByUserIdResultDTO> getStaffLatestGrid(LatestGridFormDTO latestGridFormDTO) {
+        Calendar currentCal = Calendar.getInstance();
 
+        currentCal.setTime(new Date());
         CustomerGridByUserIdResultDTO gridResult = new CustomerGridByUserIdResultDTO();
-        String gridId = baseDao.selectStaffLatestGrid(latestGridFormDTO);
+        StaffGridVisitedEntity recordEntity = baseDao.selectVisitedRecordByStaffId(latestGridFormDTO);
+        String gridId = null == recordEntity ? null : recordEntity.getGridId();
         if(StringUtils.isNotBlank(gridId)){
+            Calendar recordCal = Calendar.getInstance();
+            recordCal.setTime(recordEntity.getCreatedTime());
+            if(currentCal.get(Calendar.YEAR) == recordCal.get(Calendar.YEAR) &&
+                    currentCal.get(Calendar.DAY_OF_YEAR) == recordCal.get(Calendar.DAY_OF_YEAR)
+                    && StringUtils.isNotBlank(recordEntity.getId())){
+                //同一天  更新
+                baseDao.updateRecordTime(recordEntity.getId(),currentCal.getTime());
+            }else{
+                //非同一天 新增
+               recordEntity.setCustomerId(latestGridFormDTO.getCustomerId());
+               recordEntity.setStaffId(latestGridFormDTO.getStaffId());
+               recordEntity.setId(null);
+               recordEntity.setCreatedTime(null);
+               baseDao.insert(recordEntity);
+            }
             CustomerGridFormDTO param = new CustomerGridFormDTO();
             param.setGridId(gridId);
             Result<CustomerGridDTO> gridInfoResult =
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml
index 8c84188b9f..8805ed9dab 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffGridVisitedDao.xml
@@ -33,22 +33,35 @@
         LIMIT 1
     </select>
 
-
-    <select id="selectVistedRecordByStaffId" resultType="com.epmet.entity.StaffGridVisitedEntity">
+    <!-- 根据staffId和customerId查询当前用户上一次登陆的网格Id,Id,创建时间 -->
+    <select id="selectVisitedRecordByStaffId" resultType="com.epmet.entity.StaffGridVisitedEntity">
         SELECT
-        ID,
-        GRID_ID,
-        CREATED_TIME
+            ID,
+            GRID_ID,
+            CREATED_TIME
         FROM
-        STAFF_GRID_VISITED
+            STAFF_GRID_VISITED
         WHERE
-        DEL_FLAG = '0'
-        AND
-        CUSTOMER_ID = #{customerId}
-        AND
-        STAFF_ID = #{staffId}
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+
+            AND STAFF_ID = #{staffId}
+
         ORDER BY
-        CREATED_TIME DESC
-        LIMIT 1
+            CREATED_TIME DESC
+            LIMIT 1
     </select>
+
+    <!-- 更新工作人员网格登陆记录的时间 -->
+    <update id="updateRecordTime">
+        UPDATE
+            STAFF_GRID_VISITED
+        SET
+            CREATED_TIME = #{date},
+            UPDATED_TIME = #{date}
+        WHERE
+            DEL_FLAG = '0'
+        AND
+            ID = #{id}
+    </update>
 </mapper>
\ No newline at end of file

From 470b205d4bdcacb4c9728c16c9bd14da5678dbce Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 27 Aug 2020 17:32:28 +0800
Subject: [PATCH 20/66] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/AgencyResultDTO.java |  6 +++
 .../result/StaffInAgencyListResultDTO.java    | 44 +++++++++++++++++++
 .../constant/CustomerAgencyConstant.java      |  4 ++
 .../controller/CustomerAgencyController.java  | 13 ++++++
 .../java/com/epmet/dao/CustomerAgencyDao.java |  7 +++
 .../epmet/service/CustomerAgencyService.java  |  8 ++++
 .../impl/CustomerAgencyServiceImpl.java       | 24 ++++++++++
 .../resources/mapper/CustomerAgencyDao.xml    | 14 ++++++
 8 files changed, 120 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInAgencyListResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
index a02fdb01ee..e4592c5b0b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
@@ -17,6 +17,7 @@
 
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -40,4 +41,9 @@ public class AgencyResultDTO implements Serializable {
      * 机关组织名称
      */
     private String agencyName = "";
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    @JsonIgnore
+    private String pids = "";
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInAgencyListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInAgencyListResultDTO.java
new file mode 100644
index 0000000000..52261bc95a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInAgencyListResultDTO.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 工作端-查询当前人员所属组织及所有下级组织--接口返参
+ *
+ * @author sun
+ */
+@Data
+public class StaffInAgencyListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 当前组织信息
+     */
+    private AgencyResultDTO agencyList;
+    /**
+     * 下级组织信息(递归)
+     */
+    private List<AgencySubResultDTO> subAgencyList;
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
index b1a42c4209..da89288f00 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
@@ -67,4 +67,8 @@ public interface CustomerAgencyConstant {
 	 * 网格党建指导员角色
 	 */
 	String GRID_PARTY_DIRECTOR = "grid_party_director";
+	/**
+	 * 获取工作人员组织信息失败
+	 */
+	String SELECT_STAFF_AGENCY_EXCEPTION = "获取工作人员组织信息失败";
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index fb76995133..c8b2350e16 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -229,4 +231,15 @@ public class CustomerAgencyController {
     Result<ExtUserInfoResultDTO> userInfoExt(@RequestBody ExtUserInfoResultDTO result){
         return new Result<ExtUserInfoResultDTO>().ok(customerAgencyService.extUserInfo(result));
     }
+
+    /**
+     * @param tokenDTO
+     * @return
+     * @Author sun
+     * @Description 工作端-查询当前人员所属组织及所有下级组织
+     **/
+    @PostMapping("staffinagencylist")
+    public Result<StaffInAgencyListResultDTO> staffInAgencyList(@LoginUser TokenDto tokenDTO) {
+        return new Result<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId()));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 26ec50ed8e..63f48f3c13 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -161,4 +161,11 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     **/
     List<ExtDeptResultDTO> selectDeptList(@Param("agencyId") String agencyId);
 
+    /**
+     * @param staffId
+     * @return
+     * @Author sun
+     * @Description 查询工作人员所属组织信息
+     **/
+    AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index 02d05a373c..b7a556c5b0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -205,4 +205,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @date 2020.08.21 17:31
     **/
     ExtUserInfoResultDTO extUserInfo(ExtUserInfoResultDTO result);
+
+    /**
+     * @param staffId
+     * @return
+     * @Author sun
+     * @Description 工作端-查询当前人员所属组织及所有下级组织
+     **/
+    StaffInAgencyListResultDTO staffInAgencyList(String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index c401f89afc..0dc4569cc4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -971,4 +971,28 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
     }
 
+    /**
+     * @param staffId
+     * @return
+     * @Author sun
+     * @Description 工作端-查询当前人员所属组织及所有下级组织
+     **/
+    @Override
+    public StaffInAgencyListResultDTO staffInAgencyList(String staffId) {
+        StaffInAgencyListResultDTO resultDTO = new StaffInAgencyListResultDTO();
+        //1.查询工作人员所属组织信息
+        AgencyResultDTO agencyList = baseDao.selectAgencyByStaffId(staffId);
+        if (null == agencyList) {
+            logger.error(String.format("查询工作人员所属组织信息失败，staffId->%s", staffId));
+            throw new RenException(CustomerAgencyConstant.SELECT_STAFF_AGENCY_EXCEPTION);
+        }
+        resultDTO.setAgencyList(agencyList);
+
+        //2.递归查询所有下级组织信息
+        List<AgencySubResultDTO> subAgencyList = getDepartmentList(("".equals(agencyList.getPids()) ? "" : agencyList.getPids() + ":") + agencyList.getAgencyId());
+        resultDTO.setSubAgencyList(subAgencyList);
+
+        return resultDTO;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index c2fb090e3f..5e6cf088ac 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -258,4 +258,18 @@
             AND agency.PID = #{pid}
     </select>
 
+    <select id="selectAgencyByStaffId" resultType="com.epmet.dto.result.AgencyResultDTO">
+        SELECT
+            ca.id AS "agencyId",
+            ca.organization_name AS "agencyName",
+	        ca.pids AS "pids"
+        FROM
+            customer_agency ca
+        INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id
+        WHERE
+            ca.del_flag = '0'
+        AND csa.del_flag = '0'
+        AND csa.user_id = #{staffId}
+    </select>
+
 </mapper>
\ No newline at end of file

From 54b2bab2c7d9ec4ba8b6402bd918e0695c03699d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 27 Aug 2020 17:57:42 +0800
Subject: [PATCH 21/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index d10eea3729..a2a223a704 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.131
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.135
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index dea6287ed4..b7cef83c2c 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.134</version>
+    <version>0.0.135</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From 56c41e64d88db22488d6c8fbbec1f1ecba516476 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 28 Aug 2020 11:17:57 +0800
Subject: [PATCH 22/66] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B0=83=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  2 ++
 .../epmet/dto/form/StaffTransferFormDTO.java  | 30 ++++++++++++++++
 .../com/epmet/controller/StaffController.java | 15 ++++++++
 .../java/com/epmet/service/StaffService.java  | 12 +++++++
 .../epmet/service/impl/StaffServiceImpl.java  | 36 +++++++++++++++++--
 .../feign/GovProjectOpenFeignClient.java      | 16 +++++++++
 .../GovProjectOpenFeignClientFallback.java    | 11 ++++++
 .../epmet/controller/ProjectController.java   | 20 +++++++++++
 .../com/epmet/service/ProjectService.java     |  1 +
 9 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferFormDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index d3d2b8ccd1..d6ca03a428 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -77,6 +77,8 @@ public enum EpmetErrorCode {
 	CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),
 	NO_SET_GRID_COUNT(8406,"您还未设置创建网格数量上限，请联系管理员设置"),
 	GRID_COUNT_UP(8407,"您的创建网格数量已到达上限，请联系管理员设置"),
+	EXIT_PEND_PROJECT(8408,"该工作人员有项目尚在处理，处理完毕方可操作"),
+	EXIT_PUBLISHED_ACTIVITY(8409,"该工作人员有活动尚在进行，等活动完成方可操作"),
 
 	ALREADY_EVALUATE(8501,"您已评价"),
 	ALREADY_VOTE(8502,"您已表态"),
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferFormDTO.java
new file mode 100644
index 0000000000..fad8bc2dd9
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferFormDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/27 16:05
+ */
+@NoArgsConstructor
+@Data
+public class StaffTransferFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -9011669876505775874L;
+	/**
+	 * 被调动工作人员Id
+	 */
+	private String staffId;
+	/**
+	 * 调动后组织Id
+	 */
+	private String agencyId;
+	/**
+	 * 备注说明
+	 */
+	private String remarks;
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index 664f425aee..8eea5b3461 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
+import com.epmet.dto.form.StaffTransferFormDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.service.StaffService;
@@ -135,4 +136,18 @@ public class StaffController {
 	public Result<MineResultDTO> mine(@RequestBody StaffInfoFromDTO fromDTO){
 		return new Result<MineResultDTO>().ok(staffService.mine(fromDTO));
 	}
+
+	/**
+	 * 工作人员调动
+	 *
+	 * @author zhaoqifeng
+	 * @date 2020/8/27 16:12
+	 * @param tokenDto
+	 * @param fromDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("stafftransfer")
+	public Result staffTransfer(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferFormDTO fromDTO){
+		return new Result();
+	}
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
index 22f423738a..dab238f3fb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
+import com.epmet.dto.form.StaffTransferFormDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.*;
 
@@ -84,11 +85,22 @@ public interface StaffService {
 
 	/**
 	 * 我的基本信息
+	 *
 	 * @author zhaoqifeng
 	 * @date 2020/5/22 16:57
 	 * @param fromDTO
 	 * @return com.epmet.dto.result.MineResultDTO
 	 */
 	MineResultDTO mine(StaffInfoFromDTO fromDTO);
+	
+	/**
+	 * 工作人员调动
+	 * @author zhaoqifeng
+	 * @date 2020/8/27 16:13
+	 * @param tokenDto
+	 * @param fromDTO
+	 * @return void
+	 */
+	void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO);
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index eea0a80d21..53cf6d9b14 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -1,18 +1,19 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerStaffAgencyService;
@@ -40,6 +41,8 @@ public class StaffServiceImpl implements StaffService {
 	private CustomerAgencyService customerAgencyService;
 	@Autowired
 	private CustomerStaffAgencyService customerStaffAgencyService;
+	@Autowired
+	private GovProjectOpenFeignClient govProjectOpenFeignClient;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -183,4 +186,31 @@ public class StaffServiceImpl implements StaffService {
 		}
 		return result;
 	}
+
+	@Override
+	public void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO) {
+		//1.获取工作人员与机关关系
+		CustomerStaffAgencyDTO staffAgencyDTO = customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId());
+		String oldAgency = staffAgencyDTO.getAgencyId();
+		//2.查询是否有未处理项目
+		ProjectListFromDTO projectFromDTO = new ProjectListFromDTO();
+		projectFromDTO.setCustomerId(staffAgencyDTO.getCustomerId());
+		projectFromDTO.setUserId(fromDTO.getStaffId());
+		projectFromDTO.setPageNo(1);
+		projectFromDTO.setPageSize(10);
+		Result<List<PendProjectListResultDTO>> pendResult = govProjectOpenFeignClient.getPendProjectList(projectFromDTO);
+		if (!pendResult.success()) {
+			throw new RenException(pendResult.getCode(), pendResult.getMsg());
+		}
+		if (null != pendResult.getData() && pendResult.getData().size() > NumConstant.ZERO) {
+			throw new RenException(EpmetErrorCode.EXIT_PEND_PROJECT.getCode());
+		}
+		//3.查询是否有活动未结束
+
+		//4.修改人员所属组织
+
+		//5.逻辑删除工作人员原组织加入的部门、网格,组织人员总数旧的减1新的加1，部门、网格总人数减1
+
+		//6.操作记录表新增调动记录
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
index b2e6b7f32c..c16b8da399 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
@@ -1,9 +1,16 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.result.PendProjectListResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -13,4 +20,13 @@ import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
  */
 @FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectOpenFeignClientFallback.class)
 public interface GovProjectOpenFeignClient {
+	/**
+	 * 待处理项目列表
+	 * @author zhaoqifeng
+	 * @date 2020/8/27 16:56
+	 * @param fromDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.PendProjectListResultDTO>>
+	 */
+	@PostMapping("gov/project/project/pendprojectlist")
+	Result<List<PendProjectListResultDTO>> getPendProjectList(@RequestBody ProjectListFromDTO fromDTO);
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
index 4b8c2cd82b..aa84f509c5 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
@@ -1,8 +1,15 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.result.PendProjectListResultDTO;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -11,4 +18,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignClient {
+	@Override
+	public Result<List<PendProjectListResultDTO>> getPendProjectList(ProjectListFromDTO fromDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getPendProjectList", fromDTO);
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index ad3faa944b..5ccc25b279 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -17,7 +17,11 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -27,10 +31,12 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.LatestListFormDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
 import com.epmet.dto.form.ShiftProjectFormDTO;
 import com.epmet.dto.form.ShiftProjectsFromDTO;
 import com.epmet.dto.result.IssueProjectResultDTO;
 import com.epmet.dto.result.LatestListResultDTO;
+import com.epmet.dto.result.PendProjectListResultDTO;
 import com.epmet.dto.result.ShiftProjectResultDTO;
 import com.epmet.excel.ProjectExcel;
 import com.epmet.service.ProjectService;
@@ -132,4 +138,18 @@ public class ProjectController {
         return new Result<List<LatestListResultDTO>>().ok(projectService.getClosedProjectList(formDTO));
     }
 
+
+    /**
+     * 获取待处理项目列表
+     * @author zhaoqifeng
+     * @date 2020/8/27 16:55
+     * @param fromDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.PendProjectListResultDTO>>
+     */
+    @PostMapping("pendprojectlist")
+    public Result<List<PendProjectListResultDTO>> getPendProjectList(@RequestBody ProjectListFromDTO fromDTO) {
+        List<PendProjectListResultDTO> result = projectService.getPendProjectList(fromDTO);
+        return new Result<List<PendProjectListResultDTO>>().ok(result);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
index e34e2ecd21..9f3bfa8bf1 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
@@ -106,6 +106,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 */
 	List<PendProjectListResultDTO> getPendProjectList(ProjectListFromDTO fromDTO);
 
+
 	/**
 	 * 我发起的项目列表
 	 *

From 5835a363fed55280cab9cb559fc929be3c353d7a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 28 Aug 2020 14:09:39 +0800
Subject: [PATCH 23/66] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=AF=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ProjectDetailResultDTO.java |  2 +-
 .../com/epmet/service/impl/ProjectServiceImpl.java   | 12 +++++++-----
 .../src/main/resources/mapper/ProjectStaffDao.xml    |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
index 8ad21b2082..7f309667f0 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
@@ -51,7 +51,7 @@ public class ProjectDetailResultDTO implements Serializable {
 	/**
 	 * 是否是转项目节点
 	 */
-	private Boolean isCreated;
+	private Boolean returnable;
 	/**
 	 * 当前跟进部门
 	 */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index ddacb38fed..0fc60dcbb5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -266,7 +266,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
-			resultDTO.setIsCreated(false);
+			resultDTO.setReturnable(false);
 		} else {
 			//获取我未处理的部门
 			ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@@ -278,11 +278,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			} else {
 				resultDTO.setProcessable(false);
 			}
-			List<String> created = projectStaffService.getCreatedProcess(projectStaffDTO);
-			if (null != created && created.size() > NumConstant.ZERO) {
-				resultDTO.setIsCreated(true);
+			ReturnListFromDTO returnListFromDTO = new ReturnListFromDTO();
+			returnListFromDTO.setProjectId(fromDTO.getProjectId());
+			List<ReturnListResultDTO> returnableList = projectProcessService.getReturnableList(returnListFromDTO);
+			if (null != returnableList && returnableList.size() > NumConstant.ZERO) {
+				resultDTO.setReturnable(true);
 			} else {
-				resultDTO.setIsCreated(false);
+				resultDTO.setReturnable(false);
 			}
 		}
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index 0b8cbe9bc6..b2fc15543a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -62,7 +62,7 @@
         WHERE
             ps.DEL_FLAG = '0'
           AND ps.PROJECT_ID = #{projectId}
-          AND STAFF_ID = #{staffId}
+          AND ps.STAFF_ID = #{staffId}
           AND IS_HANDLE = 'unhandled'
     </select>
 

From c1193a6f82540e3c625fd8ad26c9e971174c29a7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 28 Aug 2020 15:32:32 +0800
Subject: [PATCH 24/66] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V0.0.5__up_function_customized_visited.sql   | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.5__up_function_customized_visited.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.5__up_function_customized_visited.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.5__up_function_customized_visited.sql
new file mode 100644
index 0000000000..e6bf92320c
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.5__up_function_customized_visited.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `function_customized_visited`
+MODIFY COLUMN `MSG`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '原因 失败的原因（例:请求超时、404、500等）' AFTER `RESULT`;
+
+
+ALTER TABLE `function_customized_visited`
+MODIFY COLUMN `URL`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '请求地址 访问的url地址' AFTER `FUNCTION_ID`;
+

From 2f199563266d8df935c582d756f8b653d88e73e4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 28 Aug 2020 17:38:14 +0800
Subject: [PATCH 25/66] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B0=83=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/EpmetHeartOpenFeignClient.java      | 13 +++++
 .../EpmetHeartOpenFeignClientFallback.java    |  6 +++
 .../controller/ResiActListController.java     | 13 +++++
 .../main/java/com/epmet/dao/ActInfoDao.java   |  9 ++++
 .../com/epmet/service/ActInfoService.java     |  9 ++++
 .../service/impl/ActInfoServiceImpl.java      |  5 ++
 .../src/main/resources/mapper/ActInfoDao.xml  |  8 +++
 epmet-module/gov-org/gov-org-server/pom.xml   |  6 +++
 .../com/epmet/dao/CustomerDepartmentDao.java  |  9 ++++
 .../java/com/epmet/dao/CustomerGridDao.java   | 18 +++++++
 .../service/CustomerDepartmentService.java    | 10 ++++
 .../epmet/service/CustomerGridService.java    |  9 ++++
 .../impl/CustomerDepartmentServiceImpl.java   | 24 +++++++++
 .../service/impl/CustomerGridServiceImpl.java | 13 +++++
 .../epmet/service/impl/StaffServiceImpl.java  | 52 +++++++++++++++----
 .../mapper/CustomerDepartmentDao.xml          |  5 ++
 .../main/resources/mapper/CustomerGridDao.xml | 17 ++++++
 17 files changed, 216 insertions(+), 10 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
index 267de1b18d..8043413311 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
@@ -2,9 +2,11 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -28,4 +30,15 @@ public interface EpmetHeartOpenFeignClient {
      **/
     @PostMapping("/heart/resi/volunteer/volunteeruserids")
     Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO);
+
+    /**
+     * 查询用户创建的未结束的活动
+     *
+     * @author zhaoqifeng
+     * @date 2020/8/28 14:38
+     * @param staffId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.ActInfoDTO>>
+     */
+    @PostMapping("/heart/resi/act/published/{staffId}")
+    Result<List<ActInfoDTO>> getPublishedAct(@PathVariable String staffId);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
index 7208b30d92..8c4f0be34a 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
@@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 import org.springframework.stereotype.Component;
@@ -29,4 +30,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result<List<String>> volunteerUserIds(CommonCustomerFormDTO customerFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "volunteerUserIds", customerFormDTO);
     }
+
+    @Override
+    public Result<List<ActInfoDTO>> getPublishedAct(String staffId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "getPublishedAct", staffId);
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
index e0f41b198d..73fe6adeb8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.form.resi.*;
 import com.epmet.dto.result.resi.*;
 import com.epmet.service.*;
@@ -331,4 +332,16 @@ public class ResiActListController {
         ValidatorUtils.validateEntity(formDTO, ResiActContentFormDTO.AddUserInternalGroup.class);
         return actInfoService.checkSignInTime(formDTO);
     }
+
+    /**
+     * 查询用户创建的未结束的活动
+     * @author zhaoqifeng
+     * @date 2020/8/28 14:37
+     * @param staffId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.ActInfoDTO>>
+     */
+    @PostMapping("published/{staffId}")
+    public Result<List<ActInfoDTO>> getPublishedAct(@PathVariable String staffId) {
+        return new Result<List<ActInfoDTO>>().ok(actInfoService.getPublishedAct(staffId));
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
index b4fea5476a..2a1522348e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
@@ -310,4 +310,13 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @Date 11:00 2020-07-20
      **/
     List<ResiLookBackActResultDTO> selectListLookBackActAssembly(ResiLatestActFormDTO formDTO);
+
+    /**
+     * 查询用户创建的未结束的活动
+     * @author zhaoqifeng
+     * @date 2020/8/28 14:27
+     * @param staffId
+     * @return java.util.List<com.epmet.dto.ActInfoDTO>
+     */
+    List<ActInfoDTO> selectPublishedAct(@Param("staffId") String staffId);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
index d1f698480d..dc36ccda4f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
@@ -245,4 +245,13 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @Date 15:03 2020-08-05
      **/
     Result<ResiActRegistrationResultDTO> checkSignInTime(ResiActContentFormDTO formDTO);
+
+    /**
+     * 查询用户创建的未结束的活动
+     * @author zhaoqifeng
+     * @date 2020/8/28 14:32
+     * @param staffId
+     * @return java.util.List<com.epmet.dto.ActInfoDTO>
+     */
+    List<ActInfoDTO> getPublishedAct(String staffId);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index 0691836f68..9f3649d421 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
@@ -416,4 +416,9 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         }
         return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
     }
+
+    @Override
+    public List<ActInfoDTO> getPublishedAct(String staffId) {
+        return baseDao.selectPublishedAct(staffId);
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index 20bc885ec1..4ce15b04c7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -758,4 +758,12 @@
           ORDER BY a.CREATED_TIME DESC
           LIMIT 0, #{num}
     </select>
+    <select id="selectPublishedAct" resultType="com.epmet.dto.ActInfoDTO">
+        SELECT ID,
+               TITLE
+        FROM act_info
+        WHERE DEL_FLAG = '0'
+        AND ACT_STATUS = 'published'
+        AND CREATED_BY = #{staffId}
+    </select>
 </mapper>
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index d7a0b5fc61..a9856a4056 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -89,6 +89,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-heart-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
index 2debda4fce..12d2b81c7e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
@@ -84,4 +84,13 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
      * @Description 查询机关下部门列表信息
      **/
     List<AgencyDeptList> selectAgencyDeptMsgList(@Param("agencyId") String agencyId);
+
+    /**
+     * 删除工作人员与部门关联
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:12
+     * @param staffId
+     * @return void
+     */
+    void deleteStaffDep(@Param("staffId") String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 1d50d1453a..ec450bfa63 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -224,4 +224,22 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2020/8/12 5:10 下午
      */
     Integer selectGridCount(@Param("customerId")String customerId);
+
+    /**
+     * 删除工作人员与网格关联
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:32
+     * @param staffId
+     * @return void
+     */
+    void deleteGridStaff(@Param("staffId") String staffId);
+
+    /**
+     * 查询工作人员所在网格
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:41
+     * @param staffId
+     * @return java.util.List<com.epmet.entity.CustomerGridEntity>
+     */
+    List<CustomerGridEntity> selectGridByStaff(@Param("staffId") String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
index 9722ca82af..bcb0267e38 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
@@ -92,4 +92,14 @@ public interface CustomerDepartmentService extends BaseService<CustomerDepartmen
      * @date 2020-04-20
      */
     void delete(String[] ids);
+
+    /**
+     * 更新部门工作人员关系
+     *
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:20
+     * @param staffId
+     * @return void
+     */
+    void updateDepartment(String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index 67c425915f..f5b22e79ba 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -259,4 +259,13 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2020/8/14 9:31 上午
      */
     CustomerGridCountResultDTO selectGridCount( CustomerIdFormDTO customerIdFormDTO);
+
+    /**
+     * 更新网格工作人员关系
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:36
+     * @param staffId
+     * @return void
+     */
+    void updateGrid(String staffId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
index e3b81d7432..a236f77464 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
@@ -20,11 +20,13 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dto.CustomerDepartmentDTO;
+import com.epmet.dto.result.DepartmentListResultDTO;
 import com.epmet.entity.CustomerDepartmentEntity;
 import com.epmet.redis.CustomerDepartmentRedis;
 import com.epmet.service.CustomerDepartmentService;
@@ -33,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -101,4 +104,25 @@ public class CustomerDepartmentServiceImpl extends BaseServiceImpl<CustomerDepar
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateDepartment(String staffId) {
+        //获取工作人员所在部门及部门总人数
+        List<DepartmentListResultDTO> list =  baseDao.listDepartmentListByStaffId(staffId);
+        if (null != list && list.size() > NumConstant.ZERO) {
+            List<CustomerDepartmentEntity> entityList = new ArrayList<>();
+            for (DepartmentListResultDTO dto : list) {
+                CustomerDepartmentEntity entity = new CustomerDepartmentEntity();
+                entity.setId(dto.getDepartmentId());
+                entity.setTotalUser(dto.getTotalUser() - NumConstant.ONE);
+                entityList.add(entity);
+            }
+            //更新部门总人数
+            updateBatchById(entityList);
+            //删除工作人员与部门关联
+            baseDao.deleteStaffDep(staffId);
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index afece523c4..215e32b471 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -649,4 +649,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return customerGridCount;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateGrid(String staffId) {
+        List<CustomerGridEntity> gridList = baseDao.selectGridByStaff(staffId);
+        if(null != gridList && gridList.size() > NumConstant.ZERO) {
+            gridList.forEach(entity -> {
+                entity.setTotalUser(entity.getTotalUser() - 1);
+            });
+            updateBatchById(gridList);
+            baseDao.deleteGridStaff(staffId);
+        }
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 53cf6d9b14..cae5e05475 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -5,19 +5,16 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.CustomerStaffAgencyDTO;
-import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
-import com.epmet.service.CustomerAgencyService;
-import com.epmet.service.CustomerStaffAgencyService;
-import com.epmet.service.StaffService;
+import com.epmet.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +40,14 @@ public class StaffServiceImpl implements StaffService {
 	private CustomerStaffAgencyService customerStaffAgencyService;
 	@Autowired
 	private GovProjectOpenFeignClient govProjectOpenFeignClient;
+	@Autowired
+	private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
+	@Autowired
+	private CustomerDepartmentService customerDepartmentService;
+	@Autowired
+	private CustomerGridService customerGridService;
+	@Autowired
+	private StaffTransferRecordService staffTransferRecordService;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -188,6 +193,7 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO) {
 		//1.获取工作人员与机关关系
 		CustomerStaffAgencyDTO staffAgencyDTO = customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId());
@@ -206,11 +212,37 @@ public class StaffServiceImpl implements StaffService {
 			throw new RenException(EpmetErrorCode.EXIT_PEND_PROJECT.getCode());
 		}
 		//3.查询是否有活动未结束
-
+		Result<List<ActInfoDTO>> actInfoResult = epmetHeartOpenFeignClient.getPublishedAct(fromDTO.getStaffId());
+		if (!actInfoResult.success()) {
+			throw new RenException(actInfoResult.getCode(), actInfoResult.getMsg());
+		}
+		if (null != actInfoResult.getData() && actInfoResult.getData().size() > NumConstant.ZERO) {
+			throw new RenException(EpmetErrorCode.EXIT_PUBLISHED_ACTIVITY.getCode());
+		}
 		//4.修改人员所属组织
-
-		//5.逻辑删除工作人员原组织加入的部门、网格,组织人员总数旧的减1新的加1，部门、网格总人数减1
-
+		CustomerStaffAgencyDTO staffAgency = new CustomerStaffAgencyDTO();
+		staffAgency.setId(staffAgencyDTO.getId());
+		staffAgency.setAgencyId(fromDTO.getAgencyId());
+		customerStaffAgencyService.update(staffAgency);
+		//原来组织总人数减一
+		CustomerAgencyDTO oldAgencyDTO = customerAgencyService.get(oldAgency);
+		oldAgencyDTO.setTotalUser(oldAgencyDTO.getTotalUser() - NumConstant.ONE);
+		customerAgencyService.update(oldAgencyDTO);
+		//新组织总人数加一
+		CustomerAgencyDTO newAgencyDTO = customerAgencyService.get(fromDTO.getAgencyId());
+		newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() - NumConstant.ONE);
+		customerAgencyService.update(newAgencyDTO);
+		//5.逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1
+		customerDepartmentService.updateDepartment(fromDTO.getStaffId());
+		customerGridService.updateGrid(fromDTO.getStaffId());
 		//6.操作记录表新增调动记录
+		StaffTransferRecordDTO staffTransferRecordDTO = new StaffTransferRecordDTO();
+		staffTransferRecordDTO.setCustomerId(tokenDto.getCustomerId());
+		staffTransferRecordDTO.setOperateStaffId(tokenDto.getUserId());
+		staffTransferRecordDTO.setOperatedStaffId(fromDTO.getStaffId());
+		staffTransferRecordDTO.setOldAgencyId(oldAgency);
+		staffTransferRecordDTO.setAgencyId(fromDTO.getAgencyId());
+		staffTransferRecordDTO.setRemarks(fromDTO.getRemarks());
+		staffTransferRecordService.save(staffTransferRecordDTO);
 	}
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
index a31747facc..bf175e9127 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.CustomerDepartmentDao">
+    <delete id="deleteStaffDep">
+        UPDATE customer_staff_department SET DEL_FLAG = '1'
+        WHERE USER_ID = #{staffId} AND DEL_FLAG = '0'
+    </delete>
 
     <select id="selectDepartmentListByAgencyId" resultType="com.epmet.dto.result.DepartmentListResultDTO">
         SELECT
@@ -32,6 +36,7 @@
         from customer_staff_department csd
                inner join customer_department cd on (csd.DEPARTMENT_ID = cd.ID)
         where csd.USER_ID = #{staffId}
+          and csd.DEL_FLAG = '0'
     </select>
 
     <!-- 根据部门id查询customerId -->
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index b9a98117e1..422984c415 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.CustomerGridDao">
+    <delete id="deleteGridStaff">
+        UPDATE customer_staff_grid SET DEL_FLAG = '1'
+        WHERE USER_ID = #{staffId} AND DEL_FLAG = '0'
+    </delete>
     <select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.CustomerGridFormDTO"
             resultType="com.epmet.dto.CustomerGridDTO">
         SELECT
@@ -473,4 +477,17 @@
             del_flag = '0'
             AND customer_id = #{customerId}
     </select>
+    <select id="selectGridByStaff" resultType="com.epmet.entity.CustomerGridEntity">
+        SELECT
+            g.ID,
+            g.GRID_NAME,
+            g.TOTAL_USER
+        FROM
+            customer_staff_grid sg
+                INNER JOIN customer_grid g ON ( sg.GRID_ID = g.ID )
+        WHERE
+            sg.DEL_FLAG = '0'
+          AND g.DEL_FLAG = '0'
+          AND sg.USER_ID = #{staffId}
+    </select>
 </mapper>
\ No newline at end of file

From f79cfd7fd54ab789ecad1cc3806bbc0e7b165a85 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 Aug 2020 09:43:21 +0800
Subject: [PATCH 26/66] =?UTF-8?q?=E7=A6=85=E9=81=93bug=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/CustomerFunctionDetailDao.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
index 833bb0a9ff..d99e372006 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
@@ -41,7 +41,7 @@
         AND f.del_flag = '0'
         AND fc.del_flag = '0'
         AND f.function_group = '1' <!-- 功能类型：0.默认功能，1.定制功能 -->
-        AND f.shopping_status = '1' <!-- 上架状态：0：下架、1：上架 -->
+        AND cfd.shopping_status = '1' <!-- 上架状态：0：下架、1：上架 -->
         AND cfd.customer_id = #{customerId}
         AND fc.from_app = #{clientType}
         ORDER BY

From 62649fb07dce7900ea8908ce9a6e9c7ee45575df Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 Aug 2020 10:10:04 +0800
Subject: [PATCH 27/66] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F=20?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E8=BF=99=E4=B8=AA=E5=88=86=E6=94=AF=E4=B8=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
index 0f2a2ab82d..aa999da0f6 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
@@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	/**
 	 * 手机验证码
 	 */
-	//@NotBlank(message = "手机验证码不能为空")
+	@NotBlank(message = "手机验证码不能为空")
 	@Length(max=6,message = "手机验证码不能超过6位")
 	private String mobileCode;
 

From 1fcdaf2b137481b78658646ed753271fa08ae99e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 Aug 2020 10:12:56 +0800
Subject: [PATCH 28/66] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
index 0f2a2ab82d..75453a1d22 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
@@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	/**
 	 * 手机验证码
 	 */
-	//@NotBlank(message = "手机验证码不能为空")
+	// @NotBlank(message = "手机验证码不能为空")
 	@Length(max=6,message = "手机验证码不能超过6位")
 	private String mobileCode;
 

From c19aa75b8c1569d0d3b34d6c885d8e63082c96c4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 31 Aug 2020 10:54:24 +0800
Subject: [PATCH 29/66] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B0=83=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/StaffServiceImpl.java  | 14 +++++++++-----
 .../com/epmet/feign/EpmetUserOpenFeignClient.java | 15 +++++++++++----
 .../EpmetUserOpenFeignClientFallback.java         | 10 ++++++----
 .../com/epmet/controller/StaffRoleController.java | 14 ++++++++++++++
 .../src/main/java/com/epmet/dao/StaffRoleDao.java |  9 +++++++++
 .../java/com/epmet/service/StaffRoleService.java  |  9 +++++++++
 .../epmet/service/impl/StaffRoleServiceImpl.java  |  6 ++++++
 .../src/main/resources/mapper/StaffRoleDao.xml    |  5 +++++
 8 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index cae5e05475..170c17fbec 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -10,10 +10,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
-import com.epmet.feign.EpmetHeartOpenFeignClient;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.GovProjectOpenFeignClient;
-import com.epmet.feign.OperCrmFeignClient;
+import com.epmet.feign.*;
 import com.epmet.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +45,8 @@ public class StaffServiceImpl implements StaffService {
 	private CustomerGridService customerGridService;
 	@Autowired
 	private StaffTransferRecordService staffTransferRecordService;
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -235,7 +234,12 @@ public class StaffServiceImpl implements StaffService {
 		//5.逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1
 		customerDepartmentService.updateDepartment(fromDTO.getStaffId());
 		customerGridService.updateGrid(fromDTO.getStaffId());
-		//6.操作记录表新增调动记录
+		//6.更改工作人员组织角色
+		StaffRoleDTO staffRoleDTO = new StaffRoleDTO();
+		staffRoleDTO.setOrgId(fromDTO.getAgencyId());
+		staffRoleDTO.setStaffId(fromDTO.getStaffId());
+		epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO);
+		//7.操作记录表新增调动记录
 		StaffTransferRecordDTO staffTransferRecordDTO = new StaffTransferRecordDTO();
 		staffTransferRecordDTO.setCustomerId(tokenDto.getCustomerId());
 		staffTransferRecordDTO.setOperateStaffId(tokenDto.getUserId());
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 63e3380b6b..f7584e5ea0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -4,10 +4,7 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.UserBaseInfoDTO;
-import com.epmet.dto.UserDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback;
@@ -308,4 +305,14 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping("/epmetuser/userbaseinfo/extuserinfo")
     Result<ExtUserInfoResultDTO> extUserInfo( @RequestBody CommonUserIdFormDTO param);
+
+    /**
+     * 更改角色所属组织
+     * @author zhaoqifeng
+     * @date 2020/8/31 10:36 
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("epmetuser/staffrole/changeroleorg")
+    Result changeRoleOrg(@RequestBody StaffRoleDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 480ba8862e..6aba501d25 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -4,10 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.UserBaseInfoDTO;
-import com.epmet.dto.UserDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -208,4 +205,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<ExtUserInfoResultDTO> extUserInfo(CommonUserIdFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "extUserInfo", param);
     }
+
+    @Override
+    public Result changeRoleOrg(StaffRoleDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "changeRoleOrg", formDTO);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
index 2eada17f01..60b4d5400e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
@@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.entity.DataScope;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.CustomerRoleFormDTO;
 import com.epmet.dto.form.RolesUsersListFormDTO;
@@ -167,4 +168,17 @@ public class StaffRoleController {
     public Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(@PathVariable String staffId) {
         return new Result<List<CustomerStaffRoleResultDTO>>().ok(staffRoleService.getStaffRoles(staffId));
     }
+
+    /**
+     * 更改角色所属组织
+     * @author zhaoqifeng
+     * @date 2020/8/31 10:29
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("changeroleorg")
+    public Result changeRoleOrg(@RequestBody StaffRoleDTO formDTO) {
+        staffRoleService.changeRoleOrg(formDTO);
+        return new Result();
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
index 6de16bc4f8..31dce8b029 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
@@ -100,4 +100,13 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
     List<CustomerStaffRoleResultDTO> selectStaffRoles(@Param("staffId") String staffId);
 
     List<StaffRoleEntity> listStaffRoleEntytiesByStaffIdAndOrgId(@Param("agencyId") String agencyId, @Param("staffId") String staffId);
+
+    /**
+     * 更改角色所属组织
+     * @author zhaoqifeng
+     * @date 2020/8/31 10:33
+     * @param dto
+     * @return void
+     */
+    void updateStaffRoleOrgId(StaffRoleDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
index e6c238a53f..5e260dd3c3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
@@ -150,4 +150,13 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
     List<CustomerStaffRoleResultDTO> getStaffRoles(String staffId);
 
     List<StaffRoleEntity> getStaffRoleEntytiesByStaffIdAndOrgId(String agencyId, String staffId);
+
+    /**
+     * 更改角色组织
+     * @author zhaoqifeng
+     * @date 2020/8/31 10:31
+     * @param formDTO
+     * @return void
+     */
+    void changeRoleOrg(StaffRoleDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index 231ab010ea..bb85550f3c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -182,4 +182,10 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         return baseDao.listStaffRoleEntytiesByStaffIdAndOrgId(agencyId, staffId);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeRoleOrg(StaffRoleDTO formDTO) {
+        baseDao.updateStaffRoleOrgId(formDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index b02425c697..4d58a64abb 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -23,6 +23,11 @@
         and sr.ORG_ID = #{orgId}
         and sr.DEL_FLAG = '0'
     </update>
+    <update id="updateStaffRoleOrgId" parameterType="com.epmet.dto.StaffRoleDTO">
+        UPDATE staff_role SET ORG_ID = #{orgId}
+        WHERE STAFF_ID = #{staffId}
+            AND DEL_FLAG = '0'
+    </update>
 
 
     <!--查询具有某角色的staff列表-->

From 66bac5d2091e4989fe698fcd7ba43188c0159fb8 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 31 Aug 2020 13:38:05 +0800
Subject: [PATCH 30/66] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/FunctionCustomizedDao.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
index e1ad29efb4..cf95c91a43 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
@@ -63,7 +63,7 @@
         WHERE f.DEL_FLAG = '0'
         AND cu.DEL_FLAG = '0'
         <if test="customizedName != null and customizedName.trim() != ''">
-            AND cu.CUSTOMIZED_NAME = #{customizedName}
+            AND cu.CUSTOMIZED_NAME like concat('%', #{customizedName}, '%')
         </if>
         <if test="fromApp != null and fromApp.trim() != ''">
             AND cu.FROM_APP = 'gov'
@@ -81,7 +81,7 @@
         WHERE f.DEL_FLAG = '0'
         AND cu.DEL_FLAG = '0'
         <if test="customizedName != null and customizedName.trim() != ''">
-            AND cu.CUSTOMIZED_NAME = #{customizedName}
+            AND cu.CUSTOMIZED_NAME like concat('%', #{customizedName}, '%')
         </if>
         <if test="fromApp != null and fromApp.trim() != ''">
             AND cu.FROM_APP = 'gov'

From 7741c4ef213b8ea98b92f274a4270fe14f538192 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 31 Aug 2020 13:48:40 +0800
Subject: [PATCH 31/66] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E5=8A=A8=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/enums/RequirePermissionEnum.java     | 1 +
 1 file changed, 1 insertion(+)

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 bc4358bd93..284ef67e74 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
@@ -51,6 +51,7 @@ public enum RequirePermissionEnum {
     ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"),
     ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"),
     ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"),
+    ORG_STAFF_TRANSFER("org_staff_transfer", "组织:工作人员:调动", "组织:工作人员:调动"),
 
     /**
      * 组织-部门

From 9bbf3c7853020db2849fe0bbe335aaf66be72079 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 31 Aug 2020 14:01:27 +0800
Subject: [PATCH 32/66] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B0=83=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/StaffController.java  | 5 +++--
 .../main/java/com/epmet/service/impl/StaffServiceImpl.java   | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index 8eea5b3461..c3187e3e8e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -143,11 +143,12 @@ public class StaffController {
 	 * @author zhaoqifeng
 	 * @date 2020/8/27 16:12
 	 * @param tokenDto
-	 * @param fromDTO
+	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 */
 	@PostMapping("stafftransfer")
-	public Result staffTransfer(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferFormDTO fromDTO){
+	public Result staffTransfer(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferFormDTO formDTO){
+		staffService.staffTransfer(tokenDto, formDTO);
 		return new Result();
 	}
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 170c17fbec..9cae28ab76 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -238,7 +238,10 @@ public class StaffServiceImpl implements StaffService {
 		StaffRoleDTO staffRoleDTO = new StaffRoleDTO();
 		staffRoleDTO.setOrgId(fromDTO.getAgencyId());
 		staffRoleDTO.setStaffId(fromDTO.getStaffId());
-		epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO);
+		Result result = epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO);
+		if (!result.success()) {
+			throw new RenException(result.getCode(), result.getMsg());
+		}
 		//7.操作记录表新增调动记录
 		StaffTransferRecordDTO staffTransferRecordDTO = new StaffTransferRecordDTO();
 		staffTransferRecordDTO.setCustomerId(tokenDto.getCustomerId());

From fb4c1198077a4d215f403635e03d3ce48726122c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 Aug 2020 15:37:55 +0800
Subject: [PATCH 33/66] =?UTF-8?q?=E6=94=BE=E5=BC=80wxlogin=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=8E=B7=E5=8F=96sessionkey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/UserWechatDTO.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java
index 0a62b41a07..0f307c3d47 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java
@@ -108,6 +108,6 @@ public class UserWechatDTO implements Serializable{
      */
     private Date updatedTime;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String sessionKey;
 }

From c74b35701e3b8241b7573ee2f41c3602acdb3e8c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 31 Aug 2020 15:43:33 +0800
Subject: [PATCH 34/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 001effd69f..6f2eaf76ef 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.120</version>
+    <version>0.3.121</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 9d507ee0331fc04df60e696c01e37dfd668b68ad Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 31 Aug 2020 15:46:42 +0800
Subject: [PATCH 35/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index 36ea6d03ac..66f5e1a8b4 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.120
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.121
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

From aa2dc4a1728f84f2c256078fbb20a785dd79f5b7 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 31 Aug 2020 16:55:47 +0800
Subject: [PATCH 36/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index b7cef83c2c..bf1f32b69b 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.135</version>
+    <version>0.0.136</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From c1ea0143db61542b5712f32d3c84c15d1e5ca165 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 31 Aug 2020 16:57:48 +0800
Subject: [PATCH 37/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index a2a223a704..eede66ca29 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.135
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.136
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From b50af788474380c675b9dcd47f83e6de38205387 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 Aug 2020 17:09:30 +0800
Subject: [PATCH 38/66] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ThirdLoginController.java      | 21 ++++++++--
 .../epmet/dto/form/GetResiWxPhoneFormDTO.java | 39 +++++++++++++++++++
 .../com/epmet/service/ThirdLoginService.java  |  9 +++++
 .../service/impl/ThirdLoginServiceImpl.java   | 38 ++++++++++++++++++
 4 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 epmet-auth/src/main/java/com/epmet/dto/form/GetResiWxPhoneFormDTO.java

diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
index 924c1a4070..00770d82bb 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
@@ -2,13 +2,11 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.LoginFormDTO;
-import com.epmet.dto.form.StaffOrgsFormDTO;
-import com.epmet.dto.form.ThirdStaffOrgsFormDTO;
-import com.epmet.dto.form.ThirdWxmpEnteOrgFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.ThirdLoginService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -91,4 +89,19 @@ public class ThirdLoginController {
         return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @author sun
+     * @description 单客户-获取微信用户手机号
+     **/
+    @PostMapping("getresiwxphone")
+    public Result getResiWxPhone(@RequestBody GetResiWxPhoneFormDTO formDTO) {
+        String phone = thirdLoginService.getResiWxPhone(formDTO);
+        if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) {
+            return new Result().ok(phone);
+        }
+        return new Result().ok("");
+    }
+
 }
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/GetResiWxPhoneFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/GetResiWxPhoneFormDTO.java
new file mode 100644
index 0000000000..30e7d947d6
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/GetResiWxPhoneFormDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 单客户-获取微信用户手机号
+ *
+ * @author sun
+ */
+@Data
+public class GetResiWxPhoneFormDTO implements Serializable {
+    private static final long serialVersionUID = 4381236451736209332L;
+    /**
+     * 小程序appId
+     */
+    @NotBlank(message = "appId不能为空",groups = {AddUserInternalGroup.class})
+    private String appId;
+    /**
+     * 微信code
+     */
+    @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
+    private String wxCode;
+    /**
+     * 用户信息
+     */
+    @NotBlank(message = "encryptedData不能为空",groups = {AddUserInternalGroup.class})
+    private String encryptedData;
+    /**
+     * 加密算法的初始向量
+     */
+    @NotBlank(message = "iv不能为空",groups = {AddUserInternalGroup.class})
+    private String iv;
+
+    public interface AddUserInternalGroup {}
+
+}
diff --git a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
index b343bf5a22..3d9c60cc64 100644
--- a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.dto.form.GetResiWxPhoneFormDTO;
 import com.epmet.dto.form.LoginFormDTO;
 import com.epmet.dto.form.ThirdStaffOrgsFormDTO;
 import com.epmet.dto.form.ThirdWxmpEnteOrgFormDTO;
@@ -53,4 +54,12 @@ public interface ThirdLoginService {
 	 * @description 单客户-手机号密码获取组织
 	 **/
 	List<StaffOrgsResultDTO> getMyOrgByPassword(ThirdStaffOrgsFormDTO formDTO);
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @author sun
+	 * @description 单客户-获取微信用户手机号
+	 **/
+    String getResiWxPhone(GetResiWxPhoneFormDTO formDTO);
 }
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index a7980eebe1..9e50e6b796 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -1,6 +1,8 @@
 package com.epmet.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.epmet.common.token.constant.LoginConstant;
@@ -549,4 +551,40 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         return userWechatDTO;
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @author sun
+     * @description 单客户-获取微信用户手机号
+     * 【此接口只适配第三方客户，对于党群e事通客户还是走原接口】
+     **/
+    @Override
+    public String getResiWxPhone(GetResiWxPhoneFormDTO formDTO) {
+        String phone = "";
+        try {
+            //1.根据wxcode获取sessionKey
+            WxLoginFormDTO resiLoginFormDTO = new WxLoginFormDTO();
+            resiLoginFormDTO.setAppId(formDTO.getAppId());
+            resiLoginFormDTO.setWxCode(formDTO.getWxCode());
+            //此方法会校验appId是否授权，然后在判断客户是否存在，之后才是获取sessionKey,如果只想获取sessionKey需要写新接口
+            UserWechatDTO userWechatDTO = this.getUserWeChat(resiLoginFormDTO);
+            if (null == userWechatDTO || null == userWechatDTO.getSessionKey()) {
+                logger.error(String.format("调用生成third服务wxcode获取sessionKey失败，对应appId->" + formDTO.getAppId()));
+                throw new RenException("获取本机号码失败");
+            }
+
+            //2.使用sessionKey解密获取手机号
+            WxMaPhoneNumberInfo phoneNoInfo = WxMaPhoneNumberInfo.fromJson(WxMaCryptUtils.decrypt(userWechatDTO.getSessionKey(),
+                    formDTO.getEncryptedData(),
+                    formDTO.getIv()));
+            if (null != phoneNoInfo) {
+                phone = phoneNoInfo.getPurePhoneNumber();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(String.format("获取用户微信绑定的手机号接口异常%s", e.getMessage()));
+        }
+        return phone;
+    }
+
 }

From 7f7e904c5648f1c8b7215a476b051d97c13f489e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 Aug 2020 17:38:32 +0800
Subject: [PATCH 39/66] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=20=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E9=A1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartyMemberConfirmServiceImpl.java   | 19 ++++++++++---------
 .../service/impl/UserResiInfoServiceImpl.java | 16 +++++++++-------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 8a0958ff8b..93aa5af28c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -173,15 +173,16 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		Result result = new Result();
 
 		//校验手机验证码是否正常
-		//TODO 党员认证信息提交暂时注释验证码校验
-		/*String code = partyMemberInfoRedis.getUserMobileCode(partyMemberInfoDTO.getUserId(),
-				partyMemberInfoDTO.getMobile(),
-				partyMemberInfoDTO.getCode());
-		if (null == code) {
-			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null,
-					PartyMemberConstant.OPERATE_AUTO_FAILED);
-			return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
-		}*/
+		if (StringUtils.isNotBlank(partyMemberInfoDTO.getCode())) {
+			String code = partyMemberInfoRedis.getUserMobileCode(partyMemberInfoDTO.getUserId(),
+					partyMemberInfoDTO.getMobile(),
+					partyMemberInfoDTO.getCode());
+			if (null == code) {
+				saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null,
+						PartyMemberConstant.OPERATE_AUTO_FAILED);
+				return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+			}
+		}
 
 		//获取党员基本信息(匹配)
 		PartymemberConfirmAutoDTO confirmAutoDTO =
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index fd7b3a0072..e8148b7418 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -162,13 +162,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	public Result submit(UserResiInfoDTO userResiInfoDTO) {
 		Result result = new Result();
 		//1:手机验证码数据校验
-		//TODO 完善居民信息暂时注释验证码校验
-		/*String verificationCode = userResiInfoRedis.getUserResiMobileCode(userResiInfoDTO.getUserId(),userResiInfoDTO.getRegMobile(),userResiInfoDTO.getMobileCode());
-		if(null == verificationCode || StringUtils.isBlank(verificationCode)){
-			//验证码校验失败则更新行为记录表数据 返回前台结果
-			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
-			return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
-		}*/
+		if (StringUtils.isNotBlank(userResiInfoDTO.getMobileCode())) {
+			String verificationCode = userResiInfoRedis.getUserResiMobileCode(userResiInfoDTO.getUserId(), userResiInfoDTO.getRegMobile(), userResiInfoDTO.getMobileCode());
+			if (null == verificationCode || StringUtils.isBlank(verificationCode)) {
+				//验证码校验失败则更新行为记录表数据 返回前台结果
+				userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
+				return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+			}
+		}
+
 		//2:再次判断手机号是否在客户下可用
 		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
 			//手机号验证失败则更新行为记录表数据 返回前台结果

From 159c10703727ce252e8a76373d31cfd7946f060a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 1 Sep 2020 11:17:41 +0800
Subject: [PATCH 40/66] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A412=E4=B8=AA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerFunctionCollectResultDTO.java     | 25 +++++++++++++++++++
 .../CustomerFunctionDetailController.java     |  3 +--
 .../epmet/dao/CustomerFunctionDetailDao.java  | 10 ++++++++
 .../CustomerFunctionDetailService.java        |  2 +-
 .../CustomerFunctionDetailServiceImpl.java    | 15 +++++++----
 .../mapper/CustomerFunctionDetailDao.xml      | 24 ++++++++++++++++++
 6 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionCollectResultDTO.java

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionCollectResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionCollectResultDTO.java
new file mode 100644
index 0000000000..b1d9b1afe0
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionCollectResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 运营端-定制功能采集-接口返参
+ * @Author sun
+ */
+@Data
+public class CustomerFunctionCollectResultDTO implements Serializable {
+	private static final long serialVersionUID = 2971689193155710437L;
+
+	/**
+	 * 客户某一端定制功能总数
+	 */
+	private Integer num;
+
+	/**
+	 * 所属端中文名称
+	 */
+	private String fromAppName;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java
index 42f69d00e2..245d5018a2 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java
@@ -188,8 +188,7 @@ public class CustomerFunctionDetailController {
     @PostMapping("customerfunctioncollect")
     public Result customerFunctionCollect(@LoginUser TokenDto tokenDto, @RequestBody CustomerFunctionCollectFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, CustomerFunctionCollectFormDTO.AddUserInternalGroup.class, CustomerFunctionCollectFormDTO.AddUserShowGroup.class);
-        customerFunctionDetailService.customerFunctionCollect(formDTO);
-        return new Result();
+        return customerFunctionDetailService.customerFunctionCollect(formDTO);
     }
 
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java
index 1a6572179d..bfbefc518d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java
@@ -19,9 +19,11 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerFunctionDetailDTO;
+import com.epmet.dto.form.CustomerFunctionCollectFormDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
 import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
 import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
+import com.epmet.dto.result.CustomerFunctionCollectResultDTO;
 import com.epmet.dto.result.CustomerResultDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.entity.CustomerFunctionDetailEntity;
@@ -101,4 +103,12 @@ public interface CustomerFunctionDetailDao extends BaseDao<CustomerFunctionDetai
      * @Description  .查询客户当前已有定制功能最大排序号
      **/
     CustomerFunctionDetailDTO selectOrderByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @param  formDTO
+     * @return
+     * @Author sun
+     * @Description  查询当前采集功能所属端，统计客户在当前所属端已上架功能总数
+     **/
+    CustomerFunctionCollectResultDTO sumCustomerFunctionNum(CustomerFunctionDetailDTO formDTO);
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java
index 7729d60bcd..d0561093e3 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java
@@ -150,5 +150,5 @@ public interface CustomerFunctionDetailService extends BaseService<CustomerFunct
      * @Author sun
      * @Description  定制功能采集
      **/
-    void customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO);
+    Result customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO);
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 73bcd4a0f7..1d5650fbae 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -36,10 +36,7 @@ import com.epmet.dto.CustomerFunctionDetailDTO;
 import com.epmet.dto.FunctionCustomizedDTO;
 import com.epmet.dto.FunctionShoppingHistoryDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CustomerFunctionCustomizedListResultDTO;
-import com.epmet.dto.result.CustomerResultDTO;
-import com.epmet.dto.result.FunctionDetailResultDTO;
-import com.epmet.dto.result.FunctionResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerFunctionDetailEntity;
 import com.epmet.entity.CustomerFunctionEntity;
 import com.epmet.entity.FunctionShoppingHistoryEntity;
@@ -219,7 +216,14 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO) {
+    public Result customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO) {
+        //0.查询当前采集功能所属端，统计客户在当前所属端已上架功能总数
+        CustomerFunctionDetailDTO customerFunctionDetailDTO = ConvertUtils.sourceToTarget(formDTO,CustomerFunctionDetailDTO.class);
+        CustomerFunctionCollectResultDTO dto = baseDao.sumCustomerFunctionNum(customerFunctionDetailDTO);
+        if (dto.getNum() >= NumConstant.ONE) {
+            return new Result().error(8000, String.format("当前客户在[%s]已存在12个上线功能,不允许再次采集！", dto.getFromAppName()));
+        }
+
         //1.查询定制功能详细信息
         FunctionCustomizedDTO functionDTO = functionCustomizedDao.selectByFunctionId(formDTO.getFunctionId());
         if(functionDTO == null){
@@ -259,6 +263,7 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
         historyEntity.setReason(formDTO.getReason());
         functionShoppingHistoryDao.insert(historyEntity);
 
+        return new Result();
     }
 
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
index d99e372006..6766e64678 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
@@ -97,6 +97,30 @@
         LIMIT 1
     </select>
 
+    <!-- 统计客户某一端上架定制功能数 -->
+    <select id="sumCustomerFunctionNum" resultType="com.epmet.dto.result.CustomerFunctionCollectResultDTO">
+        SELECT
+            COUNT(cfd.FUNCTION_ID) AS "num",
+            IF(fc.FROM_APP='gov','工作端',IF(fc.FROM_APP='resi','居民端','无')) AS "fromAppName"
+        FROM
+            customer_function_detail cfd
+        INNER JOIN function_customized fc ON cfd.FUNCTION_ID = fc.FUNCTION_ID
+        WHERE
+            cfd.DEL_FLAG = '0'
+        AND fc.DEL_FLAG = '0'
+        AND cfd.SHOPPING_STATUS = '1'
+        AND cfd.CUSTOMER_ID = #{customerId}
+        AND fc.FROM_APP = (
+            SELECT
+                FROM_APP
+            FROM
+                function_customized
+            WHERE
+                DEL_FLAG = '0'
+            AND FUNCTION_ID = #{functionId}
+        )
+    </select>
+
     <update id="updateShoppingStatus" parameterType="com.epmet.dto.form.UpdateShoppingStatusFormDTO">
         UPDATE customer_function_detail
         SET

From dc44aab8fb68744e3523604e6138a8edf7bd9a65 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 1 Sep 2020 11:53:43 +0800
Subject: [PATCH 41/66] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=B8=8A=E6=9E=B6=EF=BC=8C=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=B6=85=E8=BF=8712=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerFunctionDetailServiceImpl.java     | 13 +++++++++++++
 .../service/impl/FunctionCustomizedServiceImpl.java |  1 +
 2 files changed, 14 insertions(+)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 1d5650fbae..7d4a668843 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -153,6 +153,19 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO) {
+        // 用户定制功能上架，需判断，已上架的数量是否超过12
+        if (NumConstant.ONE_STR.equals(formDTO.getShoppingStatus())){
+            // 根据functionId，customerId、所属端，查询当前客户 现已上架的 功能数量。
+            CustomerFunctionDetailDTO functionDetailDTO = new CustomerFunctionDetailDTO();
+            functionDetailDTO.setFunctionId(formDTO.getFunctionId());
+            functionDetailDTO.setCustomerId(formDTO.getCustomerId());
+            CustomerFunctionCollectResultDTO functionNum = baseDao.sumCustomerFunctionNum(functionDetailDTO);
+            if (null != functionNum){
+                if (NumConstant.TWELVE <= functionNum.getNum()){
+                    return new Result().error(8000,"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
+                }
+            }
+        }
         // 修改 客户定制功能详情表，上下架状态
         baseDao.updateShoppingStatus(formDTO);
         // 保存日志记录到  客户定制功能上下架历史表
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
index 611f7de98e..203b336cf9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
@@ -359,6 +359,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         this.upFunction(formDTO, NumConstant.ONE);
         // 2.修改 定制功能表, 修改的字段范围，是所有入参字段
         FunctionCustomizedEntity entity = ConvertUtils.sourceToTarget(formDTO, FunctionCustomizedEntity.class);
+        entity.setCustomizedName(formDTO.getFunctionName());
         baseDao.updateFunctionCustomized(entity);
     }
 

From 1462b7a60813288c5d54c686723c86e5fe0ee792 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 1 Sep 2020 13:28:48 +0800
Subject: [PATCH 42/66] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/CustomerFunctionDetailServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 7d4a668843..2b599a211a 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -233,7 +233,7 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
         //0.查询当前采集功能所属端，统计客户在当前所属端已上架功能总数
         CustomerFunctionDetailDTO customerFunctionDetailDTO = ConvertUtils.sourceToTarget(formDTO,CustomerFunctionDetailDTO.class);
         CustomerFunctionCollectResultDTO dto = baseDao.sumCustomerFunctionNum(customerFunctionDetailDTO);
-        if (dto.getNum() >= NumConstant.ONE) {
+        if (dto.getNum() >= NumConstant.TWELVE) {
             return new Result().error(8000, String.format("当前客户在[%s]已存在12个上线功能,不允许再次采集！", dto.getFromAppName()));
         }
 

From a0dcbd07b6ae4a466d6c4733052a60b48d081cfb Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 1 Sep 2020 15:06:53 +0800
Subject: [PATCH 43/66] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=20-=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomerFunctionDetailServiceImpl.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 2b599a211a..d57623db5d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -155,15 +155,13 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
     public Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO) {
         // 用户定制功能上架，需判断，已上架的数量是否超过12
         if (NumConstant.ONE_STR.equals(formDTO.getShoppingStatus())){
-            // 根据functionId，customerId、所属端，查询当前客户 现已上架的 功能数量。
+            // 根据functionId，customerId，查询当前客户所属端 现已上架的 功能数量。
             CustomerFunctionDetailDTO functionDetailDTO = new CustomerFunctionDetailDTO();
             functionDetailDTO.setFunctionId(formDTO.getFunctionId());
             functionDetailDTO.setCustomerId(formDTO.getCustomerId());
             CustomerFunctionCollectResultDTO functionNum = baseDao.sumCustomerFunctionNum(functionDetailDTO);
-            if (null != functionNum){
-                if (NumConstant.TWELVE <= functionNum.getNum()){
-                    return new Result().error(8000,"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
-                }
+            if (NumConstant.TWELVE <= functionNum.getNum()){
+                return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(),"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
             }
         }
         // 修改 客户定制功能详情表，上下架状态

From 352c936f4fe1841b243cc8f35e65c409826e30b4 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 2 Sep 2020 10:21:25 +0800
Subject: [PATCH 44/66] =?UTF-8?q?1=E3=80=81=E5=AE=9A=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9-=E6=94=AF=E6=8C=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD=E8=AF=B4=E6=98=8E=E3=80=822.?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/FunctionCustomizedController.java    | 2 +-
 .../java/com/epmet/service/FunctionCustomizedService.java | 2 +-
 .../epmet/service/impl/FunctionCustomizedServiceImpl.java | 8 ++++----
 .../src/main/resources/mapper/FunctionCustomizedDao.xml   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
index fd82ce4fb6..8326a0a528 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
@@ -143,7 +143,7 @@ public class FunctionCustomizedController {
     /**
      * 定制功能修改
      * 有客户在使用该功能时则不允许修改上下架状态、业务域名和外链地址、所属端app,
-     *                  只能修改功能名称和大小图标
+     *                  只能修改功能名称和大小图标、功能说明
      * 修改的要判断是否有客户在使用，有用的要批量更新已使用客户数据
      *
      * @param formDTO
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
index a02b628755..24411c0d80 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
@@ -130,7 +130,7 @@ public interface FunctionCustomizedService extends BaseService<FunctionCustomize
     /**
      * 定制功能修改
      * 有客户在使用该功能时则不允许修改上下架状态、业务域名和外链地址、所属端app,
-     *                  只能修改功能名称和大小图标
+     *                  只能修改功能名称和大小图标、功能说明
      * 修改的要判断是否有客户在使用，有用的要批量更新已使用客户数据
      *
      * @param formDTO
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
index 203b336cf9..9a7a1dc122 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
@@ -200,18 +200,18 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
                             && customizedDTO.getIconSmallImg().equals(customizedId.get(i).getIconSmallImg())
                             && customizedDTO.getDomainName().equals(customizedId.get(i).getDomainName())
                             && customizedDTO.getTargetLink().equals(customizedId.get(i).getTargetLink()) ){
-                            // 这个功能，客户使用的是默认的，则判断本次修改的字段，如果是功能名称和大小图标，则批量更新客户数据，负责提示 不能修改
+                            // 这个功能，客户使用的是默认的，则判断本次修改的字段，如果是功能名称和大小图标、功能说明，则批量更新客户数据，负责提示 不能修改
                             if (!formDTO.getShoppingStatus().equals(customizedDTO.getShoppingStatus())
-                                    || !formDTO.getFunctionExplain().equals(customizedDTO.getFunctionExplain())
                                     || !formDTO.getTargetLink().equals(customizedDTO.getTargetLink())
                                     || !formDTO.getDomainName().equals(customizedDTO.getDomainName())
                                     || !formDTO.getFromApp().equals(customizedDTO.getFromApp()) ){
                                 // 4.1 如果修改的内容是其他字段，则返回语句
                                 tipCustomizedInfoUserId.append(customizedId.get(i).getId() + ",");
                             } else if (!formDTO.getFunctionName().equals(customizedDTO.getCustomizedName())
+                                        || !formDTO.getFunctionExplain().equals(customizedDTO.getFunctionExplain())
                                         || !formDTO.getIconLargeImg().equals(customizedDTO.getIconLargeImg())
                                         || !formDTO.getIconSmallImg().equals(customizedDTO.getIconSmallImg())){
-                                // 4.2 如果修改的内容只是：功能名称和大小图标，, 需要批量更新客户数据
+                                // 4.2 如果修改的内容只是：功能名称和大小图标、功能说明，, 需要批量更新客户数据
                                 CustomerFunctionDetailEntity customer = new CustomerFunctionDetailEntity();
                                 customer.setFunctionName(formDTO.getFunctionName());
                                 customer.setIconLargeImg(formDTO.getIconLargeImg());
@@ -340,9 +340,9 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         entity.setId(formDTO.getFunctionId());
         entity.setFunctionName(formDTO.getFunctionName());
         entity.setFunctionIcon(formDTO.getIconLargeImg());
+        entity.setFunctionExplain(formDTO.getFunctionExplain());
         if (NumConstant.ONE == flag){
             entity.setShoppingStatus(Integer.valueOf(formDTO.getShoppingStatus()));
-            entity.setFunctionExplain(formDTO.getFunctionExplain());
         }
         functionService.updateById(entity);
     }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
index cf95c91a43..a9840f4e42 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
@@ -66,7 +66,7 @@
             AND cu.CUSTOMIZED_NAME like concat('%', #{customizedName}, '%')
         </if>
         <if test="fromApp != null and fromApp.trim() != ''">
-            AND cu.FROM_APP = 'gov'
+            AND cu.FROM_APP = #{fromApp}
         </if>
 		ORDER BY cu.FROM_APP, f.CREATED_TIME DESC
     </select>
@@ -84,7 +84,7 @@
             AND cu.CUSTOMIZED_NAME like concat('%', #{customizedName}, '%')
         </if>
         <if test="fromApp != null and fromApp.trim() != ''">
-            AND cu.FROM_APP = 'gov'
+            AND cu.FROM_APP = #{fromApp}
         </if>
     </select>
     <select id="selectDomains" resultType="com.epmet.dto.FunctionCustomizedDTO">

From 65f4fc7c145d56b2fee13395796004ccd9fb1299 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 3 Sep 2020 15:51:38 +0800
Subject: [PATCH 45/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-auth/deploy/docker-compose-prod.yml                       | 2 +-
 epmet-auth/pom.xml                                              | 2 +-
 epmet-gateway/deploy/docker-compose-prod.yml                    | 2 +-
 epmet-gateway/pom.xml                                           | 2 +-
 .../common-service-server/deploy/docker-compose-prod.yml        | 2 +-
 epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +-
 .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml   | 2 +-
 epmet-module/epmet-ext/epmet-ext-server/pom.xml                 | 2 +-
 .../epmet-heart-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml     | 2 +-
 epmet-module/gov-mine/gov-mine-server/pom.xml                   | 2 +-
 .../gov-org/gov-org-server/deploy/docker-compose-prod.yml       | 2 +-
 epmet-module/gov-org/gov-org-server/pom.xml                     | 2 +-
 .../oper-access-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/oper-access/oper-access-server/pom.xml             | 2 +-
 .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml     | 2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml                   | 2 +-
 .../oper-customize-server/deploy/docker-compose-prod.yml        | 2 +-
 epmet-module/oper-customize/oper-customize-server/pom.xml       | 2 +-
 .../resi-partymember-server/deploy/docker-compose-prod.yml      | 2 +-
 epmet-module/resi-partymember/resi-partymember-server/pom.xml   | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-prod.yml     | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml
index 8c5773f2d5..afffcf2474 100644
--- a/epmet-auth/deploy/docker-compose-prod.yml
+++ b/epmet-auth/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.68
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.69
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index f97682e9ba..aaff93a013 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/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-cloud</artifactId>
diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml
index 6b8419721d..c5c27e870b 100644
--- a/epmet-gateway/deploy/docker-compose-prod.yml
+++ b/epmet-gateway/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.30
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.33
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 7e5875d3c5..43269581b5 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.32</version>
+    <version>0.3.33</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
index 5f9878a727..1a43e02ffb 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.9
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.17
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
index 1c8581eb13..169304d350 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -2,7 +2,7 @@
 <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.16</version>
+    <version>0.3.17</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>
diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
index 14e6df41ba..58fcb8f0ac 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-ext-server:
     container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.6
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
index 489cc34f66..771990a0f1 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
 
     <parent>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
index 044248ebe9..297fb4a40f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.52
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.53
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index c8d513e278..5b963aa293 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -2,7 +2,7 @@
 <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.0.52</version>
+    <version>0.0.53</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
index 70b7b9f4c1..7c1d15c36f 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.33
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.34
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml
index 7d2e118675..073cf96190 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@@ -2,7 +2,7 @@
 <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>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
index 006b14bdff..9418cc9ef2 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.83
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.88
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 5886913a2a..f7e38a8870 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
 <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.87</version>
+    <version>0.3.88</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
index 8552999645..6c6bd28509 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-access-server:
     container_name: oper-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.18
     ports:
       - "8093:8093"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index 3dc00901d9..e5c20ef1be 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.17</version>
+    <version>0.3.18</version>
     <parent>
         <artifactId>oper-access</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
index 9a7eb3e9b9..a75df6848f 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.71
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 283ae60811..b675bc8c4a 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -2,7 +2,7 @@
 <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>oper-crm</artifactId>
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
index df76d59dbc..0b2cba4848 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.43
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 58f873d637..b42ea55d37 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -2,7 +2,7 @@
 <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.42</version>
+    <version>0.3.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
index 21e9579a03..65ad6ccbc8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.56
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.57
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index a202858016..7ee6d3c54e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
 <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-partymember</artifactId>
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index a9847b773c..0f080c990f 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.118
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.122
     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 6f2eaf76ef..b7c301d01b 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.121</version>
+    <version>0.3.122</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 34799c9c89375e00a364f76e3415708bc7f9b38c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 3 Sep 2020 16:24:57 +0800
Subject: [PATCH 46/66] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CodeServiceImpl.java    |  4 ++--
 .../src/main/resources/bootstrap.yml               | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
index 020dcf8782..611c1a05b4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
@@ -575,12 +575,12 @@ public class CodeServiceImpl implements CodeService {
 			//设置服务器域名
 			WxResult<WxMaModifyDomainResult> modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
 			if (!modifyDomain.success()) {
-				throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg());
+				log.error(modifyDomain.getErrorMsg());
 			}
 			//设置业务域名
 			WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
 			if (!setWebviewDomain.success()) {
-				throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+				log.error(modifyDomain.getErrorMsg());
 			}
 		});
 	}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
index d52b94a564..9a8fdb81a6 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
@@ -123,6 +123,14 @@ third:
       - https://epmet-dev.elinkservice.cn
       - https://epmet-test.elinkservice.cn
     webviewDomain:
-      - udp://epmet-cloud.elinkservice.cn
-      - udp://epmet-dev.elinkservice.cn
-      - udp://epmet-test.elinkservice.cn
\ No newline at end of file
+      - epmet-ext.elinkservice.cn
+      - epmet-ext1.elinkservice.cn
+      - epmet-ext2.elinkservice.cn
+      - epmet-ext3.elinkservice.cn
+      - epmet-ext4.elinkservice.cn
+      - epmet-ext5.elinkservice.cn
+      - epmet-ext6.elinkservice.cn
+      - epmet-ext7.elinkservice.cn
+      - epmet-ext8.elinkservice.cn
+      - epmet-ext9.elinkservice.cn
+      - epmet-ext10.elinkservice.cn
\ No newline at end of file

From 0f6a9bd7ebbbf7a5bab72bd5a0600f83ae8f33d2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 3 Sep 2020 16:31:54 +0800
Subject: [PATCH 47/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index a2a223a704..ba2f972f3a 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.135
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.137
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index b9b3cde204..2d090fb332 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.136</version>
+    <version>0.0.137</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From cac92dc42293543d6d234e83694e5f042bae9c19 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 3 Sep 2020 16:38:35 +0800
Subject: [PATCH 48/66] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.yml          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
index 9a8fdb81a6..4a3e82e619 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
@@ -123,14 +123,14 @@ third:
       - https://epmet-dev.elinkservice.cn
       - https://epmet-test.elinkservice.cn
     webviewDomain:
-      - epmet-ext.elinkservice.cn
-      - epmet-ext1.elinkservice.cn
-      - epmet-ext2.elinkservice.cn
-      - epmet-ext3.elinkservice.cn
-      - epmet-ext4.elinkservice.cn
-      - epmet-ext5.elinkservice.cn
-      - epmet-ext6.elinkservice.cn
-      - epmet-ext7.elinkservice.cn
-      - epmet-ext8.elinkservice.cn
-      - epmet-ext9.elinkservice.cn
-      - epmet-ext10.elinkservice.cn
\ No newline at end of file
+      - https://epmet-ext.elinkservice.cn
+      - https://epmet-ext1.elinkservice.cn
+      - https://epmet-ext2.elinkservice.cn
+      - https://epmet-ext3.elinkservice.cn
+      - https://epmet-ext4.elinkservice.cn
+      - https://epmet-ext5.elinkservice.cn
+      - https://epmet-ext6.elinkservice.cn
+      - https://epmet-ext7.elinkservice.cn
+      - https://epmet-ext8.elinkservice.cn
+      - https://epmet-ext9.elinkservice.cn
+      - https://epmet-ext10.elinkservice.cn
\ No newline at end of file

From f7be4ec65b8cbedd4f6380725482711805280e7c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 3 Sep 2020 16:41:40 +0800
Subject: [PATCH 49/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index ba2f972f3a..1028ad0be9 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.137
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 2d090fb332..6eadb9e5f2 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.137</version>
+    <version>0.0.138</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From a3b2dfdd32790698d278ef87919eefc96fd35692 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 3 Sep 2020 16:49:54 +0800
Subject: [PATCH 50/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index eede66ca29..1028ad0be9 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.136
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From 4136814cabaa9ff988c031136c5ede8d35f9f4fe Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 3 Sep 2020 17:15:57 +0800
Subject: [PATCH 51/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +-
 epmet-module/gov-access/gov-access-server/pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
index 7a5133aacd..72ebb1216f 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.38
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.39
     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 b69fce8298..948dca9446 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.38</version>
+    <version>0.3.39</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

From 814a9fd3e618150193afc9686acb09730a342d48 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 3 Sep 2020 23:53:42 +0800
Subject: [PATCH 52/66] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker=20restart?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml     | 1 +
 .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml    | 1 +
 .../epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
index 3dbed877f2..fff5c3ac11 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
index 58fcb8f0ac..5a11859c4a 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:
diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
index 4335ec3381..36c753627a 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

From d2f08bb779509ece3fe10be2884d8d06867dcd14 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 4 Sep 2020 10:39:53 +0800
Subject: [PATCH 53/66] =?UTF-8?q?=E5=8A=A0=E6=80=A5=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/CodeAuditResultDTO.java     |  5 +++++
 .../epmet/dto/form/SubmitAuditFormDTO.java    |  5 +++++
 .../dto/result/CodeVersionInfoResultDTO.java  |  4 ++++
 .../epmet/entity/CodeAuditResultEntity.java   |  5 +++++
 .../epmet/service/impl/CodeServiceImpl.java   | 19 +++++++++++++++----
 .../db/migration/V0.0.9__thirdUpdate.sql      |  1 +
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
index 910ded04de..afcedffee0 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
@@ -58,6 +58,11 @@ public class CodeAuditResultDTO implements Serializable {
      */
 	private String result;
 
+	/**
+	 * 是否加急
+	 */
+	private Boolean isSpeed;
+
     /**
      * 原因
      */
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java
index 9c2f1c506f..a16d0c8d6c 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java
@@ -25,6 +25,11 @@ public class SubmitAuditFormDTO implements Serializable {
 	 */
 	private Boolean isSpeed;
 
+	/**
+	 * isSpeed=true时，是否是审核失败后的反馈提审
+	 */
+	private Boolean isRepeat;
+
 	/**
 	 * 小程序版本说明和功能解释
 	 */
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
index b1b367c457..74b1bb54d4 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
@@ -71,6 +71,10 @@ public class CodeVersionInfoResultDTO implements Serializable {
 		 *
 		 */
 		private String status;
+		/**
+		 *
+		 */
+		private Boolean isSpeed;
 	}
 
 	@Data
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
index 164b8a97bb..488fa876a0 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
@@ -58,6 +58,11 @@ public class CodeAuditResultEntity extends BaseEpmetEntity {
      */
 	private String result;
 
+	/**
+	 * 是否加急
+	 */
+	private Boolean isSpeed;
+
     /**
      * 原因
      */
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
index 611c1a05b4..09f5f5a276 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
@@ -183,6 +183,7 @@ public class CodeServiceImpl implements CodeService {
 		//审核版本
 		CodeCustomerDTO audit = codeCustomerService.getAuditInfo(formDTO.getCustomerId(), formDTO.getClientType());
 		if(null != audit) {
+			CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
 			CodeVersionInfoResultDTO.AuditBean auditBean = new CodeVersionInfoResultDTO.AuditBean();
 			auditBean.setCodeId(audit.getId());
 			auditBean.setVersion(audit.getUserVersion());
@@ -191,7 +192,6 @@ public class CodeServiceImpl implements CodeService {
 				//获取小程序调用令牌
 				AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
 				//获取审核结果信息
-				CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
 				//调用微信API获取最新审核状态
 				WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq();
 				request.setAuditId(auditResult.getAuditId());
@@ -222,6 +222,7 @@ public class CodeServiceImpl implements CodeService {
 				}
 			}
 			auditBean.setStatus(audit.getStatus());
+			auditBean.setIsSpeed(auditResult.getIsSpeed());
 			auditBean.setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN));
 			auditBean.setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN));
 			resultDTO.setAudit(auditBean);
@@ -283,6 +284,7 @@ public class CodeServiceImpl implements CodeService {
 					codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxResult.getErrorMsg());
 			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
 		}
+		boolean speedSuccess = false;
 		if(formDTO.getIsSpeed()) {
 			//调用微信API 加急审核
 			WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq();
@@ -291,8 +293,9 @@ public class CodeServiceImpl implements CodeService {
 			if (!wxSpeedResult.success()) {
 				saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(),
 						codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
-				throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
+				log.error(wxSpeedResult.getErrorMsg());
 			}
+			speedSuccess = wxSpeedResult.success();
 		}
 		//获取审核结果信息
 		CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId());
@@ -302,18 +305,24 @@ public class CodeServiceImpl implements CodeService {
 			codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
 			codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
 			codeAuditResultDTO.setAuditId(wxResult.getData());
+			codeAuditResultDTO.setIsSpeed(speedSuccess);
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
 			codeAuditResultService.save(codeAuditResultDTO);
 		} else {
-			codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
-			codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
 			codeAuditResultService.update(codeAuditResultDTO);
 			codeAuditResultService.deleteById(codeAuditResultDTO.getId());
 			codeAuditResultDTO = new CodeAuditResultDTO();
+			codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
+			codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
 			codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
 			codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
 			codeAuditResultDTO.setAuditId(wxResult.getData());
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
+			if (formDTO.getIsRepeat()) {
+				codeAuditResultDTO.setIsSpeed(true);
+			} else {
+				codeAuditResultDTO.setIsSpeed(speedSuccess);
+			}
 			codeAuditResultService.save(codeAuditResultDTO);
 		}
 		//更新代码表状态
@@ -656,6 +665,8 @@ public class CodeServiceImpl implements CodeService {
 					codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
 			throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
 		}
+		codeAuditResultDTO.setIsSpeed(true);
+		codeAuditResultService.update(codeAuditResultDTO);
 	}
 
 	@Override
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql
new file mode 100644
index 0000000000..9e7d638917
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql
@@ -0,0 +1 @@
+ALTER TABLE code_audit_result ADD COLUMN IS_SPEED tinyint NULL DEFAULT 0 COMMENT '是否加急' AFTER RESULT;
\ No newline at end of file

From 44c7aa5168c0eeecb82ebf67dc29235f2d0d74fc Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 4 Sep 2020 10:46:26 +0800
Subject: [PATCH 54/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index 1028ad0be9..a94c11da8f 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.139
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 6eadb9e5f2..ef24994f99 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.138</version>
+    <version>0.0.139</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From bef22d71024d3fce22f427b7d6f1276cbe7ea998 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 4 Sep 2020 10:54:45 +0800
Subject: [PATCH 55/66] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7-?=
 =?UTF-8?q?=E9=81=97=E6=BC=8F=E4=B8=8A=E7=94=9F=E4=BA=A7=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml   | 2 +-
 epmet-module/resi-mine/resi-mine-server/pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
index a2a9ae18df..e59f895806 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.38
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.39
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 35d2c0edda..31ec3b085d 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -2,7 +2,7 @@
 <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.38</version>
+    <version>0.3.39</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

From b0261bca0ade2beda9dac799d7e269bc18e29cd0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Sep 2020 13:55:04 +0800
Subject: [PATCH 56/66] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8E=88=E6=9D=83=20?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E6=8C=89=E9=92=AE=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
index 08f17ae49a..1cb126fe62 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
@@ -43,8 +43,8 @@ public interface WxMaCodeConstant {
      * 上面url为扫码形式
      * 下面注释url为按钮形式
      */
-    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
-//    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect";
+//    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
+    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect";
 
     /**
      * 创建开放平台帐号并绑定公众号/小程序

From ff8cff2a057c567f4f117d01f11001a1d64e05f6 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Sep 2020 13:58:57 +0800
Subject: [PATCH 57/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index d4706c5733..60b8743393 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.134
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.140
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index ef24994f99..493388ea59 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.139</version>
+    <version>0.0.140</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From 43f07858994d39847ab31e8c86b93f29c29c78f8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Sep 2020 14:00:08 +0800
Subject: [PATCH 58/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index a94c11da8f..332cf74116 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.139
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.140
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

From b02d471c1ac311e737f69d00610e722c02aec2a9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Sep 2020 14:17:57 +0800
Subject: [PATCH 59/66] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8E=88=E6=9D=83=20?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E6=8C=89=E9=92=AE=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
index 1cb126fe62..4d62fcc95d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
@@ -44,7 +44,7 @@ public interface WxMaCodeConstant {
      * 下面注释url为按钮形式
      */
 //    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
-    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect";
+    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=3#wechat_redirect";
 
     /**
      * 创建开放平台帐号并绑定公众号/小程序

From dabb4e18d06173f9394e16004f44363ed98a05a2 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Sep 2020 15:22:12 +0800
Subject: [PATCH 60/66] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8E=88=E6=9D=83=20?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E6=89=AB=E7=A0=81=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
index 4d62fcc95d..c0d11dca5b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
@@ -43,8 +43,8 @@ public interface WxMaCodeConstant {
      * 上面url为扫码形式
      * 下面注释url为按钮形式
      */
-//    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
-    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=3#wechat_redirect";
+    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
+//    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=3#wechat_redirect";
 
     /**
      * 创建开放平台帐号并绑定公众号/小程序

From 6f2cb95f273e52f9af1e7b1cf0ea1d16d439a99a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Sep 2020 15:23:04 +0800
Subject: [PATCH 61/66] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-third-server/deploy/docker-compose-dev.yml            | 2 +-
 .../epmet-third-server/deploy/docker-compose-prod.yml           | 2 +-
 epmet-module/epmet-third/epmet-third-server/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index 60b8743393..d9ab7469c0 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.140
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.141
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index 332cf74116..7d3cbbf9c4 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.140
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.141
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 493388ea59..e6fa7ad473 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.140</version>
+    <version>0.0.141</version>
 
     <parent>
         <groupId>com.epmet</groupId>

From c83d5c7d0a53b715d2af85892576f2d36dc64cc2 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 7 Sep 2020 09:44:53 +0800
Subject: [PATCH 62/66] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=9C=BA=E5=85=B3=E3=80=81=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E3=80=81=E7=BD=91=E6=A0=BC=E4=B8=8B=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E8=8C=83=E5=9B=B4=E4=BB=8E=E2=80=9C?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=85=E6=8B=AC=E6=9C=AA=E6=BF=80=E6=B4=BB=E5=92=8C?=
 =?UTF-8?q?=E8=A2=AB=E7=A6=81=E7=94=A8=E7=9A=84=E2=80=9D=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=88=90=E2=80=9C=E4=B8=8D=E5=8C=85=E6=8B=AC=E8=A2=AB=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerStaffDao.xml               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 94aaebe1a6..48fd117891 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -228,7 +228,6 @@
             LEFT JOIN user_wechat uw ON uw.user_id = cs.user_id AND uw.del_flag = 0
         WHERE
             cs.del_flag = 0
-            AND cs.active_flag = 'active'
             AND cs.enable_flag = 'enable'
             AND
             <foreach collection="userIds" item="userId" separator="OR">

From 37e731a9f6716592ec7380551ce36765ca789be7 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 7 Sep 2020 13:25:29 +0800
Subject: [PATCH 63/66] =?UTF-8?q?user=20=20=20=20ext=20=20=20=20=20dev?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml   | 2 +-
 epmet-module/epmet-ext/epmet-ext-server/pom.xml                 | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-prod.yml     | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
index 5a11859c4a..709b384c7a 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-ext-server:
     container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.6
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.7
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
index 771990a0f1..7fe0198686 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
 
     <parent>
         <groupId>com.epmet</groupId>
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index 0f080c990f..4f7e1eb69f 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.122
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.123
     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 b7c301d01b..e9a5b6c5a7 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.122</version>
+    <version>0.3.123</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From fee35235828f032a99228218e5587650201a414b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 7 Sep 2020 14:57:21 +0800
Subject: [PATCH 64/66] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml   | 2 +-
 epmet-module/resi-mine/resi-mine-server/pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
index e59f895806..3c154c7eec 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.39
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.40
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 31ec3b085d..a5087a808c 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -2,7 +2,7 @@
 <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.39</version>
+    <version>0.3.40</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

From 7d1af6c75801ee8271006b3de0839f8ed09491cd Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 7 Sep 2020 18:17:53 +0800
Subject: [PATCH 65/66] =?UTF-8?q?=E9=83=A8=E7=BD=B2statis=20report=20user?=
 =?UTF-8?q?=20ext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
index ad6ed50dc2..8fdb335fda 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.27
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.36
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
index 9a3f62f01c..78d38da205 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.27
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.36
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
index 029e37c343..1fe39907b7 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.47
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
index 2e5a7af0e8..075a43a0af 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.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.47
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index 4f7e1eb69f..183968322f 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.123
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.124
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

From 79691f6f442619e6faf3f580c731cc4bbbc22f77 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 7 Sep 2020 18:27:56 +0800
Subject: [PATCH 66/66] =?UTF-8?q?=E9=83=A8=E7=BD=B2reposrt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-statistical-server/deploy/docker-compose-dev.yml       | 2 +-
 .../data-statistical-server/deploy/docker-compose-prod.yml      | 2 +-
 epmet-module/data-statistical/data-statistical-server/pom.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index dd615ce5f1..36afabff51 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.47
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.48
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
index 1fe39907b7..b62847d615 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.47
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.48
     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 8a32ee8d75..57200bf62b 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.47</version>
+    <version>0.3.48</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>