From 0d4a1ee11eed68dcc27c77642dbcc277be888e61 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 16 Mar 2021 09:52:51 +0800
Subject: [PATCH 01/51] =?UTF-8?q?=E5=AE=8C=E6=88=90ApiService=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E8=AE=BE=E8=AE=A1=EF=BC=8C=E5=87=86=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E5=85=B7=E4=BD=93=E7=9A=84=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisKeys.java  |  9 +++
 .../com/epmet/constant/ApiServiceActions.java | 11 ++++
 .../epmet/dto/form/ProjectAssistFormDTO.java  | 15 +++++
 .../com/epmet/dto/form/TPFDemoFormDTO.java    | 20 ++++++
 .../java/com/epmet/apiservice/ApiService.java | 63 +++++++++++++++++++
 .../epmet/apiservice/impl/DemoApiService.java | 31 +++++++++
 .../impl/LuzhouGridPlatformApiService.java    | 19 ++++++
 .../LZGridPlatformProjectAssistResult.java    |  4 ++
 .../result/ProjectAssistResult.java           |  8 +++
 .../com/epmet/controller/BizController.java   | 54 ++++++++++++++++
 .../com/epmet/dao/ThirdplatformActionDao.java | 33 ++++++++++
 .../dao/ThirdplatformCustomerRegisterDao.java | 36 +++++++++++
 .../java/com/epmet/dao/ThirdplatformDao.java  | 33 ++++++++++
 .../entity/ThirdplatformActionEntity.java     | 51 +++++++++++++++
 .../ThirdplatformCustomerRegisterEntity.java  | 51 +++++++++++++++
 .../com/epmet/entity/ThirdplatformEntity.java | 61 ++++++++++++++++++
 .../com/epmet/service/ApiServiceSelector.java | 46 ++++++++++++++
 .../com/epmet/service/ProjectService.java     | 15 +++++
 .../service/impl/ProjectServiceImpl.java      | 40 ++++++++++++
 .../mapper/ThirdplatformActionDao.xml         | 19 ++++++
 .../ThirdplatformCustomerRegisterDao.xml      | 36 +++++++++++
 .../resources/mapper/ThirdplatformDao.xml     | 21 +++++++
 .../epmet/feign/OperCrmOpenFeignClient.java   |  9 +++
 .../OperCrmOpenFeignClientFallback.java       |  5 ++
 .../epmet/controller/CustomerController.java  | 13 ++++
 .../dao/CustomerThirdplatApiserviceDao.java   | 10 +++
 .../CustomerThirdplatApiServiceService.java   |  9 +++
 ...ustomerThirdplatApiServiceServiceImpl.java | 19 ++++++
 .../mapper/CustomerThirdplatApiserviceDao.xml | 14 +++++
 29 files changed, 755 insertions(+)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ApiServiceActions.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/TPFDemoFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ApiServiceSelector.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 098dd1c14d..220d621195 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -370,4 +370,13 @@ public class RedisKeys {
 	public static String getCustomerApiServiceKey(String customerId) {
 		return rootPrefix.concat("customer:thirdplat:apiservice:").concat(customerId);
 	}
+
+	/**
+	 * 一个客户对应多个第三方平台，多个ApiService的key
+	 * @param customerId
+	 * @return
+	 */
+	public static String listCustomerApiServiceListKey(String customerId) {
+		return rootPrefix.concat("customer:thirdplat:apiservicelist:").concat(customerId);
+	}
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ApiServiceActions.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ApiServiceActions.java
new file mode 100644
index 0000000000..e754e8f31e
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ApiServiceActions.java
@@ -0,0 +1,11 @@
+package com.epmet.constant;
+
+/**
+ * api service 常量列表
+ */
+public interface ApiServiceActions {
+
+    // 测试动作
+    String DEMO_ACTION = "demoAction";
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java
new file mode 100644
index 0000000000..543524f1b1
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java
@@ -0,0 +1,15 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ProjectAssistFormDTO {
+
+    private String customerId;
+
+    @NotBlank(message = "平台ID不能为空")
+    private String platformId;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/TPFDemoFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/TPFDemoFormDTO.java
new file mode 100644
index 0000000000..c790a4a529
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/TPFDemoFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 第三方平台-demo form dto
+ */
+@Data
+public class TPFDemoFormDTO {
+
+    private String demoString;
+
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    @NotBlank(message = "平台ID不能为空")
+    private String platformId;
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
new file mode 100644
index 0000000000..da169d165a
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -0,0 +1,63 @@
+package com.epmet.apiservice;
+
+import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dao.ThirdplatformCustomerRegisterDao;
+import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
+
+/**
+ * ApiService，对接第三方平台的抽象类
+ * 每一个具体平台的ApiService都是该抽象类的子类，选择性实现抽象类中的某些方法，提供具体业务逻辑
+ */
+public abstract class ApiService {
+
+    /**
+     * @Description 判断该客户是否注册了该平台
+     * @return true:已注册该平台，可以使用；false:未注册，无法使用
+     * @author wxz
+     * @date 2021.03.15 11:09
+    */
+    public boolean isRegistered(String customerId, String platformId) {
+        ThirdplatformCustomerRegisterDao tpcRegDao = SpringContextUtils.getBean(ThirdplatformCustomerRegisterDao.class);
+        ThirdplatformCustomerRegisterEntity tpcReg = tpcRegDao.getByCustomerIdAndPlatformId(customerId, platformId);
+        if (tpcReg == null) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @Description 判断客户是否注册了指定的平台，如果没有注册，则抛出异常
+     * @return
+     * @author wxz
+     * @date 2021.03.15 21:39
+    */
+    public void judgeRegistered(String customerId, String platformId) {
+        if (!isRegistered(customerId, platformId)) {
+            throw new RenException(String.format("客户:%s没有配置第三方平台:%s", customerId, platformId));
+        }
+    }
+
+    /**
+     * @Description demo示例方法
+     * @return
+     * @author wxz
+     * @date 2021.03.15 10:46
+    */
+    public String demoAction(TPFDemoFormDTO tpfDemoFormDTO) {
+        return "do success !!";
+    }
+
+    /**
+     * @Description 项目协同处理
+     * @return    项目协同处理的Result。具体的平台返回的结果最终都要转化为这个ProjectAssistResult返回
+     * @author wxz
+     * @date 2021.03.16 09:28
+    */
+    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+        return null;
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
new file mode 100644
index 0000000000..6c1aca3917
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
@@ -0,0 +1,31 @@
+package com.epmet.apiservice.impl;
+
+import com.epmet.apiservice.ApiService;
+import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.ApiServiceActions;
+import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.feign.OperCrmOpenFeignClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * demo api service
+ */
+@Component(value = "demoApiService")
+public class DemoApiService extends ApiService {
+
+    Logger logger = LoggerFactory.getLogger(DemoApiService.class);
+
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
+
+    @Override
+    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+        logger.info("DemoApiService发送项目协助到第三方平台成功");
+        return null;
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
new file mode 100644
index 0000000000..4081bfad61
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -0,0 +1,19 @@
+package com.epmet.apiservice.impl;
+
+import com.epmet.apiservice.ApiService;
+import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.dto.form.ProjectAssistFormDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 泸州网格化平台ApiService
+ */
+@Component("luzhouGridPlatformApiService")
+public class LuzhouGridPlatformApiService extends ApiService {
+
+    @Override
+    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+        System.out.println("泸州网格化平台项目协助发送成功");
+        return null;
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java
new file mode 100644
index 0000000000..ef74410885
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java
@@ -0,0 +1,4 @@
+package com.epmet.apiservice.result;
+
+public class LZGridPlatformProjectAssistResult {
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
new file mode 100644
index 0000000000..2da96d1e17
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
@@ -0,0 +1,8 @@
+package com.epmet.apiservice.result;
+
+import lombok.Data;
+
+@Data
+public class ProjectAssistResult {
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java
new file mode 100644
index 0000000000..ed83a196bf
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java
@@ -0,0 +1,54 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.service.ProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.management.MemoryManagerMXBean;
+
+/**
+ * 对接第三方平台业务相关的controller
+ * 我们系统当中每一个需要发送到第三方平台的操作，只对应这里的一个方法，根据参数传入platformId，内部根据配置获取指定的APiService进行具体平台的调用
+ * 每一个平台都有自己的ApiSerivce
+ */
+@RestController
+@RequestMapping("biz")
+public class BizController {
+
+    @Autowired
+    private ProjectService projectService;
+
+    /**
+     * @Description demo方法
+     * @return
+     * @author wxz
+     * @date 2021.03.15 21:11
+    */
+    @PostMapping("demo-action")
+    public Result demoAction(@RequestBody TPFDemoFormDTO tpfDemoFormDTO) {
+        ValidatorUtils.validateEntity(tpfDemoFormDTO);
+        String r = projectService.demoAction(tpfDemoFormDTO);
+        return new Result().ok(r);
+    }
+
+    /**
+     * @Description 发送项目协同处理方法
+     * @return
+     * @author wxz
+     * @date 2021.03.15 21:13
+    */
+    @PostMapping("project-assist")
+    public Result projectAssist(@RequestBody ProjectAssistFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        projectService.projectAssist(formDTO);
+        return new Result();
+    }
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java
new file mode 100644
index 0000000000..9b309c15fc
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.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.ThirdplatformActionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-15
+ */
+@Mapper
+public interface ThirdplatformActionDao extends BaseDao<ThirdplatformActionEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
new file mode 100644
index 0000000000..e3a39cbbe2
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
@@ -0,0 +1,36 @@
+/**
+ * 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.constant.ThirdPlatformConstant;
+import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-15
+ */
+@Mapper
+public interface ThirdplatformCustomerRegisterDao extends BaseDao<ThirdplatformCustomerRegisterEntity> {
+
+    ThirdplatformCustomerRegisterEntity getByCustomerIdAndPlatformId(@Param("customerId") String customerId, @Param("platformId") String platformId);
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
new file mode 100644
index 0000000000..593d20923f
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.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.ThirdplatformEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-15
+ */
+@Mapper
+public interface ThirdplatformDao extends BaseDao<ThirdplatformEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
new file mode 100644
index 0000000000..88c7a8cd2f
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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 2021-03-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("thirdplatform_action")
+public class ThirdplatformActionEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String platformId;
+
+    /**
+     * 
+     */
+	private String actionKey;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
new file mode 100644
index 0000000000..b3b77fb626
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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 2021-03-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("thirdplatform_customer_register")
+public class ThirdplatformCustomerRegisterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String customerId;
+
+    /**
+     * 
+     */
+	private String platformId;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
new file mode 100644
index 0000000000..4fede6dcdf
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
@@ -0,0 +1,61 @@
+/**
+ * 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 2021-03-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("thirdplatform")
+public class ThirdplatformEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 平台名称
+     */
+	private String platformName;
+
+    /**
+     * 平台唯一KEY
+     */
+	private String platformKey;
+
+    /**
+     * 
+     */
+	private String platformSecret;
+
+	/**
+	 * apiservice
+	 */
+	private String apiService;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ApiServiceSelector.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ApiServiceSelector.java
new file mode 100644
index 0000000000..6e45fc2122
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ApiServiceSelector.java
@@ -0,0 +1,46 @@
+package com.epmet.service;
+
+import com.epmet.apiservice.ApiService;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dao.ThirdplatformDao;
+import com.epmet.entity.ThirdplatformEntity;
+
+/**
+ * ApiService选择器
+ */
+public interface ApiServiceSelector {
+
+    /**
+     * @Description 根据platformId查找platform对应的ApiService。如果找不到对应的api service，则返回null
+     * @return     ApiService
+     * @author wxz
+     * @date 2021.03.15 20:59
+    */
+    default ApiService trySelectApiService(String platformId) {
+        ThirdplatformDao thirdplatformDao = SpringContextUtils.getBean(ThirdplatformDao.class);
+        ThirdplatformEntity thirdplatform = thirdplatformDao.selectById(platformId);
+
+        if (thirdplatform == null) {
+            return null;
+        }
+        return (ApiService)SpringContextUtils.getBean(thirdplatform.getApiService());
+    }
+
+    /**
+     * @Description 根据platformId查找platform对应的ApiService。如果找不到对应的api service，则抛出RenException异常
+     * @return    ApiService
+     * @author wxz
+     * @date 2021.03.15 21:08
+    */
+    default ApiService selectApiService(String platformId) {
+        ThirdplatformDao thirdplatformDao = SpringContextUtils.getBean(ThirdplatformDao.class);
+        ThirdplatformEntity thirdplatform = thirdplatformDao.selectById(platformId);
+
+        if (thirdplatform == null) {
+            throw new RenException(String.format("ID为%s的第三方平台不存在", platformId));
+        }
+        return (ApiService)SpringContextUtils.getBean(thirdplatform.getApiService());
+    }
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
new file mode 100644
index 0000000000..25d4f6de51
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -0,0 +1,15 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.TPFDemoFormDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 该service用于封装project相关的代码
+ */
+public interface ProjectService {
+
+    String demoAction(TPFDemoFormDTO formDTO);
+
+    void projectAssist(ProjectAssistFormDTO formDTO);
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
new file mode 100644
index 0000000000..fb57663d72
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -0,0 +1,40 @@
+package com.epmet.service.impl;
+
+import com.epmet.apiservice.ApiService;
+import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.service.ApiServiceSelector;
+import com.epmet.service.ProjectService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
+
+    @Override
+    public String demoAction(TPFDemoFormDTO formDTO) {
+        String customerId = formDTO.getCustomerId();
+        String platformId = formDTO.getPlatformId();
+
+        // 注意，此处会如果找不到对应的ApiService会抛出异常
+        ApiService apiService = selectApiService(platformId);
+        apiService.judgeRegistered(customerId, platformId);
+
+        return apiService.demoAction(formDTO);
+    }
+
+    @Override
+    public void projectAssist(ProjectAssistFormDTO formDTO) {
+        String customerId = formDTO.getCustomerId();
+        String platformId = formDTO.getPlatformId();
+
+        // 注意，此处会如果找不到对应的ApiService会抛出异常
+        ApiService apiService = selectApiService(platformId);
+        apiService.judgeRegistered(customerId, platformId);
+
+        System.out.println(apiService);
+
+        ProjectAssistResult projectAssistResult = apiService.projectAssist(formDTO);
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml
new file mode 100644
index 0000000000..03cf514cda
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml
@@ -0,0 +1,19 @@
+<?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.ThirdplatformActionDao">
+
+    <resultMap type="com.epmet.entity.ThirdplatformActionEntity" id="thirdplatformActionMap">
+        <result property="id" column="ID"/>
+        <result property="platformId" column="PLATFORM_ID"/>
+        <result property="actionKey" column="ACTION_KEY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
new file mode 100644
index 0000000000..c8545d01ee
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
@@ -0,0 +1,36 @@
+<?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.ThirdplatformCustomerRegisterDao">
+
+    <resultMap type="com.epmet.entity.ThirdplatformCustomerRegisterEntity" id="thirdplatformCustomerRegisterMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="platformId" column="PLATFORM_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="getByCustomerIdAndPlatformId"
+            resultType="com.epmet.entity.ThirdplatformCustomerRegisterEntity">
+        select tcr.id,
+           customer_id,
+           platform_id,
+           del_flag,
+           revision,
+           created_by,
+           created_time,
+           updated_by,
+           updated_time
+    from thirdplatform_customer_register tcr
+    where CUSTOMER_ID = #{customerId}
+      and PLATFORM_ID = #{platformId}
+      and DEL_FLAG = 0
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
new file mode 100644
index 0000000000..0bc68d7af2
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
@@ -0,0 +1,21 @@
+<?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.ThirdplatformDao">
+
+    <resultMap type="com.epmet.entity.ThirdplatformEntity" id="thirdplatformMap">
+        <result property="id" column="ID"/>
+        <result property="platformName" column="PLATFORM_NAME"/>
+        <result property="platformKey" column="PLATFORM_KEY"/>
+        <result property="platformSecret" column="PLATFORM_SECRET"/>
+        <result property="apiService" column="API_SERVICE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
index 0f4313dfad..f4dec72cac 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
@@ -122,4 +122,13 @@ public interface OperCrmOpenFeignClient {
 	 **/
 	@GetMapping("/oper/crm/customer/getallsubcustomerids/{customerId}")
     Result<List<String>> getAllSubCustomerIds(@PathVariable("customerId") String customerId);
+
+	/**
+	 * @Description 根据客户id列出该客户所有的apiService
+	 * @return
+	 * @author wxz
+	 * @date 2021.03.15 15:13
+	 */
+	@PostMapping("list-apiservice-by-customerid")
+	Result<List<ThirdplatApiserviceResultDTO>> listApiServiceByCustomerId(@RequestBody ApiServiceFormDTO form);
 }
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
index 5de09ce167..134ffcb242 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
@@ -95,4 +95,9 @@ public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient {
 	public Result<List<String>> getAllSubCustomerIds(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getAllSubCustomerIds", customerId);
 	}
+
+	@Override
+	public Result<List<ThirdplatApiserviceResultDTO>> listApiServiceByCustomerId(ApiServiceFormDTO form) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "listApiServiceByCustomerId", form);
+	}
 }
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 c5330a9abd..461c06f3f6 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
@@ -376,4 +376,17 @@ public class CustomerController {
 		}
 		return new Result<>();
 	}
+
+	/**
+	 * @Description 根据客户id列出该客户所有的apiService
+	 * @return
+	 * @author wxz
+	 * @date 2021.03.15 15:13
+	*/
+	@PostMapping("list-apiservice-by-customerid")
+	public Result<List<ThirdplatApiserviceResultDTO>> listApiServiceByCustomerId(@RequestBody ApiServiceFormDTO form) {
+		ValidatorUtils.validateEntity(form, ApiServiceFormDTO.GetByCustomerId.class);
+		String customerId = form.getCustomerId();
+		return new Result<List<ThirdplatApiserviceResultDTO>>().ok(customerThirdplatApiServiceService.listByCustomerId(customerId));
+	}
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerThirdplatApiserviceDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerThirdplatApiserviceDao.java
index 52f05556b1..a879264c54 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerThirdplatApiserviceDao.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerThirdplatApiserviceDao.java
@@ -23,6 +23,8 @@ import com.epmet.entity.CustomerThirdplatApiserviceEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 客户所属的第三方平台的apiService列表
  *
@@ -33,4 +35,12 @@ import org.apache.ibatis.annotations.Param;
 public interface CustomerThirdplatApiserviceDao extends BaseDao<CustomerThirdplatApiserviceEntity> {
 
     ThirdplatApiserviceResultDTO getByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @Description 列出该客户所有的ApiService
+     * @return
+     * @author wxz
+     * @date 2021.03.15 15:07
+    */
+    List<ThirdplatApiserviceResultDTO> listByCustomerId(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
index a1f9fa91e9..eb6adbe6ec 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
@@ -3,6 +3,8 @@ package com.epmet.service;
 import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
 import com.epmet.entity.CustomerThirdplatApiserviceEntity;
 
+import java.util.List;
+
 public interface CustomerThirdplatApiServiceService {
 
     /**
@@ -13,4 +15,11 @@ public interface CustomerThirdplatApiServiceService {
     */
     ThirdplatApiserviceResultDTO getByCustomerId(String customerId);
 
+    /**
+     * 根据客户id列出第三方平台列表
+     * @param customerId
+     * @return
+     */
+    List<ThirdplatApiserviceResultDTO> listByCustomerId(String customerId);
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
index 9cfa19a820..9613f30f60 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
@@ -8,9 +8,12 @@ import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
 import com.epmet.entity.CustomerThirdplatApiserviceEntity;
 import com.epmet.service.CustomerThirdplatApiServiceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -22,6 +25,10 @@ public class CustomerThirdplatApiServiceServiceImpl implements CustomerThirdplat
     @Autowired
     private CustomerThirdplatApiserviceDao thirdplatApiserviceDao;
 
+    @Autowired
+    private RedisTemplate<String, ThirdplatApiserviceResultDTO> tpasRedisTemplate;
+
+
     @Override
     public ThirdplatApiserviceResultDTO getByCustomerId(String customerId) {
         ThirdplatApiserviceResultDTO apiService = null;
@@ -39,4 +46,16 @@ public class CustomerThirdplatApiServiceServiceImpl implements CustomerThirdplat
 
         return apiService;
     }
+
+    @Override
+    public List<ThirdplatApiserviceResultDTO> listByCustomerId(String customerId) {
+        List<ThirdplatApiserviceResultDTO> apiServices = tpasRedisTemplate.opsForList().range(RedisKeys.listCustomerApiServiceListKey(customerId), 0, -1);
+        if (!CollectionUtils.isEmpty(apiServices)) {
+            return apiServices;
+        }
+
+        apiServices = thirdplatApiserviceDao.listByCustomerId(customerId);
+        tpasRedisTemplate.opsForList().rightPushAll(RedisKeys.listCustomerApiServiceListKey(customerId), apiServices);
+        return apiServices;
+    }
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerThirdplatApiserviceDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerThirdplatApiserviceDao.xml
index 8390e5647f..86f93189e2 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerThirdplatApiserviceDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerThirdplatApiserviceDao.xml
@@ -29,5 +29,19 @@
         where cta.CUSTOMER_ID = #{customerId}
     </select>
 
+    <select id="listByCustomerId" resultType="com.epmet.dto.result.ThirdplatApiserviceResultDTO">
+        select id,
+               customer_id,
+               api_service_name,
+               del_flag,
+               revision,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from customer_thirdplat_apiservice cta
+        where cta.CUSTOMER_ID = #{customerId}
+    </select>
+
 
 </mapper>
\ No newline at end of file

From cb6c0078ac0c314797d567125b593d0743dc3a94 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 16 Mar 2021 15:44:26 +0800
Subject: [PATCH 02/51] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=B9=B3=E5=8F=B0=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B3=E5=8F=B0=E4=B8=8D=E9=80=9A=EF=BC=8C=E5=BE=85?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   2 +-
 .../epmet/commons/tools/redis/RedisKeys.java  |   9 ++
 .../epmet/constant/ThirdPlatformActions.java  |  13 ++
 .../java/com/epmet/apiservice/ApiService.java | 123 ++++++++++++++++++
 .../impl/LuzhouGridPlatformApiService.java    |  11 +-
 .../com/epmet/dao/ThirdplatformActionDao.java |  10 +-
 .../entity/ThirdplatformActionEntity.java     |   1 +
 .../com/epmet/entity/ThirdplatformEntity.java |   5 +
 .../mapper/ThirdplatformActionDao.xml         |  17 +++
 9 files changed, 188 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java

diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml
index bfea2783f9..5a36af7c15 100644
--- a/epmet-cloud-generator/src/main/resources/application.yml
+++ b/epmet-cloud-generator/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     #MySQL配置
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.1.130:3306/epmet_gov_project?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.1.130:3306/epmet_third?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: epmet_dba
     password: EpmEt-dbA-UsEr
     #oracle配置
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 220d621195..3a2e5b0fa9 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -379,4 +379,13 @@ public class RedisKeys {
 	public static String listCustomerApiServiceListKey(String customerId) {
 		return rootPrefix.concat("customer:thirdplat:apiservicelist:").concat(customerId);
 	}
+
+	/**
+	 * 查询第三方平台access token
+	 * @param platformId
+	 * @return
+	 */
+	public static String getThirdPlatformAccessTokenKey(String platformId) {
+		return rootPrefix.concat("thirdplatform:accesstoken:").concat(platformId);
+	}
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java
new file mode 100644
index 0000000000..43390a2e14
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java
@@ -0,0 +1,13 @@
+package com.epmet.constant;
+
+/**
+ * 第三方平台动作常量
+ */
+public interface ThirdPlatformActions {
+
+    // 获取accessToken
+    String GET_ACCESS_TOKEN = "GET_ACCESS_TOKEN";
+    // 项目协助
+    String PROJECT_ASSIST = "PROJECT_ASSIST";
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index da169d165a..c0326a98a5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -2,11 +2,26 @@ package com.epmet.apiservice;
 
 import com.epmet.apiservice.result.ProjectAssistResult;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.constant.ThirdPlatformActions;
+import com.epmet.dao.PaUserDao;
+import com.epmet.dao.ThirdplatformActionDao;
 import com.epmet.dao.ThirdplatformCustomerRegisterDao;
+import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.form.ProjectAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
+import com.epmet.entity.ThirdplatformEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpMethod;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * ApiService，对接第三方平台的抽象类
@@ -29,6 +44,114 @@ public abstract class ApiService {
         return true;
     }
 
+    /**
+     * 发送get请求。目前仅支持GET/POST
+     * @param platformId
+     * @param action
+     * @param params
+     * @param headers
+     * @return
+     */
+    public String sendGetRequest(String platformId, String action, Map<String, Object> params, Map<String, Object> headers) {
+        // 1.获取token
+        String accessToken = getAccessToken(platformId);
+        //2.获取url
+        ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
+        ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
+                .getByPlatformIdAndActionKey(platformId, action);
+
+        if (headers == null) {
+            headers = new HashMap<>();
+        }
+
+        // 填充access token到头当中
+        headers.put("X-Access-Token", accessToken);
+
+        Result<String> result = HttpClientManager.getInstance().sendGet(thirdplatform.getBaseUrl().concat(actionEntity.getApiUrl()),
+                    thirdplatform.getBaseUrl().startsWith("https://"),
+                    params,
+                    headers);
+
+        if (result == null) {
+            throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
+        }
+        if (result.success()) {
+            throw new RenException("请求第三方平台，获取AccessToken失败。");
+        }
+        return result.getData();
+    }
+
+    /**
+     * 发送post请求
+     * @param platformId
+     * @param action
+     * @param jsonString
+     * @param headers
+     * @return
+     */
+    public String sendPostRequest(String platformId, String action, String jsonString, Map<String, Object> headers) {
+        // 1.获取token
+        String accessToken = getAccessToken(platformId);
+        //2.获取url
+        ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
+        ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
+                .getByPlatformIdAndActionKey(platformId, action);
+
+        if (headers == null) {
+            headers = new HashMap<>();
+        }
+
+        // 填充access token到头当中
+        headers.put("X-Access-Token", accessToken);
+
+        Result<String> result = HttpClientManager.getInstance().sendPost(thirdplatform.getBaseUrl().concat(actionEntity.getApiUrl()),
+                thirdplatform.getBaseUrl().startsWith("https://"),
+                jsonString,
+                headers);
+
+        if (result == null) {
+            throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
+        }
+        if (result.success()) {
+            throw new RenException("请求第三方平台，获取AccessToken失败。");
+        }
+        return result.getData();
+    }
+
+    /**
+     * @Description 获取accessToken
+     * @return
+     * @author wxz
+     * @date 2021.03.16 13:45
+    */
+    private String getAccessToken(String platformId) {
+        RedisTemplate<String, String> rt = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
+        String token = rt.opsForValue().get(RedisKeys.getThirdPlatformAccessTokenKey(platformId));
+        if (StringUtils.isBlank(token)) {
+            ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
+            ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
+                    .getByPlatformIdAndActionKey(platformId, ThirdPlatformActions.GET_ACCESS_TOKEN);
+
+            String baseUrl = thirdplatform.getBaseUrl();
+            String platformKey = thirdplatform.getPlatformKey();
+            String platformSecret = thirdplatform.getPlatformSecret();
+
+            HashMap<String, Object> params = new HashMap<>();
+            params.put("appKey", platformKey);
+            params.put("appSecret", platformSecret);
+            Result<String> result = HttpClientManager.getInstance().sendGet(baseUrl.concat(actionEntity.getApiUrl()), params);
+            if (result == null) {
+                throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
+            }
+            if (result.success()) {
+                throw new RenException("请求第三方平台，获取AccessToken失败。");
+            }
+            token = result.getData();
+            rt.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), token);
+        }
+        return token;
+    }
+
     /**
      * @Description 判断客户是否注册了指定的平台，如果没有注册，则抛出异常
      * @return
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 4081bfad61..646ce55af9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -1,8 +1,11 @@
 package com.epmet.apiservice.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dto.form.ProjectAssistFormDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 /**
@@ -13,7 +16,13 @@ public class LuzhouGridPlatformApiService extends ApiService {
 
     @Override
     public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+        String platformId = formDTO.getPlatformId();
+        String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
+        ProjectAssistResult projectAssistResult = null;
+        if (!StringUtils.isBlank(result)) {
+            projectAssistResult = JSON.parseObject(result, ProjectAssistResult.class);
+        }
         System.out.println("泸州网格化平台项目协助发送成功");
-        return null;
+        return projectAssistResult;
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java
index 9b309c15fc..50de9d3629 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformActionDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ThirdplatformActionEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 
@@ -29,5 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ThirdplatformActionDao extends BaseDao<ThirdplatformActionEntity> {
-	
+
+    /**
+     * @Description 根据平台id和action操作查询
+     * @return
+     * @author wxz
+     * @date 2021.03.16 13:35
+    */
+    ThirdplatformActionEntity getByPlatformIdAndActionKey(@Param("platformId") String platformId, @Param("action") String action);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
index 88c7a8cd2f..97283b9c05 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
@@ -47,5 +47,6 @@ public class ThirdplatformActionEntity extends BaseEpmetEntity {
      * 
      */
 	private String actionKey;
+	private String apiUrl;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
index 4fede6dcdf..d756c81b88 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
@@ -58,4 +58,9 @@ public class ThirdplatformEntity extends BaseEpmetEntity {
 	 */
 	private String apiService;
 
+	/**
+	 * 基础url
+	 */
+	private String baseUrl;
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml
index 03cf514cda..39de22dca5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformActionDao.xml
@@ -7,6 +7,7 @@
         <result property="id" column="ID"/>
         <result property="platformId" column="PLATFORM_ID"/>
         <result property="actionKey" column="ACTION_KEY"/>
+        <result property="apiUrl" column="API_URL"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -15,5 +16,21 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getByPlatformIdAndActionKey" resultType="com.epmet.entity.ThirdplatformActionEntity">
+        select id,
+               platform_id,
+               action_key,
+               api_url,
+               del_flag,
+               revision,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from thirdplatform_action ta
+        where ta.PLATFORM_ID = #{platformId}
+          and ACTION_KEY = #{action}
+    </select>
+
 
 </mapper>
\ No newline at end of file

From 47a41ed1fc1b91f792f0c81655cd06612eb3e52d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 16 Mar 2021 16:47:32 +0800
Subject: [PATCH 03/51] =?UTF-8?q?controller=E5=91=BD=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rmDTO.java => ProjectApplyAssistFormDTO.java} |  2 +-
 .../java/com/epmet/apiservice/ApiService.java    |  6 ++----
 .../epmet/apiservice/impl/DemoApiService.java    |  7 ++-----
 .../impl/LuzhouGridPlatformApiService.java       |  4 ++--
 ...BizController.java => ProjectController.java} | 16 +++++++---------
 .../java/com/epmet/service/ProjectService.java   |  5 ++---
 .../epmet/service/impl/ProjectServiceImpl.java   |  8 ++++----
 7 files changed, 20 insertions(+), 28 deletions(-)
 rename epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/{ProjectAssistFormDTO.java => ProjectApplyAssistFormDTO.java} (84%)
 rename epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/{BizController.java => ProjectController.java} (79%)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java
similarity index 84%
rename from epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java
rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java
index 543524f1b1..bbbe9d17c5 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java
@@ -5,7 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 @Data
-public class ProjectAssistFormDTO {
+public class ProjectApplyAssistFormDTO {
 
     private String customerId;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index c0326a98a5..4c581a916d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -7,18 +7,16 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.ThirdPlatformActions;
-import com.epmet.dao.PaUserDao;
 import com.epmet.dao.ThirdplatformActionDao;
 import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.entity.ThirdplatformEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpMethod;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -180,7 +178,7 @@ public abstract class ApiService {
      * @author wxz
      * @date 2021.03.16 09:28
     */
-    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+    public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         return null;
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
index 6c1aca3917..9dcc3854c5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
@@ -2,10 +2,7 @@ package com.epmet.apiservice.impl;
 
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.constant.ApiServiceActions;
-import com.epmet.dto.form.ProjectAssistFormDTO;
-import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,7 +21,7 @@ public class DemoApiService extends ApiService {
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
     @Override
-    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+    public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         logger.info("DemoApiService发送项目协助到第三方平台成功");
         return null;
     }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 646ce55af9..8ff454f60d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
 import com.epmet.constant.ThirdPlatformActions;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 public class LuzhouGridPlatformApiService extends ApiService {
 
     @Override
-    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+    public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String platformId = formDTO.getPlatformId();
         String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
         ProjectAssistResult projectAssistResult = null;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
similarity index 79%
rename from epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java
rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index ed83a196bf..af4d756ca2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -2,7 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,16 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.lang.management.MemoryManagerMXBean;
-
 /**
- * 对接第三方平台业务相关的controller
+ * 对接第三方平台业务Project相关的controller
  * 我们系统当中每一个需要发送到第三方平台的操作，只对应这里的一个方法，根据参数传入platformId，内部根据配置获取指定的APiService进行具体平台的调用
  * 每一个平台都有自己的ApiSerivce
  */
 @RestController
-@RequestMapping("biz")
-public class BizController {
+@RequestMapping("project")
+public class ProjectController {
 
     @Autowired
     private ProjectService projectService;
@@ -39,13 +37,13 @@ public class BizController {
     }
 
     /**
-     * @Description 发送项目协同处理方法
+     * @Description 请求项目协助
      * @return
      * @author wxz
      * @date 2021.03.15 21:13
     */
-    @PostMapping("project-assist")
-    public Result projectAssist(@RequestBody ProjectAssistFormDTO formDTO) {
+    @PostMapping("apply-assist")
+    public Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         projectService.projectAssist(formDTO);
         return new Result();
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
index 25d4f6de51..c190dc71ae 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -1,8 +1,7 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
-import org.springframework.stereotype.Service;
 
 /**
  * 该service用于封装project相关的代码
@@ -11,5 +10,5 @@ public interface ProjectService {
 
     String demoAction(TPFDemoFormDTO formDTO);
 
-    void projectAssist(ProjectAssistFormDTO formDTO);
+    void projectAssist(ProjectApplyAssistFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index fb57663d72..91ebd234c3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -2,8 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.service.ApiServiceSelector;
 import com.epmet.service.ProjectService;
@@ -25,12 +24,13 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
     }
 
     @Override
-    public void projectAssist(ProjectAssistFormDTO formDTO) {
+    public void projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String customerId = formDTO.getCustomerId();
         String platformId = formDTO.getPlatformId();
 
-        // 注意，此处会如果找不到对应的ApiService会抛出异常
+        // 根据平台ID找到注意，此处会如果找不到对应的ApiService会抛出异常
         ApiService apiService = selectApiService(platformId);
+        // 判断该客户是否注册了该平台，如果没有的话，抛出异常
         apiService.judgeRegistered(customerId, platformId);
 
         System.out.println(apiService);

From 5d5f16364864c99dba180ee84379ad4eb3d06943 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 16 Mar 2021 17:10:46 +0800
Subject: [PATCH 04/51] =?UTF-8?q?=E5=91=BD=E5=90=8D=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/apiservice/ApiService.java      | 5 +++--
 .../epmet/apiservice/impl/LuzhouGridPlatformApiService.java | 5 ++++-
 .../main/java/com/epmet/controller/ProjectController.java   | 2 +-
 .../src/main/java/com/epmet/service/ProjectService.java     | 6 +++++-
 .../java/com/epmet/service/impl/ProjectServiceImpl.java     | 4 +---
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 4c581a916d..0a6ac8de63 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -22,8 +22,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * ApiService，对接第三方平台的抽象类
- * 每一个具体平台的ApiService都是该抽象类的子类，选择性实现抽象类中的某些方法，提供具体业务逻辑
+ * ApiService，对接第三方平台的抽象类。每一个子类都对应一个第三方平台，每个第三方平台都实现唯一一个子类
+ * 每一个具体平台的ApiService都是该抽象类的子类，选择性实现抽象类中的某些需要实现方法，提供具体业务逻辑
+ * 此抽象类中定义方法的具体返回类型，所有子类都要统一使用，在具体实现中做转换。若是不需要返回，返回null即可。
  */
 public abstract class ApiService {
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 8ff454f60d..433deb8f7a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -20,7 +20,10 @@ public class LuzhouGridPlatformApiService extends ApiService {
         String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
         ProjectAssistResult projectAssistResult = null;
         if (!StringUtils.isBlank(result)) {
-            projectAssistResult = JSON.parseObject(result, ProjectAssistResult.class);
+            // 此处要经过一系列业务处理，将第三方平台返回的数据进行解析，等处理最后转换成ProjectAssistResult类型，返回。ProjectAssistResult这个类型是
+            // 所有apiService的projectAssist方法返回值的统一类型，是我们的epmet-cloud所需要的数据的实体，
+            // 所有apiService都要想办法转化成这个类型。
+            //projectAssistResult = JSON.parseObject(result, ProjectAssistResult.class);
         }
         System.out.println("泸州网格化平台项目协助发送成功");
         return projectAssistResult;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index af4d756ca2..746205b85c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -45,7 +45,7 @@ public class ProjectController {
     @PostMapping("apply-assist")
     public Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        projectService.projectAssist(formDTO);
+        projectService.applyAssist(formDTO);
         return new Result();
     }
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
index c190dc71ae..9ac4b55558 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -10,5 +10,9 @@ public interface ProjectService {
 
     String demoAction(TPFDemoFormDTO formDTO);
 
-    void projectAssist(ProjectApplyAssistFormDTO formDTO);
+    /**
+     *
+     * @param formDTO
+     */
+    void applyAssist(ProjectApplyAssistFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 91ebd234c3..4401c6fba2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -24,7 +24,7 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
     }
 
     @Override
-    public void projectAssist(ProjectApplyAssistFormDTO formDTO) {
+    public void applyAssist(ProjectApplyAssistFormDTO formDTO) {
         String customerId = formDTO.getCustomerId();
         String platformId = formDTO.getPlatformId();
 
@@ -33,8 +33,6 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
         // 判断该客户是否注册了该平台，如果没有的话，抛出异常
         apiService.judgeRegistered(customerId, platformId);
 
-        System.out.println(apiService);
-
         ProjectAssistResult projectAssistResult = apiService.projectAssist(formDTO);
     }
 }

From 440472f1ec77aeab4034eae923d23eeb0180f630 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 17 Mar 2021 10:53:07 +0800
Subject: [PATCH 05/51] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ThirdPlatformFormDTO.java  | 19 ++++++++
 ...hirdplatformCustomerRegisterResultDTO.java | 18 ++++++++
 .../impl/LuzhouGridPlatformApiService.java    | 15 +++++--
 .../LZGridPlatformProjectAssistResult.java    |  9 ++++
 .../result/ProjectAssistResult.java           |  5 +++
 .../epmet/controller/ProjectController.java   |  5 ++-
 .../controller/ThirdPlatformController.java   | 43 +++++++++++++++++++
 .../dao/ThirdplatformCustomerRegisterDao.java | 10 +++++
 .../com/epmet/service/ProjectService.java     |  3 +-
 .../epmet/service/ThirdPlatformService.java   | 11 +++++
 .../service/impl/ProjectServiceImpl.java      |  4 +-
 .../impl/ThirdPlatformServiceImpl.java        | 21 +++++++++
 .../ThirdplatformCustomerRegisterDao.xml      | 22 ++++++++++
 13 files changed, 177 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
new file mode 100644
index 0000000000..3f488e75c1
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ThirdPlatformFormDTO {
+
+    // 列出注册关系分组
+    public static interface ListRegRelsGroups {}
+
+    @NotBlank(message = "客户ID不能为空", groups = { ListRegRelsGroups.class })
+    private String customerId;
+
+    @NotBlank(message = "客户ID不能为空", groups = { ListRegRelsGroups.class })
+    private String actionKey;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java
new file mode 100644
index 0000000000..d637837fbc
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+@Data
+public class ThirdplatformCustomerRegisterResultDTO {
+    /**
+     *
+     */
+    private String customerId;
+
+    /**
+     *
+     */
+    private String platformId;
+
+    private String platformName;
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 433deb8f7a..b38a3e6758 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -2,6 +2,7 @@ package com.epmet.apiservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
+import com.epmet.apiservice.result.LZGridPlatformProjectAssistResult;
 import com.epmet.apiservice.result.ProjectAssistResult;
 import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
@@ -17,13 +18,21 @@ public class LuzhouGridPlatformApiService extends ApiService {
     @Override
     public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String platformId = formDTO.getPlatformId();
-        String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
-        ProjectAssistResult projectAssistResult = null;
+
+        // 正式调用第三方平台
+        //String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
+
+        // 开发阶段临时写死
+        String result = "{\"eventId\":\"test-task-id\"}";
+        ProjectAssistResult projectAssistResult = new ProjectAssistResult();
         if (!StringUtils.isBlank(result)) {
             // 此处要经过一系列业务处理，将第三方平台返回的数据进行解析，等处理最后转换成ProjectAssistResult类型，返回。ProjectAssistResult这个类型是
             // 所有apiService的projectAssist方法返回值的统一类型，是我们的epmet-cloud所需要的数据的实体，
             // 所有apiService都要想办法转化成这个类型。
-            //projectAssistResult = JSON.parseObject(result, ProjectAssistResult.class);
+            LZGridPlatformProjectAssistResult lzResult = JSON.parseObject(result, LZGridPlatformProjectAssistResult.class);
+
+            // 此处设置为第三方系统返回的唯一id
+            projectAssistResult.setTaskId(lzResult.getEventId());
         }
         System.out.println("泸州网格化平台项目协助发送成功");
         return projectAssistResult;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java
index ef74410885..1ffd372576 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformProjectAssistResult.java
@@ -1,4 +1,13 @@
 package com.epmet.apiservice.result;
 
+import lombok.Data;
+
+@Data
 public class LZGridPlatformProjectAssistResult {
+
+    /**
+     * 事件id
+     */
+    private String eventId;
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
index 2da96d1e17..de992bdd0f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
@@ -5,4 +5,9 @@ import lombok.Data;
 @Data
 public class ProjectAssistResult {
 
+    /**
+     * 任务id
+     */
+    private String taskId;
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index 746205b85c..3899ed9fda 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.apiservice.result.ProjectAssistResult;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
@@ -45,8 +46,8 @@ public class ProjectController {
     @PostMapping("apply-assist")
     public Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        projectService.applyAssist(formDTO);
-        return new Result();
+        ProjectAssistResult projectAssistResult = projectService.applyAssist(formDTO);
+        return new Result().ok(projectAssistResult);
     }
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
new file mode 100644
index 0000000000..64c7f0e7f0
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -0,0 +1,43 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+import com.epmet.service.ThirdPlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 第三方平台维护相关api
+ */
+@RestController
+@RequestMapping("thirdplatform")
+public class ThirdPlatformController {
+
+
+    @Autowired
+    private ThirdPlatformService thirdPlatformService;
+
+    /**
+     * 列出第三方平台注册关系
+     * @param input
+     * @return
+     */
+    @PostMapping("list-reg-rels")
+    public Result<List<ThirdplatformCustomerRegisterResultDTO>> listRegsteredPlatforms(@RequestBody ThirdPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input);
+        List<ThirdplatformCustomerRegisterResultDTO> platformRegs = thirdPlatformService.listByCustomerId(input.getCustomerId(), input.getActionKey());
+        return new Result<List<ThirdplatformCustomerRegisterResultDTO>>().ok(platformRegs);
+    }
+
+    //@PostMapping("register")
+
+
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
index e3a39cbbe2..b5ffe5cf82 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
@@ -19,10 +19,13 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.constant.ThirdPlatformConstant;
+import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 
  *
@@ -32,5 +35,12 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface ThirdplatformCustomerRegisterDao extends BaseDao<ThirdplatformCustomerRegisterEntity> {
 
+    /**
+     * 动态sql查询
+     * @param customerId
+     * @return
+     */
+    List<ThirdplatformCustomerRegisterResultDTO> listDTOS(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
+
     ThirdplatformCustomerRegisterEntity getByCustomerIdAndPlatformId(@Param("customerId") String customerId, @Param("platformId") String platformId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
index 9ac4b55558..1e9d75fdc1 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.apiservice.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 
@@ -14,5 +15,5 @@ public interface ProjectService {
      *
      * @param formDTO
      */
-    void applyAssist(ProjectApplyAssistFormDTO formDTO);
+    ProjectAssistResult applyAssist(ProjectApplyAssistFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
new file mode 100644
index 0000000000..74b4cab44f
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -0,0 +1,11 @@
+package com.epmet.service;
+
+import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+
+import java.util.List;
+
+public interface ThirdPlatformService {
+
+    List<ThirdplatformCustomerRegisterResultDTO> listByCustomerId(String customerId, String actionKey);
+
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 4401c6fba2..f652f6b995 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -24,7 +24,7 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
     }
 
     @Override
-    public void applyAssist(ProjectApplyAssistFormDTO formDTO) {
+    public ProjectAssistResult applyAssist(ProjectApplyAssistFormDTO formDTO) {
         String customerId = formDTO.getCustomerId();
         String platformId = formDTO.getPlatformId();
 
@@ -33,6 +33,6 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
         // 判断该客户是否注册了该平台，如果没有的话，抛出异常
         apiService.judgeRegistered(customerId, platformId);
 
-        ProjectAssistResult projectAssistResult = apiService.projectAssist(formDTO);
+        return apiService.projectAssist(formDTO);
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
new file mode 100644
index 0000000000..40556ebaca
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -0,0 +1,21 @@
+package com.epmet.service.impl;
+
+import com.epmet.dao.ThirdplatformCustomerRegisterDao;
+import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+import com.epmet.service.ThirdPlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ThirdPlatformServiceImpl implements ThirdPlatformService {
+
+    @Autowired
+    private ThirdplatformCustomerRegisterDao thirdplatformCustomerRegisterDao;
+
+    @Override
+    public List<ThirdplatformCustomerRegisterResultDTO> listByCustomerId(String customerId, String actionKey) {
+        return thirdplatformCustomerRegisterDao.listDTOS(customerId, actionKey);
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
index c8545d01ee..10edc458e3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
@@ -32,5 +32,27 @@
       and DEL_FLAG = 0
     </select>
 
+    <select id="listDTOS" resultType="com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO">
+        select tcr.id,
+               tcr.customer_id,
+               tcr.platform_id,
+               tpf.PLATFORM_NAME,
+               tcr.del_flag,
+               tcr.revision,
+               tcr.created_by,
+               tcr.created_time,
+               tcr.updated_by,
+               tcr.updated_time
+        from thirdplatform_customer_register tcr
+                 inner join thirdplatform tpf on (tcr.PLATFORM_ID = tpf.ID)
+                inner join thirdplatform_action ta on (tpf.ID = ta.PLATFORM_ID)
+        <where>
+         tcr.CUSTOMER_ID = #{customerId}
+            and ta.ACTION_KEY = #{actionKey}
+            and tcr.DEL_FLAG = 0
+            and tpf.DEL_FLAG = 0
+        </where>
+    </select>
+
 
 </mapper>
\ No newline at end of file

From f1fc9d552b205a6a0dd661835217085ea6928518 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 17 Mar 2021 16:31:01 +0800
Subject: [PATCH 06/51] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AE=A2=E6=88=B7-?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=92=8C=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/ProjectSubAttachmentDTO.java    | 126 ++++++++++++++++
 .../com/epmet/dto/ProjectSubProcessDTO.java   | 136 ++++++++++++++++++
 .../com/epmet/dto/form/SendToFormDTO.java     |  49 +++++++
 .../dto/result/ProcessListV2ResultDTO.java    |   5 +
 .../dto/result/ProjectDetailResultDTO.java    |   4 +
 .../com/epmet/dto/result/SubProcessDTO.java   |  40 ++++++
 .../ProjectSubAttachmentController.java       |  85 +++++++++++
 .../ProjectSubProcessController.java          |  85 +++++++++++
 .../controller/ProjectTraceController.java    |  16 +++
 .../epmet/dao/ProjectSubAttachmentDao.java    |  33 +++++
 .../com/epmet/dao/ProjectSubProcessDao.java   |  33 +++++
 .../entity/ProjectSubAttachmentEntity.java    |  96 +++++++++++++
 .../epmet/entity/ProjectSubProcessEntity.java | 106 ++++++++++++++
 .../service/ProjectSubAttachmentService.java  |  95 ++++++++++++
 .../service/ProjectSubProcessService.java     |  95 ++++++++++++
 .../epmet/service/ProjectTraceService.java    |  10 ++
 .../service/impl/ProjectServiceImpl.java      |   3 +
 .../impl/ProjectSubAttachmentServiceImpl.java | 100 +++++++++++++
 .../impl/ProjectSubProcessServiceImpl.java    | 100 +++++++++++++
 .../service/impl/ProjectTraceServiceImpl.java |  14 ++
 .../mapper/ProjectSubAttachmentDao.xml        |  28 ++++
 .../resources/mapper/ProjectSubProcessDao.xml |  30 ++++
 22 files changed, 1289 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubAttachmentController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubProcessController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubAttachmentDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubAttachmentService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubAttachmentServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubAttachmentDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java
new file mode 100644
index 0000000000..e966d0f026
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java
@@ -0,0 +1,126 @@
+/**
+ * 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 2021-03-17
+ */
+@Data
+public class ProjectSubAttachmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 子节点ID
+     */
+	private String subId;
+
+    /**
+     * 事件ID
+     */
+	private String taskId;
+
+    /**
+     * 附件名
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小 单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式
+     */
+	private String attachmentFormat;
+
+    /**
+     * 类型
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
new file mode 100644
index 0000000000..5edffc797a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
@@ -0,0 +1,136 @@
+/**
+ * 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 2021-03-17
+ */
+@Data
+public class ProjectSubProcessDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 节点ID
+     */
+	private String processId;
+
+    /**
+     * 项目人员关联表ID
+     */
+	private String staffId;
+
+    /**
+     * 系统ID
+     */
+	private String platformId;
+
+    /**
+     * 系统名
+     */
+	private String platformName;
+
+    /**
+     * 第三方平台返回的项目关联ID（事件Id）
+     */
+	private String taskId;
+
+    /**
+     * 事件处理详细内容
+     */
+	private String result;
+
+    /**
+     * 外部状态:1待处理,2待核实,3已上报,4已完结,5处理中,6待分发,7归档,8催办,9超时
+     */
+	private String externalStatus;
+
+    /**
+     * 外部状态描述
+     */
+	private String externalStatusDesc;
+
+    /**
+     * 内部状态:待处理 pending，结案closed
+     */
+	private String internalStatus;
+
+    /**
+     * 处理日期
+     */
+	private Date handleDate;
+
+    /**
+     * 处理人姓名
+     */
+	private String handleUserName;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java
new file mode 100644
index 0000000000..4060fc2c43
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java
@@ -0,0 +1,49 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/17 14:31
+ */
+@Data
+public class SendToFormDTO implements Serializable {
+	private static final long serialVersionUID = -2556534032778491105L;
+	@NotBlank(message = "项目Id不能为空")
+	private String projectId;
+
+	@NotBlank(message = "项目人员关联Id不能为空")
+	private String projectStaffId;
+
+	@Length(max=1000,message = "公开答复内容不能超过1000位")
+	private String publicReply;
+
+	@NotBlank(message = "内部备注不能为空")
+	@Length(max=1000,message = "内部备注不能超过1000位")
+	private String internalRemark;
+
+	@NotBlank(message = "外部系统ID不能为空")
+	private String platformId;
+
+	@NotBlank(message = "外部系统名不能为空")
+	private String platformName;
+
+	@Valid
+	private List<TickStaffFormDTO> staffList;
+
+	/**
+	 * 公开答复对应文件集合
+	 */
+	private List<FileDTO> publicFile;
+	/**
+	 * 内部备注对应文件集合
+	 */
+	private List<FileDTO> internalFile;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java
index 1e7460c5ad..2f3da4a57f 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java
@@ -13,6 +13,7 @@ import java.util.List;
 @Data
 public class ProcessListV2ResultDTO implements Serializable {
 
+    private static final long serialVersionUID = 5762152044573235897L;
     /**
      * 项目ID
      */
@@ -47,6 +48,10 @@ public class ProcessListV2ResultDTO implements Serializable {
      * 内部备注
      */
     private String internalRemark;
+    /**
+     * 子节点
+     */
+    private List<SubProcessDTO> subProcess;
 
     /**
      *
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 7f309667f0..71bf83682a 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
@@ -60,6 +60,10 @@ public class ProjectDetailResultDTO implements Serializable {
 	 * 当前跟进部门
 	 */
 	private List<DepartmentNameListBean> departmentList;
+	/**
+	 * 是否能发送到外部系统
+	 */
+	private Boolean isSend;
 
 	@NoArgsConstructor
 	@Data
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
new file mode 100644
index 0000000000..9a2c3406f7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/17 14:45
+ */
+@Data
+public class SubProcessDTO implements Serializable {
+	private static final long serialVersionUID = -3292921180067385861L;
+	/**
+	 * 外部平台名
+	 */
+	private String platformName;
+	/**
+	 * 处理状态
+	 */
+	private String externalStatus;
+	/**
+	 * 处理时间
+	 */
+	private String processTime;
+	/**
+	 * 处理人
+	 */
+	private String handleUserName;
+	/**
+	 * 处理内容
+	 */
+	private String result;
+	private List<PublicAndInternalFileResultDTO> subFile;
+
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubAttachmentController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubAttachmentController.java
new file mode 100644
index 0000000000..cf760dab22
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubAttachmentController.java
@@ -0,0 +1,85 @@
+/**
+ * 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.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.ProjectSubAttachmentDTO;
+import com.epmet.service.ProjectSubAttachmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 外部系统事件附件 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-17
+ */
+@RestController
+@RequestMapping("projectsubattachment")
+public class ProjectSubAttachmentController {
+    
+    @Autowired
+    private ProjectSubAttachmentService projectSubAttachmentService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectSubAttachmentDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectSubAttachmentDTO> page = projectSubAttachmentService.page(params);
+        return new Result<PageData<ProjectSubAttachmentDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectSubAttachmentDTO> get(@PathVariable("id") String id){
+        ProjectSubAttachmentDTO data = projectSubAttachmentService.get(id);
+        return new Result<ProjectSubAttachmentDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectSubAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectSubAttachmentService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectSubAttachmentDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectSubAttachmentService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectSubAttachmentService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubProcessController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubProcessController.java
new file mode 100644
index 0000000000..f91488f983
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSubProcessController.java
@@ -0,0 +1,85 @@
+/**
+ * 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.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.ProjectSubProcessDTO;
+import com.epmet.service.ProjectSubProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 节点事件关联表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-17
+ */
+@RestController
+@RequestMapping("projectsubprocess")
+public class ProjectSubProcessController {
+    
+    @Autowired
+    private ProjectSubProcessService projectSubProcessService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectSubProcessDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectSubProcessDTO> page = projectSubProcessService.page(params);
+        return new Result<PageData<ProjectSubProcessDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectSubProcessDTO> get(@PathVariable("id") String id){
+        ProjectSubProcessDTO data = projectSubProcessService.get(id);
+        return new Result<ProjectSubProcessDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectSubProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectSubProcessService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectSubProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectSubProcessService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectSubProcessService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index db5d13ab24..c7d3a8c09a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -319,5 +319,21 @@ public class ProjectTraceController {
 		return new Result();
 	}
 
+	/**
+	 * 发送到外部平台
+	 * @author zhaoqifeng
+	 * @date 2021/3/17 14:34
+	 * @param tokenDTO
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("sendto")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_TRANSFER)
+	public Result sendTo(@LoginUser TokenDto tokenDTO, @RequestBody SendToFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		projectTraceService.sendTo(tokenDTO, formDTO);
+		return new Result();
+	}
+
 }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubAttachmentDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubAttachmentDao.java
new file mode 100644
index 0000000000..58b5a192c8
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubAttachmentDao.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.ProjectSubAttachmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 外部系统事件附件 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-17
+ */
+@Mapper
+public interface ProjectSubAttachmentDao extends BaseDao<ProjectSubAttachmentEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
new file mode 100644
index 0000000000..0d36cd36c3
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.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.ProjectSubProcessEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 节点事件关联表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-17
+ */
+@Mapper
+public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java
new file mode 100644
index 0000000000..f0f0ac20ba
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java
@@ -0,0 +1,96 @@
+/**
+ * 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 2021-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_sub_attachment")
+public class ProjectSubAttachmentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 子节点ID
+     */
+	private String subId;
+
+    /**
+     * 事件ID
+     */
+	private String taskId;
+
+    /**
+     * 附件名
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小 单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式
+     */
+	private String attachmentFormat;
+
+    /**
+     * 类型
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
new file mode 100644
index 0000000000..ee451e6416
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
@@ -0,0 +1,106 @@
+/**
+ * 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 2021-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_sub_process")
+public class ProjectSubProcessEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 节点ID
+     */
+	private String processId;
+
+    /**
+     * 项目人员关联表ID
+     */
+	private String staffId;
+
+    /**
+     * 系统ID
+     */
+	private String platformId;
+
+    /**
+     * 系统名
+     */
+	private String platformName;
+
+    /**
+     * 第三方平台返回的项目关联ID（事件Id）
+     */
+	private String taskId;
+
+    /**
+     * 事件处理详细内容
+     */
+	private String result;
+
+    /**
+     * 外部状态:1待处理,2待核实,3已上报,4已完结,5处理中,6待分发,7归档,8催办,9超时
+     */
+	private String externalStatus;
+
+    /**
+     * 外部状态描述
+     */
+	private String externalStatusDesc;
+
+    /**
+     * 内部状态:待处理 pending，结案closed
+     */
+	private String internalStatus;
+
+    /**
+     * 处理日期
+     */
+	private Date handleDate;
+
+    /**
+     * 处理人姓名
+     */
+	private String handleUserName;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubAttachmentService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubAttachmentService.java
new file mode 100644
index 0000000000..94ee34d06f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubAttachmentService.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.ProjectSubAttachmentDTO;
+import com.epmet.entity.ProjectSubAttachmentEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 外部系统事件附件 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-17
+ */
+public interface ProjectSubAttachmentService extends BaseService<ProjectSubAttachmentEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectSubAttachmentDTO>
+     * @author generator
+     * @date 2021-03-17
+     */
+    PageData<ProjectSubAttachmentDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectSubAttachmentDTO>
+     * @author generator
+     * @date 2021-03-17
+     */
+    List<ProjectSubAttachmentDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectSubAttachmentDTO
+     * @author generator
+     * @date 2021-03-17
+     */
+    ProjectSubAttachmentDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-03-17
+     */
+    void save(ProjectSubAttachmentDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-03-17
+     */
+    void update(ProjectSubAttachmentDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-03-17
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
new file mode 100644
index 0000000000..c329a3aa95
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.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.ProjectSubProcessDTO;
+import com.epmet.entity.ProjectSubProcessEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 节点事件关联表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-17
+ */
+public interface ProjectSubProcessService extends BaseService<ProjectSubProcessEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectSubProcessDTO>
+     * @author generator
+     * @date 2021-03-17
+     */
+    PageData<ProjectSubProcessDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectSubProcessDTO>
+     * @author generator
+     * @date 2021-03-17
+     */
+    List<ProjectSubProcessDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectSubProcessDTO
+     * @author generator
+     * @date 2021-03-17
+     */
+    ProjectSubProcessDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-03-17
+     */
+    void save(ProjectSubProcessDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-03-17
+     */
+    void update(ProjectSubProcessDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-03-17
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java
index 3b5d227ea4..f692900851 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java
@@ -149,4 +149,14 @@ public interface ProjectTraceService {
 	 * @author sun
 	 */
 	void responseV2(TokenDto tokenDto, ProjectResponseFormDTO formDTO);
+
+	/**
+	 * 发送到外部平台
+	 * @author zhaoqifeng
+	 * @date 2021/3/17 14:33
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return void
+	 */
+	void sendTo(TokenDto tokenDto, SendToFormDTO formDTO);
 }
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 309377bb4b..ec471bd67b 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
@@ -280,6 +280,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 	@Override
 	public ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO) {
+		//TODO 获取 customer_project_parameter表key值external_system的value，如果为0，isSend为false，值为1则跟processable的值一样
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
@@ -291,6 +292,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			projectStaffDTO.setStaffId(fromDTO.getUserId());
 			List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO);
 			if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
+				//TODO external_system值为1时，根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录，如果没有记录或者INTERNAL_STATUS是closed，processable
+				// 的值为true
 				resultDTO.setProcessable(true);
 			} else {
 				resultDTO.setProcessable(false);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubAttachmentServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubAttachmentServiceImpl.java
new file mode 100644
index 0000000000..b87f5238ac
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubAttachmentServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.ProjectSubAttachmentDao;
+import com.epmet.dto.ProjectSubAttachmentDTO;
+import com.epmet.entity.ProjectSubAttachmentEntity;
+import com.epmet.service.ProjectSubAttachmentService;
+import org.apache.commons.lang3.StringUtils;
+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 2021-03-17
+ */
+@Service
+public class ProjectSubAttachmentServiceImpl extends BaseServiceImpl<ProjectSubAttachmentDao, ProjectSubAttachmentEntity> implements ProjectSubAttachmentService {
+
+
+    @Override
+    public PageData<ProjectSubAttachmentDTO> page(Map<String, Object> params) {
+        IPage<ProjectSubAttachmentEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectSubAttachmentDTO.class);
+    }
+
+    @Override
+    public List<ProjectSubAttachmentDTO> list(Map<String, Object> params) {
+        List<ProjectSubAttachmentEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectSubAttachmentDTO.class);
+    }
+
+    private QueryWrapper<ProjectSubAttachmentEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectSubAttachmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectSubAttachmentDTO get(String id) {
+        ProjectSubAttachmentEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectSubAttachmentDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectSubAttachmentDTO dto) {
+        ProjectSubAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSubAttachmentEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectSubAttachmentDTO dto) {
+        ProjectSubAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSubAttachmentEntity.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-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
new file mode 100644
index 0000000000..d3cb6457c1
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.ProjectSubProcessDao;
+import com.epmet.dto.ProjectSubProcessDTO;
+import com.epmet.entity.ProjectSubProcessEntity;
+import com.epmet.service.ProjectSubProcessService;
+import org.apache.commons.lang3.StringUtils;
+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 2021-03-17
+ */
+@Service
+public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProcessDao, ProjectSubProcessEntity> implements ProjectSubProcessService {
+
+
+    @Override
+    public PageData<ProjectSubProcessDTO> page(Map<String, Object> params) {
+        IPage<ProjectSubProcessEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectSubProcessDTO.class);
+    }
+
+    @Override
+    public List<ProjectSubProcessDTO> list(Map<String, Object> params) {
+        List<ProjectSubProcessEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectSubProcessDTO.class);
+    }
+
+    private QueryWrapper<ProjectSubProcessEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectSubProcessEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectSubProcessDTO get(String id) {
+        ProjectSubProcessEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectSubProcessDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectSubProcessDTO dto) {
+        ProjectSubProcessEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSubProcessEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectSubProcessDTO dto) {
+        ProjectSubProcessEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSubProcessEntity.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-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index f2801b0c25..9009eedc3c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -182,4 +182,18 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 		projectService.responseV2(formDTO);
 	}
 
+	/**
+	 * 发送到外部平台
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/3/17 14:33
+	 */
+	@Override
+	public void sendTo(TokenDto tokenDto, SendToFormDTO formDTO) {
+
+	}
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubAttachmentDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubAttachmentDao.xml
new file mode 100644
index 0000000000..119e821d5b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubAttachmentDao.xml
@@ -0,0 +1,28 @@
+<?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.ProjectSubAttachmentDao">
+
+    <resultMap type="com.epmet.entity.ProjectSubAttachmentEntity" id="projectSubAttachmentMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="subId" column="SUB_ID"/>
+        <result property="taskId" column="TASK_ID"/>
+        <result property="attachmentName" column="ATTACHMENT_NAME"/>
+        <result property="attachmentSize" column="ATTACHMENT_SIZE"/>
+        <result property="attachmentFormat" column="ATTACHMENT_FORMAT"/>
+        <result property="attachmentType" column="ATTACHMENT_TYPE"/>
+        <result property="attachmentUrl" column="ATTACHMENT_URL"/>
+        <result property="duration" column="DURATION"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
new file mode 100644
index 0000000000..7bbb56d5bc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -0,0 +1,30 @@
+<?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.ProjectSubProcessDao">
+
+    <resultMap type="com.epmet.entity.ProjectSubProcessEntity" id="projectSubProcessMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="processId" column="PROCESS_ID"/>
+        <result property="staffId" column="STAFF_ID"/>
+        <result property="platformId" column="PLATFORM_ID"/>
+        <result property="platformName" column="PLATFORM_NAME"/>
+        <result property="taskId" column="TASK_ID"/>
+        <result property="result" column="RESULT"/>
+        <result property="externalStatus" column="EXTERNAL_STATUS"/>
+        <result property="externalStatusDesc" column="EXTERNAL_STATUS_DESC"/>
+        <result property="internalStatus" column="INTERNAL_STATUS"/>
+        <result property="handleDate" column="HANDLE_DATE"/>
+        <result property="handleUserName" column="HANDLE_USER_NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

From 9c1a1d89efa7f8ed83ed2b47b97f27a7b882aaaa Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 18 Mar 2021 13:35:04 +0800
Subject: [PATCH 07/51] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ThirdPlatformFormDTO.java  | 10 ++++---
 ...ltDTO.java => ThirdplatformResultDTO.java} |  9 ++----
 .../controller/ThirdPlatformController.java   | 28 +++++++++++++------
 .../dao/ThirdplatformCustomerRegisterDao.java | 10 +------
 .../java/com/epmet/dao/ThirdplatformDao.java  | 11 +++++++-
 .../com/epmet/entity/ThirdplatformEntity.java |  5 ++++
 .../epmet/service/ThirdPlatformService.java   |  4 +--
 .../impl/ThirdPlatformServiceImpl.java        |  9 +++---
 .../ThirdplatformCustomerRegisterDao.xml      | 24 ----------------
 .../resources/mapper/ThirdplatformDao.xml     | 27 ++++++++++++++++++
 10 files changed, 79 insertions(+), 58 deletions(-)
 rename epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/{ThirdplatformCustomerRegisterResultDTO.java => ThirdplatformResultDTO.java} (57%)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
index 3f488e75c1..c2ff1a3666 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
@@ -7,13 +7,15 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class ThirdPlatformFormDTO {
 
-    // 列出注册关系分组
-    public static interface ListRegRelsGroups {}
+    // 根据客户和动作查询分组
+    public interface ListByCustomerAndActionGroup {}
+    // 根据动作查询分组
+    public interface ListByActionGroup {}
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListRegRelsGroups.class })
+    @NotBlank(message = "客户ID不能为空", groups = { ListByCustomerAndActionGroup.class })
     private String customerId;
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListRegRelsGroups.class })
+    @NotBlank(message = "客户ID不能为空", groups = { ListByCustomerAndActionGroup.class, ListByActionGroup.class })
     private String actionKey;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformResultDTO.java
similarity index 57%
rename from epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java
rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformResultDTO.java
index d637837fbc..6b0b163048 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformCustomerRegisterResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ThirdplatformResultDTO.java
@@ -3,16 +3,13 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 @Data
-public class ThirdplatformCustomerRegisterResultDTO {
-    /**
-     *
-     */
-    private String customerId;
-
+public class ThirdplatformResultDTO {
     /**
      *
      */
     private String platformId;
 
     private String platformName;
+
+    private String icon;
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
index 64c7f0e7f0..a8196d2520 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -3,7 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
-import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.service.ThirdPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,20 +20,32 @@ import java.util.List;
 @RequestMapping("thirdplatform")
 public class ThirdPlatformController {
 
-
     @Autowired
     private ThirdPlatformService thirdPlatformService;
 
     /**
-     * 列出第三方平台注册关系
+     * 根据客户id和动作，列出客户开通可用的第三方平台
      * @param input
      * @return
      */
-    @PostMapping("list-reg-rels")
-    public Result<List<ThirdplatformCustomerRegisterResultDTO>> listRegsteredPlatforms(@RequestBody ThirdPlatformFormDTO input) {
-        ValidatorUtils.validateEntity(input);
-        List<ThirdplatformCustomerRegisterResultDTO> platformRegs = thirdPlatformService.listByCustomerId(input.getCustomerId(), input.getActionKey());
-        return new Result<List<ThirdplatformCustomerRegisterResultDTO>>().ok(platformRegs);
+    @PostMapping("customer/list-platforms-by-action")
+    public Result<List<ThirdplatformResultDTO>> listPlatformsByCustomerAndAction(@RequestBody ThirdPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.ListByCustomerAndActionGroup.class);
+        List<ThirdplatformResultDTO> platformRegs = thirdPlatformService.listDTOS(input.getCustomerId(), input.getActionKey());
+        return new Result<List<ThirdplatformResultDTO>>().ok(platformRegs);
+    }
+
+    /**
+     * @Description 根据动作列出平台列表
+     * @return
+     * @author wxz
+     * @date 2021.03.18 10:54
+    */
+    @PostMapping("list-platforms-by-action")
+    public Result<List<ThirdplatformResultDTO >> listPlatformsByAction(@RequestBody ThirdPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.ListByActionGroup.class);
+        List<ThirdplatformResultDTO > platformRegs = thirdPlatformService.listDTOS(null, input.getActionKey());
+        return new Result<List<ThirdplatformResultDTO >>().ok(platformRegs);
     }
 
     //@PostMapping("register")
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
index b5ffe5cf82..cbae094292 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerRegisterDao.java
@@ -18,8 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.constant.ThirdPlatformConstant;
-import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -35,12 +34,5 @@ import java.util.List;
 @Mapper
 public interface ThirdplatformCustomerRegisterDao extends BaseDao<ThirdplatformCustomerRegisterEntity> {
 
-    /**
-     * 动态sql查询
-     * @param customerId
-     * @return
-     */
-    List<ThirdplatformCustomerRegisterResultDTO> listDTOS(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
-
     ThirdplatformCustomerRegisterEntity getByCustomerIdAndPlatformId(@Param("customerId") String customerId, @Param("platformId") String platformId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
index 593d20923f..e86e63b7f2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.entity.ThirdplatformEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 
@@ -29,5 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ThirdplatformDao extends BaseDao<ThirdplatformEntity> {
-	
+    /**
+     * 动态sql查询
+     * @param customerId
+     * @return
+     */
+    List<ThirdplatformResultDTO> listDTOS(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
index d756c81b88..d5b20b8eab 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
@@ -63,4 +63,9 @@ public class ThirdplatformEntity extends BaseEpmetEntity {
 	 */
 	private String baseUrl;
 
+	/**
+	 * icon
+	 */
+	private String icon;
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
index 74b4cab44f..8110c4b5b3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -1,11 +1,11 @@
 package com.epmet.service;
 
-import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 
 import java.util.List;
 
 public interface ThirdPlatformService {
 
-    List<ThirdplatformCustomerRegisterResultDTO> listByCustomerId(String customerId, String actionKey);
+    List<ThirdplatformResultDTO> listDTOS(String customerId, String actionKey);
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
index 40556ebaca..5e23671983 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -1,7 +1,8 @@
 package com.epmet.service.impl;
 
 import com.epmet.dao.ThirdplatformCustomerRegisterDao;
-import com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO;
+import com.epmet.dao.ThirdplatformDao;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.service.ThirdPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,10 +13,10 @@ import java.util.List;
 public class ThirdPlatformServiceImpl implements ThirdPlatformService {
 
     @Autowired
-    private ThirdplatformCustomerRegisterDao thirdplatformCustomerRegisterDao;
+    private ThirdplatformDao thirdplatformDao;
 
     @Override
-    public List<ThirdplatformCustomerRegisterResultDTO> listByCustomerId(String customerId, String actionKey) {
-        return thirdplatformCustomerRegisterDao.listDTOS(customerId, actionKey);
+    public List<ThirdplatformResultDTO> listDTOS(String customerId, String actionKey) {
+        return thirdplatformDao.listDTOS(customerId, actionKey);
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
index 10edc458e3..4e5577228e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
@@ -31,28 +31,4 @@
       and PLATFORM_ID = #{platformId}
       and DEL_FLAG = 0
     </select>
-
-    <select id="listDTOS" resultType="com.epmet.dto.result.ThirdplatformCustomerRegisterResultDTO">
-        select tcr.id,
-               tcr.customer_id,
-               tcr.platform_id,
-               tpf.PLATFORM_NAME,
-               tcr.del_flag,
-               tcr.revision,
-               tcr.created_by,
-               tcr.created_time,
-               tcr.updated_by,
-               tcr.updated_time
-        from thirdplatform_customer_register tcr
-                 inner join thirdplatform tpf on (tcr.PLATFORM_ID = tpf.ID)
-                inner join thirdplatform_action ta on (tpf.ID = ta.PLATFORM_ID)
-        <where>
-         tcr.CUSTOMER_ID = #{customerId}
-            and ta.ACTION_KEY = #{actionKey}
-            and tcr.DEL_FLAG = 0
-            and tpf.DEL_FLAG = 0
-        </where>
-    </select>
-
-
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
index 0bc68d7af2..0db6eba1f2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
@@ -9,6 +9,7 @@
         <result property="platformKey" column="PLATFORM_KEY"/>
         <result property="platformSecret" column="PLATFORM_SECRET"/>
         <result property="apiService" column="API_SERVICE"/>
+        <result property="icon" column="ICON"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -17,5 +18,31 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="listDTOS" resultType="com.epmet.dto.result.ThirdplatformResultDTO">
+        select tcr.id,
+        tcr.customer_id,
+        tcr.platform_id,
+        tpf.PLATFORM_NAME,
+        tpf.ICON,
+        tcr.del_flag,
+        tcr.revision,
+        tcr.created_by,
+        tcr.created_time,
+        tcr.updated_by,
+        tcr.updated_time
+        from thirdplatform_customer_register tcr
+        inner join thirdplatform tpf on (tcr.PLATFORM_ID = tpf.ID)
+        inner join thirdplatform_action ta on (tpf.ID = ta.PLATFORM_ID)
+        <where>
+            <if test="customerId != null and customerId != ''">
+                tcr.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test="actionKey != null and actionKey != ''">
+                and ta.ACTION_KEY = #{actionKey}
+            </if>
+            and tcr.DEL_FLAG = 0
+            and tpf.DEL_FLAG = 0
+        </where>
+    </select>
 
 </mapper>
\ No newline at end of file

From 6f9bbcfaa991d301d25c78f187244702551a83e4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 18 Mar 2021 13:42:59 +0800
Subject: [PATCH 08/51] =?UTF-8?q?trace/projectdetail=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ProjectDetailFromDTO.java  |  5 +++++
 .../com/epmet/constant/ProjectConstant.java   |  2 ++
 .../com/epmet/dao/ProjectSubProcessDao.java   | 14 +++++++++++++-
 .../service/ProjectSubProcessService.java     |  8 ++++++++
 .../service/impl/ProjectServiceImpl.java      | 19 ++++++++++++++++---
 .../impl/ProjectSubProcessServiceImpl.java    | 11 +++++++++++
 .../service/impl/ProjectTraceServiceImpl.java |  1 +
 .../resources/mapper/ProjectSubProcessDao.xml | 18 ++++++++++++++++++
 8 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java
index 28178701c5..7bf6e633a8 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java
@@ -22,4 +22,9 @@ public class ProjectDetailFromDTO implements Serializable {
 	 * 用户ID
 	 */
 	private String userId;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index c883ad7153..6bae43e57b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -158,4 +158,6 @@ public interface ProjectConstant {
 	String INTERNAL = "internal";
 
 	String NOT_EXIST_PROJECT = "未查询带此项目信息......";
+
+	String EXTERNAL_SYSTEM = "external_system";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
index 0d36cd36c3..43dcf571db 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ProjectSubProcessDTO;
 import com.epmet.entity.ProjectSubProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 节点事件关联表 
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
-	
+
+    /**
+     * @Description  查询最新记录
+     * @Param projectStaffIds
+     * @author zxc
+     * @date 2021/3/18 上午11:17
+     */
+    ProjectSubProcessDTO selectSubProcess(@Param("projectStaffIds") List<String> projectStaffIds);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
index c329a3aa95..b58f9c8a5a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
@@ -92,4 +92,12 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
      * @date 2021-03-17
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  查询最新记录
+     * @Param projectStaffIds
+     * @author zxc
+     * @date 2021/3/18 上午11:14
+     */
+    ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds);
 }
\ 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 ec471bd67b..65da591036 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
@@ -107,6 +107,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private ProjectProcessAttachmentService projectProcessAttachmentService;
 	@Autowired
 	private GovIssueOpenFeignClient govIssueOpenFeignClient;
+	@Autowired
+	private ProjectSubProcessService projectSubProcessService;
 
 	private final static String ONE_DAY = "<1";
 
@@ -281,7 +283,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO) {
 		//TODO 获取 customer_project_parameter表key值external_system的value，如果为0，isSend为false，值为1则跟processable的值一样
+		CustomerProjectParameterDTO customerProjectParameterDTO = new CustomerProjectParameterDTO();
+		customerProjectParameterDTO.setCustomerId(fromDTO.getCustomerId());
+		customerProjectParameterDTO.setParameterKey(ProjectConstant.EXTERNAL_SYSTEM);
+		String parameterValue = parameterService.getParameterValueByKey(customerProjectParameterDTO);
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
+		resultDTO.setIsSend((StringUtils.isEmpty(parameterValue) || parameterValue.equals(NumConstant.ZERO_STR)) ? false : resultDTO.getProcessable());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
 			resultDTO.setReturnable(false);
@@ -292,9 +299,15 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			projectStaffDTO.setStaffId(fromDTO.getUserId());
 			List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO);
 			if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
-				//TODO external_system值为1时，根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录，如果没有记录或者INTERNAL_STATUS是closed，processable
-				// 的值为true
-				resultDTO.setProcessable(true);
+				//TODO external_system值为1时，根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录，
+				// 如果没有记录或者INTERNAL_STATUS是closed，processable的值为true
+				if (resultDTO.getIsSend()){
+					List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
+					ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.selectSubProcess(projectStaffIds);
+					resultDTO.setProcessable((null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) ?  true : false);
+				}else {
+					resultDTO.setProcessable(false);
+				}
 			} else {
 				resultDTO.setProcessable(false);
 			}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
index d3cb6457c1..ed03aefbc4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -97,4 +97,15 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  查询最新记录
+     * @Param projectStaffIds
+     * @author zxc
+     * @date 2021/3/18 上午11:16
+     */
+    @Override
+    public ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds) {
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index 9009eedc3c..c3c88b663f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -67,6 +67,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 	@Override
 	public ProjectDetailResultDTO getProjectDetail(TokenDto tokenDto, ProjectDetailFromDTO fromDTO) {
 		fromDTO.setUserId(tokenDto.getUserId());
+		fromDTO.setCustomerId(tokenDto.getCustomerId());
 		return projectService.getProjectDetail(fromDTO);
 	}
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index 7bbb56d5bc..f81f5e23f8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -26,5 +26,23 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 查询最新记录 -->
+    <select id="selectSubProcess" resultType="com.epmet.dto.ProjectSubProcessDTO">
+        SELECT
+            *
+        FROM
+            project_sub_process
+        WHERE
+            DEL_FLAG = '0'
+          AND (
+              <foreach collection="projectStaffIds" item="id" separator=" or ">
+                  PROJECT_STAFF_ID = #{id}
+              </foreach>
+            )
+        ORDER BY CREATED_TIME DESC
+        LIMIT 1
+
+    </select>
+
 
 </mapper>
\ No newline at end of file

From f970eeb74ee1743a7ffb7033da92e87e863013e8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 18 Mar 2021 14:17:31 +0800
Subject: [PATCH 09/51] =?UTF-8?q?trace/projectdetail=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/ProjectServiceImpl.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 65da591036..5e07865804 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
@@ -301,12 +301,20 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
 				//TODO external_system值为1时，根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录，
 				// 如果没有记录或者INTERNAL_STATUS是closed，processable的值为true
-				if (resultDTO.getIsSend()){
+				if (parameterValue.equals(NumConstant.ONE_STR)) {
 					List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
+					// 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录
 					ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.selectSubProcess(projectStaffIds);
-					resultDTO.setProcessable((null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) ?  true : false);
-				}else {
-					resultDTO.setProcessable(false);
+					if (null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) {
+						resultDTO.setProcessable(true);
+						resultDTO.setIsSend(true);
+					} else {
+						resultDTO.setProcessable(false);
+						resultDTO.setIsSend(false);
+					}
+				} else {
+					resultDTO.setProcessable(true);
+					resultDTO.setIsSend(false);
 				}
 			} else {
 				resultDTO.setProcessable(false);

From 2d72f75c8d8c615a74c444034c6f95d7b8628c02 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 18 Mar 2021 14:25:42 +0800
Subject: [PATCH 10/51] =?UTF-8?q?project=5Fprocess=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/ProjectProcessDTO.java       | 5 +++++
 .../src/main/java/com/epmet/entity/ProjectProcessEntity.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
index 689b3317d1..aa8bfd0387 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
@@ -134,4 +134,9 @@ public class ProjectProcessDTO implements Serializable {
 	 */
 	private String orgIdPath;
 
+	/**
+	 * 是否发送到外部系统
+	 */
+	private Integer isSend;
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
index a862140529..9569803906 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -108,4 +108,9 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
 	 */
 	private String orgIdPath;
 
+	/**
+	 * 是否发送到外部系统
+	 */
+	private Integer isSend;
+
 }

From f1be2842b8944c85a22992b7d83037b7c8f3a13a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 18 Mar 2021 15:53:15 +0800
Subject: [PATCH 11/51] =?UTF-8?q?trace/processList-v2=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ProcessListV2ResultDTO.java    |  6 ++++
 .../com/epmet/dto/result/SubProcessDTO.java   |  1 +
 .../com/epmet/dao/ProjectSubProcessDao.java   |  9 +++++
 .../service/ProjectSubProcessService.java     |  9 +++++
 .../impl/ProjectSubProcessServiceImpl.java    | 14 +++++++-
 .../service/impl/ProjectTraceServiceImpl.java | 15 +++++---
 .../resources/mapper/ProjectProcessDao.xml    |  3 +-
 .../resources/mapper/ProjectSubProcessDao.xml | 36 +++++++++++++++++++
 8 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java
index 2f3da4a57f..cea1ce6288 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java
@@ -44,6 +44,11 @@ public class ProcessListV2ResultDTO implements Serializable {
      */
     private String publicReply;
 
+    /**
+     * 是否发送到外部系统 0否 1是
+     */
+    private Integer isSend;
+
     /**
      * 内部备注
      */
@@ -73,5 +78,6 @@ public class ProcessListV2ResultDTO implements Serializable {
         this.internalRemark = "";
         this.publicFile = new ArrayList<>();
         this.internalFile = new ArrayList<>();
+        this.subProcess = new ArrayList<>();
     }
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
index 9a2c3406f7..a5a8f871f8 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
@@ -29,6 +29,7 @@ public class SubProcessDTO implements Serializable {
 	 * 处理人
 	 */
 	private String handleUserName;
+	private String subId;
 	/**
 	 * 处理内容
 	 */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
index 43dcf571db..dd887c38be 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ProjectSubProcessDTO;
+import com.epmet.dto.result.SubProcessDTO;
 import com.epmet.entity.ProjectSubProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -42,4 +43,12 @@ public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
      */
     ProjectSubProcessDTO selectSubProcess(@Param("projectStaffIds") List<String> projectStaffIds);
 
+    /**
+     * @Description  查询进展和附件
+     * @Param processId
+     * @author zxc
+     * @date 2021/3/18 下午2:57
+     */
+    List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processId") String processId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
index b58f9c8a5a..9d1aba55f9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectSubProcessDTO;
+import com.epmet.dto.result.SubProcessDTO;
 import com.epmet.entity.ProjectSubProcessEntity;
 
 import java.util.List;
@@ -100,4 +101,12 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
      * @date 2021/3/18 上午11:14
      */
     ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds);
+
+    /**
+     * @Description  查询进展和附件
+     * @Param processId
+     * @author zxc
+     * @date 2021/3/18 下午2:57
+     */
+    List<SubProcessDTO> selectSubProcessAndAttachment(String processId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
index ed03aefbc4..3314826387 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.ProjectSubProcessDao;
 import com.epmet.dto.ProjectSubProcessDTO;
+import com.epmet.dto.result.SubProcessDTO;
 import com.epmet.entity.ProjectSubProcessEntity;
 import com.epmet.service.ProjectSubProcessService;
 import org.apache.commons.lang3.StringUtils;
@@ -105,7 +106,18 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
      */
     @Override
     public ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds) {
-        return null;
+        return baseDao.selectSubProcess(projectStaffIds);
+    }
+
+    /**
+     * @Description  查询进展和附件
+     * @Param processId
+     * @author zxc
+     * @date 2021/3/18 下午2:57
+     */
+    @Override
+    public List<SubProcessDTO> selectSubProcessAndAttachment(String processId) {
+        return baseDao.selectSubProcessAndAttachment(processId);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index c3c88b663f..0faaefda73 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -11,10 +12,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.service.ProjectProcessService;
-import com.epmet.service.ProjectService;
-import com.epmet.service.ProjectStaffService;
-import com.epmet.service.ProjectTraceService;
+import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +43,8 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 	private ProjectProcessDao projectProcessDao;
 	@Autowired
 	private ProjectProcessAttachmentDao attachmentDao;
+	@Autowired
+	private ProjectSubProcessService projectSubProcessService;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -144,6 +144,13 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 			log.warn(ProjectConstant.NOT_EXIST_PROJECT);
 			return new ArrayList<>();
 		}
+		// 是否发送到外部系统 0否 1是
+		processList.forEach(p -> {
+			if (p.getIsSend().equals(NumConstant.ONE)){
+				p.setSubProcess(projectSubProcessService.selectSubProcessAndAttachment(p.getProcessId()));
+			}
+		});
+
 		// 查询进展附件列表
 		List<PublicAndInternalFileResultDTO> files = attachmentDao.selectAttachByProjectId(formDTO.getProjectId());
 		if (!CollectionUtils.isEmpty(files)){
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
index 27bb86c807..131ba02434 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
@@ -94,7 +94,8 @@
             UNIX_TIMESTAMP(created_time) AS processTime,
             DEPARTMENT_NAME,
             PUBLIC_REPLY,
-            INTERNAL_REMARK
+            INTERNAL_REMARK,
+            IS_SEND
         FROM project_process
         WHERE DEL_FLAG = '0'
               AND PROJECT_ID = #{projectId}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index f81f5e23f8..893fb54b1c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -44,5 +44,41 @@
 
     </select>
 
+    <resultMap id="subProcess" type="com.epmet.dto.result.SubProcessDTO">
+        <result property="platformName" column="platformName"/>
+        <result property="externalStatus" column="externalStatus"/>
+        <result property="processTime" column="processTime"/>
+        <result property="handleUserName" column="handleUserName"/>
+        <result property="result" column="result"/>
+        <result property="subId" column="subId"/>
+        <collection property="subFile" column="subId" select="selectAtt" ofType="com.epmet.dto.result.PublicAndInternalFileResultDTO"/>
+    </resultMap>
+    <!-- 查询进展和附件 -->
+    <select id="selectSubProcessAndAttachment" resultMap="subProcess">
+        SELECT psp.id as subId,
+            psp.PLATFORM_NAME as platformName,
+            psp.EXTERNAL_STATUS as externalStatus,
+            psp.CREATED_TIME AS processTime,
+            psp.HANDLE_USER_NAME as handleUserName,
+            psp.RESULT as result
+        FROM project_sub_process psp
+
+        WHERE psp.DEL_FLAG = 0
+          AND psp.PROCESS_ID = #{processId}
+    </select>
+    <select id="selectAtt" resultType="com.epmet.dto.result.PublicAndInternalFileResultDTO">
+        SELECT
+            psa.ATTACHMENT_NAME AS name,
+            psa.ATTACHMENT_URL AS url,
+            psa.ATTACHMENT_TYPE AS type,
+            psa.ATTACHMENT_FORMAT AS format,
+            IFNULL(psa.ATTACHMENT_SIZE,0) AS size,
+            IFNULL(psa.DURATION,0) AS duration
+        FROM project_sub_attachment psa
+        WHERE psa.DEL_FLAG = '0'
+          AND psa.SUB_ID = #{subId}
+        order by psa.sort
+    </select>
+
 
 </mapper>
\ No newline at end of file

From c5fd4f60adb2ab735a9f2bd5242fdf31e84f45d2 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 18 Mar 2021 16:01:22 +0800
Subject: [PATCH 12/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E5=AF=B9=E6=8E=A5=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ThirdPlatformFormDTO.java  |  8 +--
 .../controller/ThirdPlatformController.java   | 26 ++++-----
 .../dao/ThirdplatformCustomerActionDao.java   | 33 +++++++++++
 .../java/com/epmet/dao/ThirdplatformDao.java  |  4 ++
 .../ThirdplatformCustomerActionEntity.java    | 56 +++++++++++++++++++
 .../ThirdplatformCustomerRegisterEntity.java  |  4 ++
 .../epmet/service/ThirdPlatformService.java   |  3 +-
 .../impl/ThirdPlatformServiceImpl.java        | 10 +++-
 .../mapper/ThirdplatformCustomerActionDao.xml | 20 +++++++
 .../ThirdplatformCustomerRegisterDao.xml      |  4 ++
 .../resources/mapper/ThirdplatformDao.xml     | 42 ++++++++++++++
 11 files changed, 189 insertions(+), 21 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
index c2ff1a3666..475a09a4de 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
@@ -8,14 +8,14 @@ import javax.validation.constraints.NotBlank;
 public class ThirdPlatformFormDTO {
 
     // 根据客户和动作查询分组
-    public interface ListByCustomerAndActionGroup {}
+    public interface ListAvailableByCustomerAndActionGroup {}
     // 根据动作查询分组
-    public interface ListByActionGroup {}
+    public interface ListSelectableByCustomerAndActionGroup {}
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListByCustomerAndActionGroup.class })
+    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class })
     private String customerId;
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListByCustomerAndActionGroup.class, ListByActionGroup.class })
+    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class, ListSelectableByCustomerAndActionGroup.class })
     private String actionKey;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
index a8196d2520..92976c57e1 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -24,32 +24,32 @@ public class ThirdPlatformController {
     private ThirdPlatformService thirdPlatformService;
 
     /**
-     * 根据客户id和动作，列出客户开通可用的第三方平台
+     * 根据客户id和动作，列出客户登记可用的第三方平台
+     *
      * @param input
      * @return
      */
-    @PostMapping("customer/list-platforms-by-action")
-    public Result<List<ThirdplatformResultDTO>> listPlatformsByCustomerAndAction(@RequestBody ThirdPlatformFormDTO input) {
-        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.ListByCustomerAndActionGroup.class);
-        List<ThirdplatformResultDTO> platformRegs = thirdPlatformService.listDTOS(input.getCustomerId(), input.getActionKey());
+    @PostMapping("customer/list-available-platforms-by-action")
+    public Result<List<ThirdplatformResultDTO>> listAvailablePlatformsByCustomerAndAction(@RequestBody ThirdPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.ListAvailableByCustomerAndActionGroup.class);
+        List<ThirdplatformResultDTO> platformRegs = thirdPlatformService.listAvailablePlatformsByCustomerAndAction(input.getCustomerId(), input.getActionKey());
         return new Result<List<ThirdplatformResultDTO>>().ok(platformRegs);
     }
 
     /**
-     * @Description 根据动作列出平台列表
      * @return
+     * @Description 根据客户id和动作，列出客户可选的第三方系统
      * @author wxz
      * @date 2021.03.18 10:54
-    */
-    @PostMapping("list-platforms-by-action")
-    public Result<List<ThirdplatformResultDTO >> listPlatformsByAction(@RequestBody ThirdPlatformFormDTO input) {
-        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.ListByActionGroup.class);
-        List<ThirdplatformResultDTO > platformRegs = thirdPlatformService.listDTOS(null, input.getActionKey());
-        return new Result<List<ThirdplatformResultDTO >>().ok(platformRegs);
+     */
+    @PostMapping("customer/list-selectable-platforms-by-action")
+    public Result<List<ThirdplatformResultDTO>> listSelectablePlatformsByAction(@RequestBody ThirdPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.ListSelectableByCustomerAndActionGroup.class);
+        List<ThirdplatformResultDTO> platformRegs = thirdPlatformService.listSelectableByCustomerAndActionGroup(input.getCustomerId(), input.getActionKey());
+        return new Result<List<ThirdplatformResultDTO>>().ok(platformRegs);
     }
 
     //@PostMapping("register")
 
 
-
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
new file mode 100644
index 0000000000..4b937061fd
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.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.ThirdplatformCustomerActionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客户针对指定操作所选用的第三方平台列表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-18
+ */
+@Mapper
+public interface ThirdplatformCustomerActionDao extends BaseDao<ThirdplatformCustomerActionEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
index e86e63b7f2..8b5e7840cc 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformDao.java
@@ -39,4 +39,8 @@ public interface ThirdplatformDao extends BaseDao<ThirdplatformEntity> {
      * @return
      */
     List<ThirdplatformResultDTO> listDTOS(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
+
+    List<ThirdplatformResultDTO> listAvailablePlatformsByCustomerAndAction(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
+
+    List<ThirdplatformResultDTO> listSelectableByCustomerAndActionGroup(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java
new file mode 100644
index 0000000000..8be40a1a0b
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java
@@ -0,0 +1,56 @@
+/**
+ * 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 2021-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("thirdplatform_customer_action")
+public class ThirdplatformCustomerActionEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 平台ID
+     */
+	private String platformId;
+
+    /**
+     * 动作key
+     */
+	private String actionKey;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
index b3b77fb626..8f19691433 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
@@ -48,4 +48,8 @@ public class ThirdplatformCustomerRegisterEntity extends BaseEpmetEntity {
      */
 	private String platformId;
 
+	private String customizedPlatformName;
+
+	private String customizedPlatformIcon;
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
index 8110c4b5b3..aa86027db9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 public interface ThirdPlatformService {
 
-    List<ThirdplatformResultDTO> listDTOS(String customerId, String actionKey);
+    List<ThirdplatformResultDTO> listAvailablePlatformsByCustomerAndAction(String customerId, String actionKey);
 
+    List<ThirdplatformResultDTO> listSelectableByCustomerAndActionGroup(String customerId, String actionKey);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
index 5e23671983..9a7ed8bb3c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -1,6 +1,5 @@
 package com.epmet.service.impl;
 
-import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.service.ThirdPlatformService;
@@ -16,7 +15,12 @@ public class ThirdPlatformServiceImpl implements ThirdPlatformService {
     private ThirdplatformDao thirdplatformDao;
 
     @Override
-    public List<ThirdplatformResultDTO> listDTOS(String customerId, String actionKey) {
-        return thirdplatformDao.listDTOS(customerId, actionKey);
+    public List<ThirdplatformResultDTO> listAvailablePlatformsByCustomerAndAction(String customerId, String actionKey) {
+        return thirdplatformDao.listAvailablePlatformsByCustomerAndAction(customerId, actionKey);
+    }
+
+    @Override
+    public List<ThirdplatformResultDTO> listSelectableByCustomerAndActionGroup(String customerId, String actionKey) {
+        return thirdplatformDao.listSelectableByCustomerAndActionGroup(customerId, actionKey);
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
new file mode 100644
index 0000000000..33c76cfd7a
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
@@ -0,0 +1,20 @@
+<?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.ThirdplatformCustomerActionDao">
+
+    <resultMap type="com.epmet.entity.ThirdplatformCustomerActionEntity" id="thirdplatformCustomerActionMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="platformId" column="PLATFORM_ID"/>
+        <result property="actionKey" column="ACTION_KEY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
index 4e5577228e..e4cdddc98d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
@@ -7,6 +7,8 @@
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="platformId" column="PLATFORM_ID"/>
+        <result property="customizedPlatformName" column="CUSTOMIZED_PLATFORM_NAME"/>
+        <result property="customizedPlatformIcon" column="CUSTOMIZED_PLATFORM_ICON"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -20,6 +22,8 @@
         select tcr.id,
            customer_id,
            platform_id,
+           customized_platform_name,
+            customized_platform_icon,
            del_flag,
            revision,
            created_by,
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
index 0db6eba1f2..beec9ed36d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformDao.xml
@@ -45,4 +45,46 @@
         </where>
     </select>
 
+    <select id="listAvailablePlatformsByCustomerAndAction"
+            resultType="com.epmet.dto.result.ThirdplatformResultDTO">
+        select tca.id,
+               tca.customer_id,
+               tca.platform_id,
+               tca.action_key,
+               tca.del_flag,
+               tca.revision,
+               tca.created_by,
+               tca.created_time,
+               tca.updated_by,
+               tca.updated_time,
+               tcr.CUSTOMIZED_PLATFORM_NAME platformName,
+               tcr.CUSTOMIZED_PLATFORM_ICON icon
+        from thirdplatform_customer_action tca
+                 inner join thirdplatform_customer_register tcr
+                            on (tca.CUSTOMER_ID = tcr.CUSTOMER_ID and tca.PLATFORM_ID = tcr.PLATFORM_ID)
+        where tca.CUSTOMER_ID = #{customerId}
+          and tca.ACTION_KEY = #{actionKey}
+          and tca.DEL_FLAG = 0
+          and tcr.DEL_FLAG = 0
+    </select>
+
+    <select id="listSelectableByCustomerAndActionGroup"
+            resultType="com.epmet.dto.result.ThirdplatformResultDTO">
+            select tcr.id,
+               tcr.customer_id,
+               tcr.platform_id,
+               tcr.customized_platform_name platformName,
+               tcr.customized_platform_icon icon,
+               tcr.del_flag,
+               tcr.revision,
+               tcr.created_by,
+               tcr.created_time,
+               tcr.updated_by,
+               tcr.updated_time
+        from thirdplatform_customer_register tcr
+                 inner join thirdplatform_action ta on (tcr.PLATFORM_ID = ta.PLATFORM_ID)
+        where tcr.CUSTOMER_ID = #{customerId}
+          and ta.ACTION_KEY = #{actionKey}
+          and tcr.DEL_FLAG = 0
+    </select>
 </mapper>
\ No newline at end of file

From a66f848d956b58910150c106a6a4952b229c350f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 18 Mar 2021 16:09:46 +0800
Subject: [PATCH 13/51] =?UTF-8?q?trace/processList-v2=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/ProjectSubProcessServiceImpl.java  | 8 ++++++++
 .../com/epmet/service/impl/ProjectTraceServiceImpl.java   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
index 3314826387..ffbae9a85f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -31,7 +31,9 @@ import com.epmet.service.ProjectSubProcessService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -106,6 +108,9 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
      */
     @Override
     public ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds) {
+        if (CollectionUtils.isEmpty(projectStaffIds)){
+            return null;
+        }
         return baseDao.selectSubProcess(projectStaffIds);
     }
 
@@ -117,6 +122,9 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
      */
     @Override
     public List<SubProcessDTO> selectSubProcessAndAttachment(String processId) {
+        if (StringUtils.isEmpty(processId)){
+            return new ArrayList<>();
+        }
         return baseDao.selectSubProcessAndAttachment(processId);
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index 0faaefda73..c7d29968da 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -147,6 +147,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 		// 是否发送到外部系统 0否 1是
 		processList.forEach(p -> {
 			if (p.getIsSend().equals(NumConstant.ONE)){
+				// 赋值 子节点
 				p.setSubProcess(projectSubProcessService.selectSubProcessAndAttachment(p.getProcessId()));
 			}
 		});

From 48f093e704b668011829c8533187af7e6b4a8a23 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 18 Mar 2021 16:23:53 +0800
Subject: [PATCH 14/51] =?UTF-8?q?trace/processList-v2=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/SubProcessDTO.java   |  1 +
 .../com/epmet/dao/ProjectSubProcessDao.java   |  4 ++--
 .../service/ProjectSubProcessService.java     |  4 ++--
 .../impl/ProjectSubProcessServiceImpl.java    |  8 ++++----
 .../service/impl/ProjectTraceServiceImpl.java | 19 +++++++++++++------
 .../resources/mapper/ProjectSubProcessDao.xml | 11 ++++++++---
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
index a5a8f871f8..4ef4534545 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SubProcessDTO.java
@@ -30,6 +30,7 @@ public class SubProcessDTO implements Serializable {
 	 */
 	private String handleUserName;
 	private String subId;
+	private String processId;
 	/**
 	 * 处理内容
 	 */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
index dd887c38be..e030f34669 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
@@ -45,10 +45,10 @@ public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
 
     /**
      * @Description  查询进展和附件
-     * @Param processId
+     * @Param processIds
      * @author zxc
      * @date 2021/3/18 下午2:57
      */
-    List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processId") String processId);
+    List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processIds")List<String> processIds);
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
index 9d1aba55f9..d822ed2c39 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
@@ -104,9 +104,9 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
 
     /**
      * @Description  查询进展和附件
-     * @Param processId
+     * @Param processIds
      * @author zxc
      * @date 2021/3/18 下午2:57
      */
-    List<SubProcessDTO> selectSubProcessAndAttachment(String processId);
+    List<SubProcessDTO> selectSubProcessAndAttachment(List<String> processIds);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
index ffbae9a85f..0bdbbdb8df 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -116,16 +116,16 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
 
     /**
      * @Description  查询进展和附件
-     * @Param processId
+     * @Param processIds
      * @author zxc
      * @date 2021/3/18 下午2:57
      */
     @Override
-    public List<SubProcessDTO> selectSubProcessAndAttachment(String processId) {
-        if (StringUtils.isEmpty(processId)){
+    public List<SubProcessDTO> selectSubProcessAndAttachment(List<String> processIds) {
+        if (CollectionUtils.isEmpty(processIds)){
             return new ArrayList<>();
         }
-        return baseDao.selectSubProcessAndAttachment(processId);
+        return baseDao.selectSubProcessAndAttachment(processIds);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index c7d29968da..c35a1e33fc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -144,13 +144,20 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 			log.warn(ProjectConstant.NOT_EXIST_PROJECT);
 			return new ArrayList<>();
 		}
+		List<String> processIds = processList.stream().filter(f -> f.getIsSend().equals(NumConstant.ONE)).map(m -> m.getProcessId()).collect(Collectors.toList());
+		List<SubProcessDTO> subProcess = projectSubProcessService.selectSubProcessAndAttachment(processIds);
 		// 是否发送到外部系统 0否 1是
-		processList.forEach(p -> {
-			if (p.getIsSend().equals(NumConstant.ONE)){
-				// 赋值 子节点
-				p.setSubProcess(projectSubProcessService.selectSubProcessAndAttachment(p.getProcessId()));
-			}
-		});
+		if (!CollectionUtils.isEmpty(subProcess)){
+			processList.forEach(p -> {
+				subProcess.forEach(s -> {
+					if (p.getProcessId().equals(s.getProcessId())){
+						List<SubProcessDTO> process = new ArrayList<>();
+						process.add(s);
+						p.setSubProcess(process);
+					}
+				});
+			});
+		}
 
 		// 查询进展附件列表
 		List<PublicAndInternalFileResultDTO> files = attachmentDao.selectAttachByProjectId(formDTO.getProjectId());
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index 893fb54b1c..f503a81c5d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -51,6 +51,7 @@
         <result property="handleUserName" column="handleUserName"/>
         <result property="result" column="result"/>
         <result property="subId" column="subId"/>
+        <result property="processId" column="processId"/>
         <collection property="subFile" column="subId" select="selectAtt" ofType="com.epmet.dto.result.PublicAndInternalFileResultDTO"/>
     </resultMap>
     <!-- 查询进展和附件 -->
@@ -60,11 +61,15 @@
             psp.EXTERNAL_STATUS as externalStatus,
             psp.CREATED_TIME AS processTime,
             psp.HANDLE_USER_NAME as handleUserName,
-            psp.RESULT as result
+            psp.RESULT as result,
+            psp.process_id as processId
         FROM project_sub_process psp
-
         WHERE psp.DEL_FLAG = 0
-          AND psp.PROCESS_ID = #{processId}
+          AND (
+              <foreach collection="processIds" item="processId" separator=" OR ">
+                  psp.PROCESS_ID = #{processId}
+              </foreach>
+            )
     </select>
     <select id="selectAtt" resultType="com.epmet.dto.result.PublicAndInternalFileResultDTO">
         SELECT

From 42f887396809e253c403f735313bfb5b0d959af9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 18 Mar 2021 17:39:42 +0800
Subject: [PATCH 15/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E5=AF=B9=E6=8E=A5=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
index 475a09a4de..6e39ddfbc9 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
@@ -12,7 +12,7 @@ public class ThirdPlatformFormDTO {
     // 根据动作查询分组
     public interface ListSelectableByCustomerAndActionGroup {}
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class })
+    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class, ListSelectableByCustomerAndActionGroup.class })
     private String customerId;
 
     @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class, ListSelectableByCustomerAndActionGroup.class })

From 98319993a15d746e3df3a60a851de765d2c102f7 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 19 Mar 2021 00:08:00 +0800
Subject: [PATCH 16/51] =?UTF-8?q?=E3=80=90=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=911.=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=BF=9D=E5=AD=98=E6=89=80=E9=80=89=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=202.=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B9=B3=E5=8F=B0=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=AD=89=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ThirdPlatformFormDTO.java  | 29 ++++++++++++++-
 .../epmet-third/epmet-third-server/pom.xml    |  6 +--
 .../controller/ThirdPlatformController.java   | 26 ++++++++++++-
 .../dao/ThirdplatformCustomerActionDao.java   |  5 ++-
 .../epmet/service/ThirdPlatformService.java   | 11 ++++++
 .../impl/ThirdPlatformServiceImpl.java        | 37 +++++++++++++++++++
 .../mapper/ThirdplatformCustomerActionDao.xml | 18 +++++++++
 7 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
index 6e39ddfbc9..f1793c1fb3 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
@@ -12,10 +12,35 @@ public class ThirdPlatformFormDTO {
     // 根据动作查询分组
     public interface ListSelectableByCustomerAndActionGroup {}
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class, ListSelectableByCustomerAndActionGroup.class })
+    // 保存客户选中的平台列表
+    public interface SaveCustomerSelectedPlatformGroup {}
+
+    // 列出客户选中的平台列表
+    public interface ListSelectedPlatforms {}
+
+    // 更新客户自定义的平台信息
+    public interface UpdateCustomizePlatformInfo {}
+
+    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class,
+            ListSelectableByCustomerAndActionGroup.class,
+            SaveCustomerSelectedPlatformGroup.class,
+            ListSelectedPlatforms.class,
+            UpdateCustomizePlatformInfo.class })
     private String customerId;
 
-    @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class, ListSelectableByCustomerAndActionGroup.class })
+    @NotBlank(message = "动作不能为空", groups = { ListAvailableByCustomerAndActionGroup.class,
+            ListSelectableByCustomerAndActionGroup.class,
+            SaveCustomerSelectedPlatformGroup.class })
     private String actionKey;
 
+    @NotBlank(message = "平台ID不能为空", groups = { SaveCustomerSelectedPlatformGroup.class,
+            UpdateCustomizePlatformInfo.class })
+    private String platformId;
+
+    @NotBlank(message = "平台名称不能为空", groups = { UpdateCustomizePlatformInfo.class })
+    private String platformName;
+
+    @NotBlank(message = "平台图标不能为空", groups = { UpdateCustomizePlatformInfo.class })
+    private String icon;
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index fdd764c6e0..87fd48048b 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -221,14 +221,14 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://118.190.150.119:47306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>192.168.1.130</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.host>118.190.150.119</spring.redis.host>
+                <spring.redis.port>47379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
index 92976c57e1..e3f1998793 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -25,6 +25,7 @@ public class ThirdPlatformController {
 
     /**
      * 根据客户id和动作，列出客户登记可用的第三方平台
+     * 用途：工作端，运营端配置界面
      *
      * @param input
      * @return
@@ -49,7 +50,30 @@ public class ThirdPlatformController {
         return new Result<List<ThirdplatformResultDTO>>().ok(platformRegs);
     }
 
-    //@PostMapping("register")
+    /**
+     * @Description 保存客户选中的平台列表
+     * @return
+     * @author wxz
+     * @date 2021.03.18 18:04
+     */
+    @PostMapping("customer/save-selected-platforms")
+    public Result saveSelectedPlatforms(@RequestBody List<ThirdPlatformFormDTO> input) {
+        input.stream().forEach(c -> ValidatorUtils.validateEntity(c, ThirdPlatformFormDTO.SaveCustomerSelectedPlatformGroup.class));
+        thirdPlatformService.saveSelectedPlatforms(input);
+        return new Result();
+    }
 
+    /**
+     * @Description 更新客户自定义的平台信息
+     * @return
+     * @author wxz
+     * @date 2021.03.18 23:45
+    */
+    @PostMapping("customer/update-customize-platform-info")
+    public Result updateCustomizePlatformInfo(@RequestBody ThirdPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformFormDTO.UpdateCustomizePlatformInfo.class);
+        thirdPlatformService.updateCustomizePlatformInfo(input);
+        return new Result();
+    }
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
index 4b937061fd..49ac3a5431 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ThirdplatformCustomerActionEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 客户针对指定操作所选用的第三方平台列表
@@ -29,5 +30,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ThirdplatformCustomerActionDao extends BaseDao<ThirdplatformCustomerActionEntity> {
-	
+    ThirdplatformCustomerActionEntity selectOneEntity(@Param("customerId") String customerId,
+                                                      @Param("platformId") String platformId,
+                                                      @Param("actionKey") String actionKey);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
index aa86027db9..45ccb90354 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 
 import java.util.List;
@@ -9,4 +10,14 @@ public interface ThirdPlatformService {
     List<ThirdplatformResultDTO> listAvailablePlatformsByCustomerAndAction(String customerId, String actionKey);
 
     List<ThirdplatformResultDTO> listSelectableByCustomerAndActionGroup(String customerId, String actionKey);
+
+    /**
+     * @Description 保存客户选择的平台列表
+     * @return
+     * @author wxz
+     * @date 2021.03.18 22:06
+    */
+    void saveSelectedPlatforms(List<ThirdPlatformFormDTO> platforms);
+
+    void updateCustomizePlatformInfo(ThirdPlatformFormDTO input);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
index 9a7ed8bb3c..ad4e81254e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -1,10 +1,16 @@
 package com.epmet.service.impl;
 
+import com.epmet.dao.ThirdplatformCustomerActionDao;
+import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
+import com.epmet.entity.ThirdplatformCustomerActionEntity;
+import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.service.ThirdPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -14,6 +20,12 @@ public class ThirdPlatformServiceImpl implements ThirdPlatformService {
     @Autowired
     private ThirdplatformDao thirdplatformDao;
 
+    @Autowired
+    private ThirdplatformCustomerActionDao thirdplatformCustomerActionDao;
+
+    @Autowired
+    private ThirdplatformCustomerRegisterDao thirdplatformCustomerRegisterDao;
+
     @Override
     public List<ThirdplatformResultDTO> listAvailablePlatformsByCustomerAndAction(String customerId, String actionKey) {
         return thirdplatformDao.listAvailablePlatformsByCustomerAndAction(customerId, actionKey);
@@ -23,4 +35,29 @@ public class ThirdPlatformServiceImpl implements ThirdPlatformService {
     public List<ThirdplatformResultDTO> listSelectableByCustomerAndActionGroup(String customerId, String actionKey) {
         return thirdplatformDao.listSelectableByCustomerAndActionGroup(customerId, actionKey);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveSelectedPlatforms(List<ThirdPlatformFormDTO> platforms) {
+        platforms.forEach(p -> {
+            ThirdplatformCustomerActionEntity thirdplatformCustomerActionEntity = thirdplatformCustomerActionDao.selectOneEntity(p.getCustomerId(), p.getPlatformId(), p.getActionKey());
+            if (thirdplatformCustomerActionEntity == null) {
+                ThirdplatformCustomerActionEntity insert = new ThirdplatformCustomerActionEntity();
+                insert.setActionKey(p.getActionKey());
+                insert.setCustomerId(p.getCustomerId());
+                insert.setPlatformId(p.getPlatformId());
+                thirdplatformCustomerActionDao.insert(insert);
+            }
+        });
+    }
+
+    @Override
+    public void updateCustomizePlatformInfo(ThirdPlatformFormDTO input) {
+        ThirdplatformCustomerRegisterEntity exist = thirdplatformCustomerRegisterDao.getByCustomerIdAndPlatformId(input.getCustomerId(), input.getPlatformId());
+        if (exist != null) {
+            exist.setCustomizedPlatformName(input.getPlatformName());
+            exist.setCustomizedPlatformIcon(input.getIcon());
+            thirdplatformCustomerRegisterDao.updateById(exist);
+        }
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
index 33c76cfd7a..4decbb7c0f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
@@ -16,5 +16,23 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="selectOneEntity" resultType="com.epmet.entity.ThirdplatformCustomerActionEntity">
+        select tca.id,
+               tca.customer_id,
+               tca.platform_id,
+               tca.action_key,
+               tca.del_flag,
+               tca.revision,
+               tca.created_by,
+               tca.created_time,
+               tca.updated_by,
+               tca.updated_time
+        from thirdplatform_customer_action tca
+        where tca.CUSTOMER_ID = #{customerId}
+          and tca.PLATFORM_ID = #{platformId}
+          and tca.ACTION_KEY = #{actionKey}
+          and tca.DEL_FLAG = 0
+    </select>
+
 
 </mapper>
\ No newline at end of file

From 40afaa0c5c873923d0b233b0ce5de3954d750b60 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 19 Mar 2021 00:08:52 +0800
Subject: [PATCH 17/51] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=86=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A4=96=E7=BD=91=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=EF=BC=8C=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-third/epmet-third-server/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 87fd48048b..fdd764c6e0 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -221,14 +221,14 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.150.119:47306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>118.190.150.119</spring.redis.host>
-                <spring.redis.port>47379</spring.redis.port>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>

From 05d82052a01a3794f40c72c2871a597a8d4c640f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 19 Mar 2021 10:30:33 +0800
Subject: [PATCH 18/51] =?UTF-8?q?trace/projectDetail=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ProjectDetailResultDTO.java    |  5 +++++
 .../main/java/com/epmet/dao/ProjectProcessDao.java  |  8 ++++++++
 .../com/epmet/service/ProjectProcessService.java    |  8 ++++++++
 .../service/impl/ProjectProcessServiceImpl.java     | 13 +++++++++++++
 .../com/epmet/service/impl/ProjectServiceImpl.java  |  1 +
 .../src/main/resources/mapper/ProjectProcessDao.xml | 10 ++++++++++
 6 files changed, 45 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 71bf83682a..61c23453d9 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
@@ -65,6 +65,11 @@ public class ProjectDetailResultDTO implements Serializable {
 	 */
 	private Boolean isSend;
 
+	/**
+	 * 当前流转到外部系统的ID
+	 */
+	private List<String> platformIds;
+
 	@NoArgsConstructor
 	@Data
 	public static class DepartmentNameListBean {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
index 80fa2b05a0..46974a22f6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
@@ -86,4 +86,12 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @date 2020/12/21 下午4:18
      */
     List<ProcessListV2ResultDTO> selectProcessList(@Param("projectId")String projectId);
+
+    /**
+     * @Description  查询当前流转到外部系统的ID
+     * @Param projectId
+     * @author zxc
+     * @date 2021/3/19 上午10:18
+     */
+    List<String> selectPlatFormIds(@Param("projectId") String projectId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
index 3a7643f3a5..582726205a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
@@ -159,4 +159,12 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      **/
     void transferV2(TransferFormDTO formDTO);
 
+    /**
+     * @Description  查询当前流转到外部系统的ID
+     * @Param projectId
+     * @author zxc
+     * @date 2021/3/19 上午10:18
+     */
+    List<String> selectPlatFormIds(String projectId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 8575f2d4a8..5f57a00488 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -730,4 +730,17 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         }
     }
 
+    /**
+     * @Description  查询当前流转到外部系统的ID
+     * @Param projectId
+     * @author zxc
+     * @date 2021/3/19 上午10:18
+     */
+    @Override
+    public List<String> selectPlatFormIds(String projectId) {
+        List<String> platFormIds = baseDao.selectPlatFormIds(projectId);
+        if (CollectionUtils.isEmpty(platFormIds))return new ArrayList<>();
+        return platFormIds;
+    }
+
 }
\ 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 5e07865804..44dcff034b 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
@@ -288,6 +288,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		customerProjectParameterDTO.setParameterKey(ProjectConstant.EXTERNAL_SYSTEM);
 		String parameterValue = parameterService.getParameterValueByKey(customerProjectParameterDTO);
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
+		resultDTO.setPlatformIds(projectProcessService.selectPlatFormIds(fromDTO.getProjectId()));
 		resultDTO.setIsSend((StringUtils.isEmpty(parameterValue) || parameterValue.equals(NumConstant.ZERO_STR)) ? false : resultDTO.getProcessable());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
index 131ba02434..0e2a2e5b3d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
@@ -101,4 +101,14 @@
               AND PROJECT_ID = #{projectId}
               order by created_time desc
     </select>
+
+    <!-- 查询当前流转到外部系统的ID -->
+    <select id="selectPlatFormIds" resultType="java.lang.String">
+        SELECT
+            DISTINCT psp.PLATFORM_ID
+        FROM project_process pp
+        LEFT JOIN project_sub_process psp ON psp.PROCESS_ID = pp.ID
+        WHERE psp.DEL_FLAG = 0
+            AND pp.PROJECT_ID = #{projectId}
+    </select>
 </mapper>
\ No newline at end of file

From 4ef62337867c0589342a3a2981d3504fc92d5ec6 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 19 Mar 2021 10:34:24 +0800
Subject: [PATCH 19/51] =?UTF-8?q?trace/projectDetail=20api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/ProjectServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

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 44dcff034b..6b53b1ef2a 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
@@ -288,6 +288,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		customerProjectParameterDTO.setParameterKey(ProjectConstant.EXTERNAL_SYSTEM);
 		String parameterValue = parameterService.getParameterValueByKey(customerProjectParameterDTO);
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
+		// 查询当前流转到外部系统的ID
 		resultDTO.setPlatformIds(projectProcessService.selectPlatFormIds(fromDTO.getProjectId()));
 		resultDTO.setIsSend((StringUtils.isEmpty(parameterValue) || parameterValue.equals(NumConstant.ZERO_STR)) ? false : resultDTO.getProcessable());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {

From 7b3c63a2e2d981545c8860b86a5ba9b984c3950a Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 19 Mar 2021 16:49:11 +0800
Subject: [PATCH 20/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=80=A7=E4=BF=9D=E5=AD=98=E5=AE=A2=E6=88=B7-=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0-action=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ThirdPlatformFormDTO.java  | 17 ++++--
 .../com/epmet/feign/ThirdOpenFeignClient.java | 26 +++++++++
 .../ThirdOpenFeignClientFallback.java         | 18 ++++++
 .../controller/ThirdPlatformController.java   | 12 ++++
 .../dao/ThirdplatformCustomerActionDao.java   |  2 +
 .../epmet/service/ThirdPlatformService.java   |  2 +
 .../impl/ThirdPlatformServiceImpl.java        | 52 +++++++++++++++++
 .../mapper/ThirdplatformCustomerActionDao.xml |  7 +++
 .../com/epmet/dto/form/ParameterFormDTO.java  |  7 +++
 .../dto/form/ThirdPlatformConfigFormDTO.java  | 30 ++++++++++
 .../gov-project/gov-project-server/pom.xml    |  5 ++
 .../epmet/constant/ParameterKeyConstant.java  |  6 ++
 .../CustomerProjectParameterController.java   | 26 +++++++++
 .../CustomerProjectParameterService.java      |  7 +++
 .../CustomerProjectParameterServiceImpl.java  | 56 +++++++++++++++++--
 15 files changed, 262 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
index f1793c1fb3..185eb5cab9 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformFormDTO.java
@@ -21,26 +21,33 @@ public class ThirdPlatformFormDTO {
     // 更新客户自定义的平台信息
     public interface UpdateCustomizePlatformInfo {}
 
+    public interface SaveOrUpdateSelectedPlatformInfo {}
+
     @NotBlank(message = "客户ID不能为空", groups = { ListAvailableByCustomerAndActionGroup.class,
             ListSelectableByCustomerAndActionGroup.class,
             SaveCustomerSelectedPlatformGroup.class,
             ListSelectedPlatforms.class,
-            UpdateCustomizePlatformInfo.class })
+            UpdateCustomizePlatformInfo.class,
+            SaveOrUpdateSelectedPlatformInfo.class })
     private String customerId;
 
     @NotBlank(message = "动作不能为空", groups = { ListAvailableByCustomerAndActionGroup.class,
             ListSelectableByCustomerAndActionGroup.class,
-            SaveCustomerSelectedPlatformGroup.class })
+            SaveCustomerSelectedPlatformGroup.class,
+            SaveOrUpdateSelectedPlatformInfo.class })
     private String actionKey;
 
     @NotBlank(message = "平台ID不能为空", groups = { SaveCustomerSelectedPlatformGroup.class,
-            UpdateCustomizePlatformInfo.class })
+            UpdateCustomizePlatformInfo.class,
+            SaveOrUpdateSelectedPlatformInfo.class })
     private String platformId;
 
-    @NotBlank(message = "平台名称不能为空", groups = { UpdateCustomizePlatformInfo.class })
+    @NotBlank(message = "平台名称不能为空", groups = { UpdateCustomizePlatformInfo.class,
+            SaveOrUpdateSelectedPlatformInfo.class })
     private String platformName;
 
-    @NotBlank(message = "平台图标不能为空", groups = { UpdateCustomizePlatformInfo.class })
+    @NotBlank(message = "平台图标不能为空", groups = { UpdateCustomizePlatformInfo.class,
+            SaveOrUpdateSelectedPlatformInfo.class  })
     private String icon;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
new file mode 100644
index 0000000000..f81e1b0db7
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -0,0 +1,26 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.feign.fallback.ThirdOpenFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
+public interface ThirdOpenFeignClient {
+
+    /**
+     * @Description 保存或修改客户选中的第三方平台信息
+     * @return
+     * @author wxz
+     * @date 2021.03.19 15:25
+     */
+    @PostMapping("/third/thirdplatform/customer/saveorupdate-selected-platforms")
+    Result saveOrUpdateSelectedPlatformsInfo(@RequestBody List<ThirdPlatformFormDTO> input);
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
new file mode 100644
index 0000000000..abd22929ee
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
@@ -0,0 +1,18 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.feign.ThirdOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
+    @Override
+    public Result saveOrUpdateSelectedPlatformsInfo(List<ThirdPlatformFormDTO> input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveOrUpdateSelectedPlatformsInfo", input);
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
index e3f1998793..9288625bee 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -76,4 +76,16 @@ public class ThirdPlatformController {
         return new Result();
     }
 
+    /**
+     * @Description 保存或修改客户选中的第三方平台信息
+     * @return
+     * @author wxz
+     * @date 2021.03.19 15:25
+    */
+    @PostMapping("customer/saveorupdate-selected-platforms")
+    public Result saveOrUpdateSelectedPlatformsInfo(@RequestBody List<ThirdPlatformFormDTO> input) {
+        input.stream().forEach(i -> ValidatorUtils.validateEntity(i, ThirdPlatformFormDTO.SaveOrUpdateSelectedPlatformInfo.class));
+        thirdPlatformService.saveOrUpdateSelectedPlatformInfo(input);
+        return new Result();
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
index 49ac3a5431..cf4640fcc8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ThirdplatformCustomerActionDao.java
@@ -33,4 +33,6 @@ public interface ThirdplatformCustomerActionDao extends BaseDao<ThirdplatformCus
     ThirdplatformCustomerActionEntity selectOneEntity(@Param("customerId") String customerId,
                                                       @Param("platformId") String platformId,
                                                       @Param("actionKey") String actionKey);
+
+    int deleteByCustomerIdAndActionKey(@Param("customerId") String customerId, @Param("actionKey") String actionKey);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
index 45ccb90354..add4c63a2a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -20,4 +20,6 @@ public interface ThirdPlatformService {
     void saveSelectedPlatforms(List<ThirdPlatformFormDTO> platforms);
 
     void updateCustomizePlatformInfo(ThirdPlatformFormDTO input);
+
+    void saveOrUpdateSelectedPlatformInfo(List<ThirdPlatformFormDTO> platforms);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
index ad4e81254e..39d3e33cae 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -1,18 +1,25 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.dao.ThirdplatformCustomerActionDao;
 import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
+import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.service.ThirdPlatformService;
+import jodd.util.CollectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class ThirdPlatformServiceImpl implements ThirdPlatformService {
@@ -60,4 +67,49 @@ public class ThirdPlatformServiceImpl implements ThirdPlatformService {
             thirdplatformCustomerRegisterDao.updateById(exist);
         }
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveOrUpdateSelectedPlatformInfo(List<ThirdPlatformFormDTO> platforms) {
+        if (CollectionUtils.isEmpty(platforms)) {
+            return;
+        }
+
+        // 1.物理删除客户-action所有对应关系
+        int deletedCount = thirdplatformCustomerActionDao.deleteByCustomerIdAndActionKey(platforms.get(0).getCustomerId(), platforms.get(0).getActionKey());
+
+        platforms.stream().forEach(pt -> {
+            String customerId = pt.getCustomerId();
+            String platformId = pt.getPlatformId();
+
+            // 2.更新用户自定义的平台信息
+            updateThirdPlatformCustomerRegInfo(pt);
+
+            // 3.重新建立customer-platform-action对应关系
+            ThirdplatformCustomerActionEntity tpcaEntity = new ThirdplatformCustomerActionEntity();
+            tpcaEntity.setPlatformId(platformId);
+            tpcaEntity.setCustomerId(customerId);
+            tpcaEntity.setActionKey(pt.getActionKey());
+            thirdplatformCustomerActionDao.insert(tpcaEntity);
+        });
+
+    }
+
+    /**
+     * @Description 更新第三方品台客户对应关系
+     * @return
+     * @author wxz
+     * @date 2021.03.19 15:22
+    */
+    private void updateThirdPlatformCustomerRegInfo(ThirdPlatformFormDTO platformFormDTO) {
+        LambdaQueryWrapper<ThirdplatformCustomerRegisterEntity> conditions = new QueryWrapper<ThirdplatformCustomerRegisterEntity>()
+                .lambda()
+                .eq(ThirdplatformCustomerRegisterEntity::getCustomerId, platformFormDTO.getCustomerId())
+                .eq(ThirdplatformCustomerRegisterEntity::getPlatformId, platformFormDTO.getPlatformId());
+
+        ThirdplatformCustomerRegisterEntity entity = new ThirdplatformCustomerRegisterEntity();
+        entity.setCustomizedPlatformName(platformFormDTO.getPlatformName());
+        entity.setCustomizedPlatformIcon(platformFormDTO.getIcon());
+        thirdplatformCustomerRegisterDao.update(entity, conditions);
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
index 4decbb7c0f..f23ff18cc3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerActionDao.xml
@@ -16,6 +16,13 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="deleteByCustomerIdAndActionKey">
+        delete
+        from thirdplatform_customer_action
+        where CUSTOMER_ID = #{customerId}
+          and ACTION_KEY = #{actionKey}
+    </delete>
+
     <select id="selectOneEntity" resultType="com.epmet.entity.ThirdplatformCustomerActionEntity">
         select tca.id,
                tca.customer_id,
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java
index d05c1c520c..532d00db14 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java
@@ -18,6 +18,10 @@ import java.io.Serializable;
 public class ParameterFormDTO implements Serializable {
 
 	private static final long serialVersionUID = 6943367994919967821L;
+
+	// 保存第三方平台发送项目协助开关
+	public interface SaveThirdPlatformSendProjectSwitchGroup {}
+
 	/**
 	 * 客户ID
 	 */
@@ -53,4 +57,7 @@ public class ParameterFormDTO implements Serializable {
 	 */
 	@NotBlank(message = "设定核算单位天结束时间不能为空", groups = AddGroup.class)
 	private String endTime;
+
+	@NotBlank(message = "客户发送第三方平台协助请求开关不能为空", groups = SaveThirdPlatformSendProjectSwitchGroup.class)
+	private String sendProjectSwitch;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
new file mode 100644
index 0000000000..519c1a1371
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class ThirdPlatformConfigFormDTO {
+
+    public interface SaveThirdplatformConfig {
+    }
+
+    @NotBlank(message = "客户ID不能为空", groups = {SaveThirdplatformConfig.class})
+    private String customerId;
+
+    @NotBlank(message = "项目协助发送开关状态不能为空", groups = {SaveThirdplatformConfig.class})
+    private String sendProjectSwitch;
+
+    private List<CustomerSelectedPlatform> customerSelectedPlatformList;
+
+    @Data
+    public static class CustomerSelectedPlatform {
+        private String customerId;
+        private String platformId;
+        private String platformName;
+        private String icon;
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 12e29787df..5acbc26ffb 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -19,6 +19,11 @@
             <artifactId>gov-project-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
index 57564203de..636ec26f64 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
@@ -53,4 +53,10 @@ public interface ParameterKeyConstant {
 	 */
 	String END_TIME = "end_time";
 	String END_TIME_NAME = "设定核算单位天结束时间";
+
+	/**
+	 * 发送项目协助到第三方平台开关
+	 */
+	String THIRD_PLATFORM_PROJECT_SEND = "third_platform_project_send";
+	String THIRD_PLATFORM_PROJECT_SEND_NAME = "发送外部系统项目协助开关";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
index 2dbe8c0663..aeb93e41c8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
@@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
+import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
 import com.epmet.excel.CustomerProjectParameterExcel;
 import com.epmet.service.CustomerProjectParameterService;
@@ -34,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 
@@ -135,4 +137,28 @@ public class CustomerProjectParameterController {
         return new Result();
     }
 
+    /**
+     * @Description 保存"发送项目协助到第三方平台"开关参数
+     * @return
+     * @author wxz
+     * @date 2021.03.19 13:50
+    */
+    @PostMapping("save-thirdplatform-send-switch")
+    public Result saveThirdPlatformSendProjectSwitch(@RequestBody ParameterFormDTO input) {
+        ValidatorUtils.validateEntity(input, ParameterFormDTO.SaveThirdPlatformSendProjectSwitchGroup.class);
+        String customerId = input.getCustomerId();
+        String sendProjectSwitch = input.getSendProjectSwitch();
+        customerProjectParameterService.saveThirdPlatformSendProjectSwitch(customerId, sendProjectSwitch);
+        return new Result();
+    }
+
+    @PostMapping("save-thirdplatform-config")
+    public Result saveThirdplatformConfig(@RequestBody ThirdPlatformConfigFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformConfigFormDTO.SaveThirdplatformConfig.class);
+        String customerId = input.getCustomerId();
+        String sendProjectSwitch = input.getSendProjectSwitch();
+        List<ThirdPlatformConfigFormDTO.CustomerSelectedPlatform> platformList = input.getCustomerSelectedPlatformList();
+        customerProjectParameterService.saveThirdplatformConfig(customerId, sendProjectSwitch, platformList);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
index 8dc8a120ca..4f1d6e9ea8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
+import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
 import com.epmet.entity.CustomerProjectParameterEntity;
 
@@ -166,4 +167,10 @@ public interface CustomerProjectParameterService extends BaseService<CustomerPro
      * @return void
      */
     void remindDefault(ParameterFormDTO formDTO);
+
+    void saveThirdPlatformSendProjectSwitch(String customerId, String sendProjectSwitch);
+
+    void saveThirdplatformConfig(String customerId,
+                                 String sendProjectSwitch,
+                                 List<ThirdPlatformConfigFormDTO.CustomerSelectedPlatform> platformList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index 081a5959a0..ab36ac3469 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -17,22 +17,23 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.constant.ParameterKeyConstant;
+import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dao.CustomerProjectParameterDao;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
+import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
 import com.epmet.entity.CustomerProjectParameterEntity;
+import com.epmet.feign.ThirdOpenFeignClient;
 import com.epmet.redis.CustomerProjectParameterRedis;
 import com.epmet.service.CustomerProjectParameterService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -40,13 +41,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 项目客户参数订制表
@@ -60,6 +60,9 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
     @Autowired
     private CustomerProjectParameterRedis customerProjectParameterRedis;
 
+    @Autowired
+    private ThirdOpenFeignClient thirdOpenFeignClient;
+
     @Override
     public PageData<CustomerProjectParameterDTO> page(Map<String, Object> params) {
         IPage<CustomerProjectParameterEntity> page = baseDao.selectPage(
@@ -290,4 +293,45 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         baseDao.deleteByCustomer(formDTO.getCustomerId());
     }
 
+    @Override
+    public void saveThirdPlatformSendProjectSwitch(String customerId, String sendProjectSwitch) {
+        // 构造条件
+        LambdaQueryWrapper<CustomerProjectParameterEntity> queryWrapper = new QueryWrapper<CustomerProjectParameterEntity>()
+                .lambda()
+                .eq(CustomerProjectParameterEntity::getCustomerId, customerId)
+                .eq(CustomerProjectParameterEntity::getParameterKey, ParameterKeyConstant.THIRD_PLATFORM_PROJECT_SEND);
+
+        CustomerProjectParameterEntity configExists = baseDao.selectOne(queryWrapper);
+
+        if (configExists == null) {
+            CustomerProjectParameterEntity entity = new CustomerProjectParameterEntity();
+            entity.setDescription("0：关，1：开");
+            entity.setParameterName(ParameterKeyConstant.THIRD_PLATFORM_PROJECT_SEND_NAME);
+            entity.setParameterValue(sendProjectSwitch);
+            entity.setCustomerId(customerId);
+            entity.setParameterKey(ParameterKeyConstant.THIRD_PLATFORM_PROJECT_SEND);
+            baseDao.insert(entity);
+        } else {
+            configExists.setParameterValue(sendProjectSwitch);
+            baseDao.updateById(configExists);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveThirdplatformConfig(String customerId, String sendProjectSwitch, List<ThirdPlatformConfigFormDTO.CustomerSelectedPlatform> platformList) {
+        // 1.本地执行配置更新
+        saveThirdPlatformSendProjectSwitch(customerId, sendProjectSwitch);
+        // 2.调用远程third服务，更新或新增客户-平台-等信息  ThirdPlatformFormDTO thirdPlatformFormDTO = new ThirdPlatformFormDTO();
+        List<ThirdPlatformFormDTO> formDTOS = platformList.stream().map(p -> {
+            ThirdPlatformFormDTO thirdPlatformFormDTO = new ThirdPlatformFormDTO();
+            thirdPlatformFormDTO.setActionKey(ThirdPlatformActions.PROJECT_ASSIST);
+            thirdPlatformFormDTO.setCustomerId(customerId);
+            thirdPlatformFormDTO.setIcon(p.getIcon());
+            thirdPlatformFormDTO.setPlatformId(p.getPlatformId());
+            thirdPlatformFormDTO.setPlatformName(p.getPlatformName());
+            return thirdPlatformFormDTO;
+        }).collect(Collectors.toList());
+        thirdOpenFeignClient.saveOrUpdateSelectedPlatformsInfo(formDTOS);
+    }
 }
\ No newline at end of file

From c89d5a3a948d98f863e1544e18a6f3fef1cb9955 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 19 Mar 2021 16:49:33 +0800
Subject: [PATCH 21/51] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/feign/ThirdOpenFeignClient.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
index f81e1b0db7..2459873c91 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
-@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
 public interface ThirdOpenFeignClient {
 
     /**

From 4b142408e0185ce4721fff0d4cc08a2790006220 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 19 Mar 2021 17:36:26 +0800
Subject: [PATCH 22/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/constant/NumConstant.java   |   4 +
 .../dto/form/ProjectApplyAssistFormDTO.java   |  94 ++++++-
 .../com/epmet/dto/form/ProjectDetailDTO.java  |  78 ++++++
 .../dto}/result/ProjectAssistResult.java      |   2 +-
 .../feign/EpmetThirdOpenFeignClient.java      |  41 +++
 .../EpmetThirdOpenFeignClientFallback.java    |  38 +++
 .../java/com/epmet/apiservice/ApiService.java |   2 +-
 .../epmet/apiservice/impl/DemoApiService.java |   2 +-
 .../impl/LuzhouGridPlatformApiService.java    |   3 +-
 .../epmet/controller/ProjectController.java   |   2 +-
 .../com/epmet/service/ProjectService.java     |   2 +-
 .../service/impl/ProjectServiceImpl.java      |   2 +-
 .../epmet/feign/GovIssueOpenFeignClient.java  |   3 +
 .../GovIssueOpenFeignClientFallBack.java      |   5 +
 .../com/epmet/dto/ProjectSubProcessDTO.java   |   2 +-
 .../dto/form/PlatformCallBackFormDTO.java     |  39 +++
 .../com/epmet/dto/form/SendToFormDTO.java     |   6 +
 .../gov-project/gov-project-server/pom.xml    |   6 +
 .../dao/CustomerProjectParameterDao.java      |  10 +
 .../com/epmet/dao/ProjectSubProcessDao.java   |   9 +
 .../epmet/entity/ProjectSubProcessEntity.java |   2 +-
 .../com/epmet/service/ProjectService.java     |  19 ++
 .../service/ProjectSubProcessService.java     |  10 +
 .../service/impl/ProjectServiceImpl.java      | 241 +++++++++++++++++-
 .../impl/ProjectSubProcessServiceImpl.java    |  14 +
 .../service/impl/ProjectTraceServiceImpl.java |   3 +-
 .../resources/mapper/ProjectSubProcessDao.xml |  23 ++
 27 files changed, 642 insertions(+), 20 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
 rename epmet-module/epmet-third/{epmet-third-server/src/main/java/com/epmet/apiservice => epmet-third-client/src/main/java/com/epmet/dto}/result/ProjectAssistResult.java (77%)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PlatformCallBackFormDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
index a9cc07d7a4..8f416ef8e9 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
@@ -63,6 +63,10 @@ public interface NumConstant {
     String THREE_STR = "3";
     String FOUR_STR = "4";
     String FIVE_STR = "5";
+    String SIX_STR = "6";
+    String SEVEN_STR = "7";
+    String EIGHT_STR = "8";
+    String NINE_STR = "9";
     String POSITIVE_EIGHT_STR = "+8";
     String EMPTY_STR = "";
     String ONE_NEG_STR = "-1";
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java
index bbbe9d17c5..ca273d70db 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java
@@ -3,13 +3,105 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 
+/**
+ * @author kamui
+ */
 @Data
-public class ProjectApplyAssistFormDTO {
+public class ProjectApplyAssistFormDTO implements Serializable {
 
+    private static final long serialVersionUID = 2052722763454170462L;
     private String customerId;
 
     @NotBlank(message = "平台ID不能为空")
     private String platformId;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 详细内容
+     */
+    @NotBlank(message = "详细内容不能为空")
+    private String detail;
+    /**
+     * 期望结束时间
+     */
+    private String expectEndTime;
+    /**
+     * 图片链接，英文逗号分割的字符串
+     */
+    private String imageLink;
+    /**
+     * 音频链接，英文逗号分割的字符串
+     */
+    private String voiceLink;
+    /**
+     * 视频链接，英文逗号分割的字符串
+     */
+    private String videoLink;
+    /**
+     * 当事人姓名
+     */
+    private String personName;
+    /**
+     * 当事人手机
+     */
+    private String mobile;
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "详细地址不能为空")
+    private String detailAddress;
+    /**
+     * 来源，需根据调用方，传对应的值，
+     * 封面新闻需传：“群众爆料”，
+     * 党建引领传：“党建引领
+     */
+    @NotBlank(message = "来源不能为空")
+    private String source;
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String longitude;
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String latitude;
+    /**
+     * 省
+     */
+    private String province;
+    /**
+     * 市
+     */
+    private String city;
+    /**
+     * 区县
+     */
+    private String area;
+    /**
+     * 街道
+     */
+    private String street;
+    /**
+     * 社区
+     */
+    private String houseEstate;
+    /**
+     * 外部事件id
+     */
+    private String outEventId;
+    /**
+     * 外部用户id
+     */
+    private String outUserId;
+    /**
+     * 通知接口的地址
+     */
+    private String notifyUrl;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
new file mode 100644
index 0000000000..a3fa6c0ae7
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
@@ -0,0 +1,78 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/18 17:12
+ */
+@Data
+public class ProjectDetailDTO implements Serializable {
+	private static final long serialVersionUID = -2172640364021337846L;
+	/**
+	 * 议题标题
+	 */
+	private String issueTitle;
+
+	/**
+	 * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+	 */
+	private String issueStatus;
+
+	/**
+	 * 议题发起人电话
+	 * */
+	private String issuePublisherMobile;
+
+	/**
+	 * 议题建议处理方式
+	 */
+	private String issueSuggestion;
+
+	/**
+	 * 所属网格(网格所属机关单位名称-网格名称)
+	 */
+	private String belongsGridName;
+
+	/**
+	 * 议题发起人（山东路168-尹女士）
+	 */
+	private String issueInitiator;
+
+	/**
+	 * 话题内容
+	 */
+	private String topicContent;
+
+	/**
+	 * 图片列表
+	 */
+	private List<String> photoList;
+
+	/**
+	 * 话题发表人（山东路168-尹女士）
+	 */
+	private String topicPublisher;
+
+	/**
+	 * 话题发表时间 (时间戳 毫秒级)
+	 */
+	private Long topicPublishTime;
+
+	/**
+	 * 话题发表人电话
+	 * */
+	private String topicPublisherMobile;
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+	}
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ProjectAssistResult.java
similarity index 77%
rename from epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ProjectAssistResult.java
index de992bdd0f..f306ccd4da 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/ProjectAssistResult.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ProjectAssistResult.java
@@ -1,4 +1,4 @@
-package com.epmet.apiservice.result;
+package com.epmet.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
new file mode 100644
index 0000000000..0e2b93e4d3
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
@@ -0,0 +1,41 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.result.*;
+import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallback;
+import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author zhaoqifeng
+ * @date 2021/3/18 14:18
+ */
+// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = GovProjectOpenFeignClientFallback.class,url = "localhost:8110")
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class)
+public interface EpmetThirdOpenFeignClient {
+	/**
+	 * 请求项目协助
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2021/3/18 11:08
+	 */
+	@PostMapping("third/project/apply-assist")
+	Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO);
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
new file mode 100644
index 0000000000..10abcf6992
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
@@ -0,0 +1,38 @@
+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.ProjectDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.result.*;
+import com.epmet.feign.EpmetThirdOpenFeignClient;
+import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ *
+ * @author zhaoqifeng
+ * @date 2021/3/18 14:17
+ */
+@Component
+public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignClient {
+
+	/**
+	 * 请求项目协助
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2021/3/18 11:08
+	 */
+	@Override
+	public Result applyAssist(ProjectApplyAssistFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "applyAssist", formDTO);
+	}
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 0a6ac8de63..6debb8dac2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -1,6 +1,6 @@
 package com.epmet.apiservice;
 
-import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.utils.HttpClientManager;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
index 9dcc3854c5..94c3127d00 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
@@ -1,7 +1,7 @@
 package com.epmet.apiservice.impl;
 
 import com.epmet.apiservice.ApiService;
-import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import org.slf4j.Logger;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index b38a3e6758..d4c062bb09 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -3,8 +3,7 @@ package com.epmet.apiservice.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.LZGridPlatformProjectAssistResult;
-import com.epmet.apiservice.result.ProjectAssistResult;
-import com.epmet.constant.ThirdPlatformActions;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index 3899ed9fda..0b32b9c2dd 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -1,6 +1,6 @@
 package com.epmet.controller;
 
-import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
index 1e9d75fdc1..2b6e8601a5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -1,6 +1,6 @@
 package com.epmet.service;
 
-import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index f652f6b995..b9f539a7a7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -1,7 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.apiservice.ApiService;
-import com.epmet.apiservice.result.ProjectAssistResult;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.service.ApiServiceSelector;
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
index f5d2786c93..f30bd40420 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
@@ -244,4 +244,7 @@ public interface GovIssueOpenFeignClient {
 
 	@PostMapping("/gov/issue/issue/detail")
 	Result<IssueResultDTO> queryIssueDetail(@RequestBody IssueDetailFormDTO formDTO);
+
+	@PostMapping(value = "/gov/issue/manage/votingissuedetail")
+	Result<GovIssueDetailResultDTO> votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail);
 }
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
index 84b1220993..e0e9e935c5 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
@@ -211,4 +211,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<IssueResultDTO> queryIssueDetail(IssueDetailFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "detail", formDTO);
 	}
+
+	@Override
+	public Result<GovIssueDetailResultDTO> votingissuedetail(IssueDetailFormDTO issueDetail) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "votingissuedetail", issueDetail);
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
index 5edffc797a..866594f1ab 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
@@ -56,7 +56,7 @@ public class ProjectSubProcessDTO implements Serializable {
     /**
      * 项目人员关联表ID
      */
-	private String staffId;
+	private String projectStaffId;
 
     /**
      * 系统ID
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PlatformCallBackFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PlatformCallBackFormDTO.java
new file mode 100644
index 0000000000..545206dfdc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PlatformCallBackFormDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/19 15:08
+ */
+@Data
+public class PlatformCallBackFormDTO implements Serializable {
+	private static final long serialVersionUID = 6350776148129116395L;
+	/**
+	 * 事件id
+	 */
+	private String eventId;
+	/**
+	 * 事件新的状态
+	 */
+	private String status;
+	/**
+	 * 事件处理详细内容
+	 */
+	private String note;
+	/**
+	 * 事件处理日期, 时区GMT+8， 格式：YYYY-MM-dd HH:mm:ss
+	 */
+	private String handleDate;
+	/**
+	 * 事件处理人姓名
+	 */
+	private String handleUserName;
+	/**
+	 * 参数签名，签名算法
+	 */
+	private String sign;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java
index 4060fc2c43..479cf64b30 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java
@@ -34,6 +34,12 @@ public class SendToFormDTO implements Serializable {
 
 	@NotBlank(message = "外部系统名不能为空")
 	private String platformName;
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+
+	private String userId;
 
 	@Valid
 	private List<TickStaffFormDTO> staffList;
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 5acbc26ffb..fd8153b479 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -107,6 +107,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
index f7ae09d16e..2610167069 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
@@ -79,4 +79,14 @@ public interface CustomerProjectParameterDao extends BaseDao<CustomerProjectPara
 	 * @return int
 	 */
 	int deleteByCustomer(@Param("customerId") String customerId);
+
+	/**
+	 * 根据key获取value
+	 * @author zhaoqifeng
+	 * @date 2021/3/17 16:51
+	 * @param customerId
+	 * @param key
+	 * @return java.lang.String
+	 */
+	String selectValueByKey(@Param("customerId") String customerId, @Param("key") String key);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
index e030f34669..dca510a468 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
@@ -51,4 +51,13 @@ public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
      */
     List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processIds")List<String> processIds);
 
+    /**
+     * 根据platformId查找最新的记录
+     * @author zhaoqifeng
+     * @date 2021/3/19 15:26
+     * @param platformId
+     * @return com.epmet.dto.ProjectSubProcessDTO
+     */
+    ProjectSubProcessDTO selectSubProcessByPlatformId(@Param("platformId") String platformId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
index ee451e6416..bee3af437b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
@@ -56,7 +56,7 @@ public class ProjectSubProcessEntity extends BaseEpmetEntity {
     /**
      * 项目人员关联表ID
      */
-	private String staffId;
+	private String projectStaffId;
 
     /**
      * 系统ID
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 3216f2d576..67112ab5d4 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
@@ -19,6 +19,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -276,4 +277,22 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @Date 2021/2/24 17:07
 	 **/
     ProjectInfoDTO queryProjectInfoByProjectId(String projectId);
+
+	/**
+	 * 发送到外部平台
+	 * @author zhaoqifeng
+	 * @date 2021/3/17 14:33
+	 * @param formDTO
+	 * @return void
+	 */
+	void sendTo(SendToFormDTO formDTO);
+
+	/**
+	 * 第三方平台回调
+	 * @author zhaoqifeng
+	 * @date 2021/3/19 15:12
+	 * @param formDTO
+	 * @return void
+	 */
+	void platformCallBack(PlatformCallBackFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
index d822ed2c39..702192d210 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
@@ -109,4 +109,14 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
      * @date 2021/3/18 下午2:57
      */
     List<SubProcessDTO> selectSubProcessAndAttachment(List<String> processIds);
+
+    /**
+     * 根据platformId查找最新的记录
+     *
+     * @author zhaoqifeng
+     * @date 2021/3/19 15:24
+     * @param platformId
+     * @return com.epmet.dto.ProjectSubProcessDTO
+     */
+    ProjectSubProcessDTO getSubProcessByPlatformId(String platformId);
 }
\ 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 6b53b1ef2a..3429a814b6 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
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ParameterKeyConstant;
@@ -43,6 +44,7 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.*;
 import com.epmet.redis.ProjectRedis;
+import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.service.*;
 import com.github.pagehelper.PageHelper;
@@ -109,6 +111,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private GovIssueOpenFeignClient govIssueOpenFeignClient;
 	@Autowired
 	private ProjectSubProcessService projectSubProcessService;
+	@Autowired
+	private EpmetThirdOpenFeignClient epmetThirdOpenFeignClient;
+	@Autowired
+	private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
 
 	private final static String ONE_DAY = "<1";
 
@@ -1280,7 +1287,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void projectProcessCostTimeDataCompensation() {
 		List<String> customers = baseDao.selectAllCustomerIds();
-		if(CollectionUtils.isEmpty(customers))return;
+		if(CollectionUtils.isEmpty(customers)) {
+			return;
+		}
 		List<ProjectOrgRelationDTO> totalContainer = new LinkedList<>();
 		customers.forEach(customerId -> {
 			List<ProjectOrgPeriodResultDTO> projectNodePeriodPerOrgList = projectStaffService.selectProjectOrgPeriod(customerId);
@@ -1364,8 +1373,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				dataMap.forEach((k,v) -> {
 					if(null != v){
 						v.setTotalPeriod(batchDelta_T.get(k));
-						if(v.getHandledDate() == v.getFirstDealtDate())v.setFirstReplyPeriod(batchDelta_T.get(k));
-						else v.setFirstReplyPeriod(batchDelta_TResponse.get(k));
+						if(v.getHandledDate() == v.getFirstDealtDate()) {
+							v.setFirstReplyPeriod(batchDelta_T.get(k));
+						} else {
+							v.setFirstReplyPeriod(batchDelta_TResponse.get(k));
+						}
 					}
 				});
 				List<List<ProjectOrgRelationDTO>> partition = ListUtils.partition(totalContainer, NumConstant.ONE_HUNDRED);
@@ -1557,17 +1569,25 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 									int seq = NumConstant.ZERO;
 									a:
 									for (int index = NumConstant.ZERO; index < staffResponseTraceUnit.size(); index++) {
-										if(StringUtils.isNotBlank(staffResponseTraceUnit.get(index).getOperation()) && staffResponseTraceUnit.get(index).getOperation().contains("create")) continue;
+										if(StringUtils.isNotBlank(staffResponseTraceUnit.get(index).getOperation()) && staffResponseTraceUnit.get(index).getOperation().contains("create")) {
+											continue;
+										}
 										if (StringUtils.equals("response", staffResponseTraceUnit.get(index).getOperation())) {
 
 											replaceFirstResponseDate(incompleteBodyUnit,staffResponseTraceUnit.get(index),seq);
 											seq++;
 											int cursor = index;
-											if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) break;
+											if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) {
+												break;
+											}
 											while (StringUtils.equals("response", staffResponseTraceUnit.get(cursor++).getOperation())) {
-												if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) break a;
+												if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) {
+													break a;
+												}
+											}
+											if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) {
+												break;
 											}
-											if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) break;
 											index = cursor;
 										} else {
 											replaceFirstResponseDate(incompleteBodyUnit,staffResponseTraceUnit.get(index),seq);
@@ -1589,7 +1609,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		// 传递过来的dest是已经按照projectId分好组之后再按照staff分组的集合
 		// dest key->staff
 		ProjectOrgPeriodResultDTO target = dest.get(seq);
-		if(null != target) target.setPeriodTillReplyFirstly(staffResponseTraceUnit.getCreatedTime());
+		if(null != target) {
+			target.setPeriodTillReplyFirstly(staffResponseTraceUnit.getCreatedTime());
+		}
 	}
 
 	/**
@@ -1968,4 +1990,207 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return projectInfoDTO;
 	}
 
+	/**
+	 * 发送到外部平台
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/3/17 14:33
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void sendTo(SendToFormDTO formDTO) {
+		//公开回复内容审核
+		if (StringUtils.isNotBlank(formDTO.getPublicReply())) {
+			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+			TextTaskDTO taskDTO = new TextTaskDTO();
+			taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+			taskDTO.setContent(formDTO.getPublicReply());
+			textScanParamDTO.getTasks().add(taskDTO);
+			Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+			if (!textSyncScanResult.success()) {
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+			} else {
+				if (!textSyncScanResult.getData().isAllPass()) {
+					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				}
+			}
+		}
+
+		//获取项目相关信息
+		ProjectEntity projectEntity = baseDao.selectById(formDTO.getProjectId());
+		if (ProjectConstant.CLOSED.equals(projectEntity.getStatus())) {
+			throw new RenException(EpmetErrorCode.PROJECT_IS_CLOSED.getCode());
+		}
+
+		if(StringUtils.isBlank(formDTO.getProjectStaffId())){
+			ProjectStaffDTO projectStaff = projectStaffService.getLatestIdByProjectIdAndStaffId(formDTO.getProjectId(),formDTO.getUserId());
+			if(null == projectStaff){
+				log.error("com.epmet.service.impl.ProjectServiceImpl.response,project_staff表中没有与之对应的数据，传参：{}", JSON.toJSONString(formDTO));
+				throw new RenException("未找到项目相关人员记录");
+			}
+			formDTO.setProjectStaffId(projectStaff.getId());
+		}
+		ProjectStaffDTO projectStaff = projectStaffService.get(formDTO.getProjectStaffId());
+		//处理响应记录加入项目进展表
+		ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
+		projectProcessEntity.setProjectId(formDTO.getProjectId());
+		projectProcessEntity.setCustomerId(projectStaff.getCustomerId());
+		projectProcessEntity.setDepartmentName(formDTO.getDepartmentName());
+		projectProcessEntity.setOrgIdPath(projectStaff.getOrgIdPath());
+		projectProcessEntity.setGridId(projectStaff.getGridId());
+		projectProcessEntity.setDepartmentId(projectStaff.getDepartmentId());
+		projectProcessEntity.setAgencyId(projectStaff.getOrgId());
+		projectProcessEntity.setOperation(ProjectConstant.OPERATION_RESPONSES);
+		projectProcessEntity.setOperationName(ProjectConstant.OPERATION_RESPONSES_NAME);
+		projectProcessEntity.setPublicReply(formDTO.getPublicReply());
+		projectProcessEntity.setInternalRemark(formDTO.getInternalRemark());
+		projectProcessEntity.setStaffId(formDTO.getUserId());
+		projectProcessEntity.setIsSend(NumConstant.ONE);
+		projectProcessService.insert(projectProcessEntity);
+
+		//项目附件表新增数据  sun  2020.12.22
+		if (CollectionUtils.isNotEmpty(formDTO.getPublicFile()) || CollectionUtils.isNotEmpty(formDTO.getInternalFile())) {
+			saveFile(formDTO.getPublicFile(), formDTO.getInternalFile(), projectStaff.getCustomerId(), formDTO.getProjectId(), projectProcessEntity.getId());
+		}//end
+
+		//TODO 发送到外部系统 start
+		ProjectApplyAssistFormDTO applyAssistFormDTO = new ProjectApplyAssistFormDTO();
+		applyAssistFormDTO.setCustomerId(projectStaff.getCustomerId());
+		applyAssistFormDTO.setPlatformId(formDTO.getPlatformId());
+		if (CollectionUtils.isNotEmpty(formDTO.getInternalFile())) {
+			List<String> imageList =
+					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.IMAGE.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(imageList)) {
+				applyAssistFormDTO.setImageLink(String.join(StrConstant.COMMA, imageList));
+			}
+			List<String> voiceList =
+					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.VOICE.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(imageList)) {
+				applyAssistFormDTO.setVoiceLink(String.join(StrConstant.COMMA, voiceList));
+			}
+			List<String> videoList =
+					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.VIDEO.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(imageList)) {
+				applyAssistFormDTO.setVideoLink(String.join(StrConstant.COMMA, videoList));
+			}
+
+		}
+
+		//获取网格信息
+		List<ProjectRelatedPersonnelDTO> relatedPersonnel =  projectRelatedPersonnelService.getPersonnelListByProjectId(formDTO.getProjectId());
+		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
+		customerGridFormDTO.setGridId(relatedPersonnel.get(0).getGridId());
+		Result<CustomerGridDTO> gridResult =  govOrgOpenFeignClient.getCustomerGridByGridId(customerGridFormDTO);
+		if (!gridResult.success()) {
+			throw new RenException(gridResult.getCode(), gridResult.getMsg());
+		}
+		applyAssistFormDTO.setLatitude(gridResult.getData().getLatitude());
+		applyAssistFormDTO.setLongitude(gridResult.getData().getLongitude());
+
+		//获取议题详情
+		IssueDetailFormDTO issueDetailFormDTO = new IssueDetailFormDTO();
+		issueDetailFormDTO.setIssueId(projectEntity.getOriginId());
+		Result<GovIssueDetailResultDTO> issueDetail = govIssueOpenFeignClient.votingissuedetail(issueDetailFormDTO);
+		if (!issueDetail.success()) {
+			throw new RenException(issueDetail.getCode(), issueDetail.getMsg());
+		}
+		ProjectDetailDTO projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData(), ProjectDetailDTO.class);
+		projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData().getTopicInfo(), ProjectDetailDTO.class);
+		applyAssistFormDTO.setDetail(projectDetailDTO.toString());
+		applyAssistFormDTO.setDetailAddress(projectDetailDTO.getBelongsGridName());
+		Result result = epmetThirdOpenFeignClient.applyAssist(applyAssistFormDTO);
+		if (!result.success()) {
+			throw new RenException(result.getCode(), result.getMsg());
+		}
+		applyAssistFormDTO.setSource("党建引领");
+		ProjectAssistResult assistResult = (ProjectAssistResult)result.getData();
+		//发送到外部系统 end
+
+		//结果存入project_sub_process表
+		ProjectSubProcessDTO projectSubProcess = new ProjectSubProcessDTO();
+		projectSubProcess.setCustomerId(projectStaff.getCustomerId());
+		projectSubProcess.setProjectId(formDTO.getProjectId());
+		projectSubProcess.setProcessId(projectProcessEntity.getId());
+		projectSubProcess.setProjectStaffId(formDTO.getProjectStaffId());
+		projectSubProcess.setPlatformId(formDTO.getPlatformId());
+		projectSubProcess.setPlatformName(formDTO.getPlatformName());
+		projectSubProcess.setTaskId(assistResult.getTaskId());
+		projectSubProcess.setExternalStatus(NumConstant.ONE_STR);
+		projectSubProcess.setExternalStatusDesc("待处理");
+		projectSubProcess.setInternalStatus(ProjectConstant.PENDING);
+		projectSubProcessService.save(projectSubProcess);
+
+		//项目节点历时
+		ProjectOrgRelationEntity relationEntity = relationDao.selectByProjectStaffId(formDTO.getProjectStaffId());
+		if(null != relationEntity){
+			ProjectOrgRelationEntity relationDto = new ProjectOrgRelationEntity();
+			relationDto.setProjectStaffId(relationEntity.getProjectStaffId());
+			if(null == relationEntity.getFirstDealtDate()){
+				Date current = new Date();
+				relationDto.setFirstDealtDate(current);
+				relationDto.setFirstReplyPeriod(calculateDelta_T(ProjectConstant.IMPRECISE_CALCULATION,
+						ProjectConstant.CALCULATION_TYPE_DEFAULT,projectStaff.getId(),
+						relationEntity.getInformedDate(),current));
+				relationDto.setOperation(ProjectConstant.OPERATION_RESPONSES);
+				relationDao.maintainTimePropertyConsistency(relationDto);
+			}
+		}else{
+			log.error("com.epmet.service.impl.ProjectServiceImpl#response，没有找到相关的节点耗时记录，参数:{}",JSON.toJSONString(formDTO));
+			throw new RenException("没有找到相关的节点耗时记录");
+		}
+	}
+
+	/**
+	 * 第三方平台回调
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/3/19 15:12
+	 */
+	@Override
+	public void platformCallBack(PlatformCallBackFormDTO formDTO) {
+		ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.getSubProcessByPlatformId(formDTO.getEventId());
+		projectSubProcessDTO.setExternalStatus(formDTO.getStatus());
+		projectSubProcessDTO.setResult(formDTO.getNote());
+		projectSubProcessDTO.setHandleDate(DateUtils.stringToDate(formDTO.getHandleDate(), DateUtils.DATE_TIME_PATTERN));
+		projectSubProcessDTO.setHandleUserName(formDTO.getHandleUserName());
+		switch (formDTO.getStatus()) {
+			case NumConstant.ONE_STR:
+				projectSubProcessDTO.setExternalStatusDesc("待处理");
+				break;
+			case NumConstant.TWO_STR:
+				projectSubProcessDTO.setExternalStatusDesc("待核实");
+				break;
+			case NumConstant.THREE_STR:
+				projectSubProcessDTO.setExternalStatusDesc("已上报");
+				break;
+			case NumConstant.FOUR_STR:
+				projectSubProcessDTO.setExternalStatusDesc("已完结");
+				projectSubProcessDTO.setInternalStatus(NumConstant.ONE_STR);
+				break;
+			case NumConstant.FIVE_STR:
+				projectSubProcessDTO.setExternalStatusDesc("处理中");
+				break;
+			case NumConstant.SIX_STR:
+				projectSubProcessDTO.setExternalStatusDesc("待分发");
+				break;
+			case NumConstant.SEVEN_STR:
+				projectSubProcessDTO.setExternalStatusDesc("归档");
+				break;
+			case NumConstant.EIGHT_STR:
+				projectSubProcessDTO.setExternalStatusDesc("催办");
+				break;
+			case NumConstant.NINE_STR:
+				projectSubProcessDTO.setExternalStatusDesc("超时");
+				break;
+			default:
+				break;
+		}
+		projectSubProcessService.save(projectSubProcessDTO);
+		//TODO 保存附件
+	}
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
index 0bdbbdb8df..9506c781bd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -84,6 +84,7 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
     public void save(ProjectSubProcessDTO dto) {
         ProjectSubProcessEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSubProcessEntity.class);
         insert(entity);
+        dto = ConvertUtils.sourceToTarget(entity, ProjectSubProcessDTO.class);
     }
 
     @Override
@@ -128,4 +129,17 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
         return baseDao.selectSubProcessAndAttachment(processIds);
     }
 
+    /**
+     * 根据platformId查找最新的记录
+     *
+     * @param platformId
+     * @return com.epmet.dto.ProjectSubProcessDTO
+     * @author zhaoqifeng
+     * @date 2021/3/19 15:24
+     */
+    @Override
+    public ProjectSubProcessDTO getSubProcessByPlatformId(String platformId) {
+        return baseDao.selectSubProcessByPlatformId(platformId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index c35a1e33fc..e86057c3d6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -209,7 +209,8 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 	 */
 	@Override
 	public void sendTo(TokenDto tokenDto, SendToFormDTO formDTO) {
-
+		formDTO.setUserId(tokenDto.getUserId());
+		projectService.sendTo(formDTO);
 	}
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index f503a81c5d..8beb65d0b2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -84,6 +84,29 @@
           AND psa.SUB_ID = #{subId}
         order by psa.sort
     </select>
+    <select id="selectSubProcessByPlatformId" resultType="com.epmet.dto.ProjectSubProcessDTO">
+        select
+            ID,
+            CUSTOMER_ID,
+            PROJECT_ID,
+            PROCESS_ID,
+            PROJECT_STAFF_ID,
+            PLATFORM_ID,
+            PLATFORM_NAME,
+            TASK_ID,
+            RESULT,
+            EXTERNAL_STATUS,
+            EXTERNAL_STATUS_DESC,
+            INTERNAL_STATUS,
+            HANDLE_DATE,
+            HANDLE_USER_NAME
+        from project_sub_process
+        where
+              DEL_FLAG = '0'
+            AND PLATFORM_ID = #{platformId}
+        order by CREATED_TIME DESC limit 1
+
+    </select>
 
 
 </mapper>
\ No newline at end of file

From ef7e198e12ed3a5fbc4a5d43e09dfd1ac4c65825 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 22 Mar 2021 09:34:17 +0800
Subject: [PATCH 23/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AE=A2=E6=88=B7=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/ThirdOpenFeignClient.java | 14 +++++-
 .../ThirdOpenFeignClientFallback.java         |  6 +++
 .../dto/form/ThirdPlatformConfigFormDTO.java  |  9 +++-
 .../result/ThirdPlatformConfigResultDTO.java  | 21 +++++++++
 .../CustomerProjectParameterController.java   | 15 +++++++
 .../CustomerProjectParameterService.java      |  3 ++
 .../CustomerProjectParameterServiceImpl.java  | 44 ++++++++++++++++++-
 7 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
index 2459873c91..ab5c26cc4b 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -3,6 +3,7 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
-//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
+//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
 public interface ThirdOpenFeignClient {
 
     /**
@@ -23,4 +24,13 @@ public interface ThirdOpenFeignClient {
     @PostMapping("/third/thirdplatform/customer/saveorupdate-selected-platforms")
     Result saveOrUpdateSelectedPlatformsInfo(@RequestBody List<ThirdPlatformFormDTO> input);
 
+    /**
+     * 根据客户id和动作，列出客户在指定动作下可用的第三方平台
+     * 用途：工作端，运营端配置界面
+     *
+     * @param input
+     * @return
+     */
+    @PostMapping("/third/thirdplatform/customer/list-available-platforms-by-action")
+    Result<List<ThirdplatformResultDTO>> listAvailablePlatformsByCustomerAndAction(@RequestBody ThirdPlatformFormDTO input);
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
index abd22929ee..9322354512 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.ThirdOpenFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -15,4 +16,9 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
     public Result saveOrUpdateSelectedPlatformsInfo(List<ThirdPlatformFormDTO> input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveOrUpdateSelectedPlatformsInfo", input);
     }
+
+    @Override
+    public Result<List<ThirdplatformResultDTO>> listAvailablePlatformsByCustomerAndAction(ThirdPlatformFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "listAvailablePlatformsByCustomerAndAction", input);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
index 519c1a1371..d816340cc6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
@@ -12,10 +12,15 @@ public class ThirdPlatformConfigFormDTO {
     public interface SaveThirdplatformConfig {
     }
 
-    @NotBlank(message = "客户ID不能为空", groups = {SaveThirdplatformConfig.class})
+    public interface LoadThirdplatformConfig { }
+
+    @NotBlank(message = "客户ID不能为空", groups = {
+            SaveThirdplatformConfig.class,
+            LoadThirdplatformConfig.class})
     private String customerId;
 
-    @NotBlank(message = "项目协助发送开关状态不能为空", groups = {SaveThirdplatformConfig.class})
+    @NotBlank(message = "项目协助发送开关状态不能为空", groups = {
+            SaveThirdplatformConfig.class})
     private String sendProjectSwitch;
 
     private List<CustomerSelectedPlatform> customerSelectedPlatformList;
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java
new file mode 100644
index 0000000000..3e08815493
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ThirdPlatformConfigResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ThirdPlatformConfigResultDTO {
+
+    private String sendProjectSwitch;
+    private List<CustomerSelectedPlatform> customerSelectedPlatformList = new ArrayList<CustomerSelectedPlatform>();
+
+    @Data
+    public static class CustomerSelectedPlatform {
+        private String customerId;
+        private String platformId;
+        private String platformName;
+        private String icon;
+    }
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
index aeb93e41c8..de479f7344 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
@@ -25,10 +25,12 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.constant.ParameterKeyConstant;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
 import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
+import com.epmet.dto.result.ThirdPlatformConfigResultDTO;
 import com.epmet.excel.CustomerProjectParameterExcel;
 import com.epmet.service.CustomerProjectParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -161,4 +163,17 @@ public class CustomerProjectParameterController {
         customerProjectParameterService.saveThirdplatformConfig(customerId, sendProjectSwitch, platformList);
         return new Result();
     }
+
+    /**
+     * @Description 保存项目第三方平台的配置
+     * @return
+     * @author wxz
+     * @date 2021.03.19 17:10
+     */
+    @PostMapping("load-thirdplatform-config")
+    public Result<ThirdPlatformConfigResultDTO> loadThirdplatformConfig(@RequestBody ThirdPlatformConfigFormDTO input) {
+        ValidatorUtils.validateEntity(input, ThirdPlatformConfigFormDTO.LoadThirdplatformConfig.class);
+        ThirdPlatformConfigResultDTO resultDTO = customerProjectParameterService.loadThirdplatformConfig(input.getCustomerId(), ParameterKeyConstant.THIRD_PLATFORM_PROJECT_SEND);
+        return new Result<ThirdPlatformConfigResultDTO>().ok(resultDTO);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
index 4f1d6e9ea8..e7473100f0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
@@ -23,6 +23,7 @@ import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
 import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
+import com.epmet.dto.result.ThirdPlatformConfigResultDTO;
 import com.epmet.entity.CustomerProjectParameterEntity;
 
 import java.util.List;
@@ -173,4 +174,6 @@ public interface CustomerProjectParameterService extends BaseService<CustomerPro
     void saveThirdplatformConfig(String customerId,
                                  String sendProjectSwitch,
                                  List<ThirdPlatformConfigFormDTO.CustomerSelectedPlatform> platformList);
+
+    ThirdPlatformConfigResultDTO loadThirdplatformConfig(String customerId, String parameterKey);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index ab36ac3469..3595f23a94 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -21,9 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ParameterKeyConstant;
 import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dao.CustomerProjectParameterDao;
@@ -32,6 +34,8 @@ import com.epmet.dto.form.ParameterFormDTO;
 import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
+import com.epmet.dto.result.ThirdPlatformConfigResultDTO;
+import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.entity.CustomerProjectParameterEntity;
 import com.epmet.feign.ThirdOpenFeignClient;
 import com.epmet.redis.CustomerProjectParameterRedis;
@@ -332,6 +336,44 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
             thirdPlatformFormDTO.setPlatformName(p.getPlatformName());
             return thirdPlatformFormDTO;
         }).collect(Collectors.toList());
-        thirdOpenFeignClient.saveOrUpdateSelectedPlatformsInfo(formDTOS);
+        Result result = thirdOpenFeignClient.saveOrUpdateSelectedPlatformsInfo(formDTOS);
+        if (result == null || !result.success()) {
+            throw new RenException("调用Third服务，保存第三方平台列表失败");
+        }
+    }
+
+    @Override
+    public ThirdPlatformConfigResultDTO loadThirdplatformConfig(String customerId, String parameterKey) {
+        //1.去third取第三方平台列表
+        ThirdPlatformFormDTO form = new ThirdPlatformFormDTO();
+        form.setCustomerId(customerId);
+        form.setActionKey(ThirdPlatformActions.PROJECT_ASSIST);
+        Result<List<ThirdplatformResultDTO>> listResult = thirdOpenFeignClient.listAvailablePlatformsByCustomerAndAction(form);
+
+        if (listResult == null || !listResult.success()) {
+            throw new RenException("调用Third服务，获取第三方平台列表失败");
+        }
+        List<ThirdplatformResultDTO> platforms = listResult.getData();
+
+        // 2.本地查询
+        CustomerProjectParameterEntity params = new CustomerProjectParameterEntity();
+        params.setCustomerId(customerId);
+        params.setParameterKey(parameterKey);
+        String value = baseDao.selectParameterValueByKey(params);
+        value = StringUtils.isBlank(value) ? "0" : value;
+
+        ThirdPlatformConfigResultDTO result = new ThirdPlatformConfigResultDTO();
+        result.setSendProjectSwitch(value);
+
+        platforms.forEach(p -> {
+            ThirdPlatformConfigResultDTO.CustomerSelectedPlatform platform = new ThirdPlatformConfigResultDTO.CustomerSelectedPlatform();
+            platform.setCustomerId(customerId);
+            platform.setIcon(p.getIcon());
+            platform.setPlatformId(p.getPlatformId());
+            platform.setPlatformName(p.getPlatformName());
+            result.getCustomerSelectedPlatformList().add(platform);
+        });
+
+        return result;
     }
 }
\ No newline at end of file

From 5d642275cb4cc28287db0bc9e921d008f27bf1db Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 22 Mar 2021 09:34:38 +0800
Subject: [PATCH 24/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=85=8D=E7=BD=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/feign/ThirdOpenFeignClient.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
index ab5c26cc4b..de647e726e 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
-@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = ThirdOpenFeignClientFallback.class, url = "http://localhost:8110")
 public interface ThirdOpenFeignClient {
 
     /**

From 7f04bad985089655ac140aa1061aff3b1984d74d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 22 Mar 2021 14:58:01 +0800
Subject: [PATCH 25/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=BF=9D=E5=AD=98=E9=80=89=E4=B8=AD=E7=9A=84=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8D=E5=A4=84=E7=90=86=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaveOrUpdateCustSelPlatformFormDTO.java   | 19 +++++++
 .../com/epmet/feign/ThirdOpenFeignClient.java |  3 +-
 .../ThirdOpenFeignClientFallback.java         |  3 +-
 .../java/com/epmet/apiservice/ApiService.java | 40 ++++----------
 .../epmet/apiservice/impl/DemoApiService.java | 10 ++++
 .../impl/LuzhouGridPlatformApiService.java    | 55 ++++++++++++++++++-
 .../result/LZGridPlatformBaseResult.java      | 11 ++++
 .../controller/ThirdPlatformController.java   |  7 ++-
 .../epmet/service/ThirdPlatformService.java   |  2 +-
 .../impl/ThirdPlatformServiceImpl.java        | 21 +++----
 .../CustomerProjectParameterServiceImpl.java  | 10 +++-
 11 files changed, 130 insertions(+), 51 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveOrUpdateCustSelPlatformFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformBaseResult.java

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveOrUpdateCustSelPlatformFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveOrUpdateCustSelPlatformFormDTO.java
new file mode 100644
index 0000000000..5ba026cd80
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveOrUpdateCustSelPlatformFormDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class SaveOrUpdateCustSelPlatformFormDTO {
+
+    @NotBlank(message = "客户id不能为空")
+    private String customerId;
+
+    @NotBlank(message = "actionKey不能为空")
+    private String actionKey;
+
+    private List<ThirdPlatformFormDTO> platforms;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
index de647e726e..4a139daabd 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallback;
@@ -22,7 +23,7 @@ public interface ThirdOpenFeignClient {
      * @date 2021.03.19 15:25
      */
     @PostMapping("/third/thirdplatform/customer/saveorupdate-selected-platforms")
-    Result saveOrUpdateSelectedPlatformsInfo(@RequestBody List<ThirdPlatformFormDTO> input);
+    Result saveOrUpdateSelectedPlatformsInfo(@RequestBody SaveOrUpdateCustSelPlatformFormDTO input);
 
     /**
      * 根据客户id和动作，列出客户在指定动作下可用的第三方平台
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
index 9322354512..57a9c808c3 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
@@ -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.form.SaveOrUpdateCustSelPlatformFormDTO;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.ThirdOpenFeignClient;
@@ -13,7 +14,7 @@ import java.util.List;
 @Component
 public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
     @Override
-    public Result saveOrUpdateSelectedPlatformsInfo(List<ThirdPlatformFormDTO> input) {
+    public Result saveOrUpdateSelectedPlatformsInfo(SaveOrUpdateCustSelPlatformFormDTO input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveOrUpdateSelectedPlatformsInfo", input);
     }
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 6debb8dac2..7aff23fd7a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -77,6 +77,7 @@ public abstract class ApiService {
         if (result.success()) {
             throw new RenException("请求第三方平台，获取AccessToken失败。");
         }
+        judgeResultSuccess(result.getData());
         return result.getData();
     }
 
@@ -114,42 +115,17 @@ public abstract class ApiService {
         if (result.success()) {
             throw new RenException("请求第三方平台，获取AccessToken失败。");
         }
+        judgeResultSuccess(result.getData());
         return result.getData();
     }
 
     /**
-     * @Description 获取accessToken
+     * @Description 获取accessToken，由子类具体实现
      * @return
      * @author wxz
      * @date 2021.03.16 13:45
     */
-    private String getAccessToken(String platformId) {
-        RedisTemplate<String, String> rt = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
-        String token = rt.opsForValue().get(RedisKeys.getThirdPlatformAccessTokenKey(platformId));
-        if (StringUtils.isBlank(token)) {
-            ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
-            ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
-                    .getByPlatformIdAndActionKey(platformId, ThirdPlatformActions.GET_ACCESS_TOKEN);
-
-            String baseUrl = thirdplatform.getBaseUrl();
-            String platformKey = thirdplatform.getPlatformKey();
-            String platformSecret = thirdplatform.getPlatformSecret();
-
-            HashMap<String, Object> params = new HashMap<>();
-            params.put("appKey", platformKey);
-            params.put("appSecret", platformSecret);
-            Result<String> result = HttpClientManager.getInstance().sendGet(baseUrl.concat(actionEntity.getApiUrl()), params);
-            if (result == null) {
-                throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
-            }
-            if (result.success()) {
-                throw new RenException("请求第三方平台，获取AccessToken失败。");
-            }
-            token = result.getData();
-            rt.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), token);
-        }
-        return token;
-    }
+    public abstract String getAccessToken(String platformId);
 
     /**
      * @Description 判断客户是否注册了指定的平台，如果没有注册，则抛出异常
@@ -182,4 +158,12 @@ public abstract class ApiService {
     public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         return null;
     }
+
+    /**
+     * @Description 判断第三方平台返回结果成功失败。如果失败，则抛出异常
+     * @return
+     * @author wxz
+     * @date 2021.03.22 10:32
+    */
+    public abstract void judgeResultSuccess(String stringData);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
index 94c3127d00..1a1e00cd4e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
@@ -20,9 +20,19 @@ public class DemoApiService extends ApiService {
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
+    @Override
+    public String getAccessToken(String platformId) {
+        return null;
+    }
+
     @Override
     public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         logger.info("DemoApiService发送项目协助到第三方平台成功");
         return null;
     }
+
+    @Override
+    public void judgeResultSuccess(String stringData) {
+
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index d4c062bb09..026b40654d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -2,24 +2,68 @@ package com.epmet.apiservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
+import com.epmet.apiservice.result.LZGridPlatformBaseResult;
 import com.epmet.apiservice.result.LZGridPlatformProjectAssistResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.constant.ThirdPlatformActions;
+import com.epmet.dao.ThirdplatformActionDao;
+import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.entity.ThirdplatformActionEntity;
+import com.epmet.entity.ThirdplatformEntity;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+
 /**
  * 泸州网格化平台ApiService
  */
 @Component("luzhouGridPlatformApiService")
 public class LuzhouGridPlatformApiService extends ApiService {
 
+    @Override
+    public String getAccessToken(String platformId) {
+        RedisTemplate<String, String> rt = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
+        String token = rt.opsForValue().get(RedisKeys.getThirdPlatformAccessTokenKey(platformId));
+        if (StringUtils.isBlank(token)) {
+            ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
+            ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
+                    .getByPlatformIdAndActionKey(platformId, ThirdPlatformActions.GET_ACCESS_TOKEN);
+
+            String baseUrl = thirdplatform.getBaseUrl();
+            String platformKey = thirdplatform.getPlatformKey();
+            String platformSecret = thirdplatform.getPlatformSecret();
+
+            HashMap<String, Object> params = new HashMap<>();
+            params.put("appKey", platformKey);
+            params.put("appSecret", platformSecret);
+            Result<String> result = HttpClientManager.getInstance().sendGet(baseUrl.concat(actionEntity.getApiUrl()), params);
+            if (result == null) {
+                throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
+            }
+            if (!result.success()) {
+                throw new RenException("请求第三方平台，获取AccessToken失败。");
+            }
+            judgeResultSuccess(result.getData());
+            token = result.getData();
+            rt.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), token);
+        }
+        return token;
+    }
+
     @Override
     public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String platformId = formDTO.getPlatformId();
 
         // 正式调用第三方平台
-        //String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
+        //String result1 = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
 
         // 开发阶段临时写死
         String result = "{\"eventId\":\"test-task-id\"}";
@@ -36,4 +80,13 @@ public class LuzhouGridPlatformApiService extends ApiService {
         System.out.println("泸州网格化平台项目协助发送成功");
         return projectAssistResult;
     }
+
+    @Override
+    public void judgeResultSuccess(String stringData) {
+        //LZGridPlatformBaseResult;
+        LZGridPlatformBaseResult result = JSON.parseObject(stringData, LZGridPlatformBaseResult.class);
+        if (!"200".equalsIgnoreCase(result.getCode())) {
+            throw new RenException("泸州网格化平台：返回失败结果，错误码:" + result.getCode());
+        }
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformBaseResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformBaseResult.java
new file mode 100644
index 0000000000..c0f4ed190a
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/result/LZGridPlatformBaseResult.java
@@ -0,0 +1,11 @@
+package com.epmet.apiservice.result;
+
+import lombok.Data;
+
+@Data
+public class LZGridPlatformBaseResult<R> {
+    private Boolean success;
+    private String code;
+    private R result;
+    // 有其他内容可直接写上
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
index 9288625bee..f0bdb4d5ab 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.service.ThirdPlatformService;
@@ -83,9 +84,9 @@ public class ThirdPlatformController {
      * @date 2021.03.19 15:25
     */
     @PostMapping("customer/saveorupdate-selected-platforms")
-    public Result saveOrUpdateSelectedPlatformsInfo(@RequestBody List<ThirdPlatformFormDTO> input) {
-        input.stream().forEach(i -> ValidatorUtils.validateEntity(i, ThirdPlatformFormDTO.SaveOrUpdateSelectedPlatformInfo.class));
-        thirdPlatformService.saveOrUpdateSelectedPlatformInfo(input);
+    public Result saveOrUpdateSelectedPlatformsInfo(@RequestBody SaveOrUpdateCustSelPlatformFormDTO input) {
+        ValidatorUtils.validateEntity(input);
+        thirdPlatformService.saveOrUpdateSelectedPlatformInfo(input.getCustomerId(), input.getActionKey(), input.getPlatforms());
         return new Result();
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
index add4c63a2a..9a0042f6e7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -21,5 +21,5 @@ public interface ThirdPlatformService {
 
     void updateCustomizePlatformInfo(ThirdPlatformFormDTO input);
 
-    void saveOrUpdateSelectedPlatformInfo(List<ThirdPlatformFormDTO> platforms);
+    void saveOrUpdateSelectedPlatformInfo(String customerId, String actionKey, List<ThirdPlatformFormDTO> platforms);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
index 39d3e33cae..7e92c34223 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -70,26 +70,19 @@ public class ThirdPlatformServiceImpl implements ThirdPlatformService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void saveOrUpdateSelectedPlatformInfo(List<ThirdPlatformFormDTO> platforms) {
-        if (CollectionUtils.isEmpty(platforms)) {
-            return;
-        }
-
+    public void saveOrUpdateSelectedPlatformInfo(String customerId, String actionKey, List<ThirdPlatformFormDTO> platforms) {
         // 1.物理删除客户-action所有对应关系
-        int deletedCount = thirdplatformCustomerActionDao.deleteByCustomerIdAndActionKey(platforms.get(0).getCustomerId(), platforms.get(0).getActionKey());
+        thirdplatformCustomerActionDao.deleteByCustomerIdAndActionKey(customerId, actionKey);
 
         platforms.stream().forEach(pt -> {
-            String customerId = pt.getCustomerId();
-            String platformId = pt.getPlatformId();
-
             // 2.更新用户自定义的平台信息
-            updateThirdPlatformCustomerRegInfo(pt);
+            updateThirdPlatformCustomerRegInfo(customerId, pt);
 
             // 3.重新建立customer-platform-action对应关系
             ThirdplatformCustomerActionEntity tpcaEntity = new ThirdplatformCustomerActionEntity();
-            tpcaEntity.setPlatformId(platformId);
+            tpcaEntity.setPlatformId(pt.getPlatformId());
             tpcaEntity.setCustomerId(customerId);
-            tpcaEntity.setActionKey(pt.getActionKey());
+            tpcaEntity.setActionKey(actionKey);
             thirdplatformCustomerActionDao.insert(tpcaEntity);
         });
 
@@ -101,10 +94,10 @@ public class ThirdPlatformServiceImpl implements ThirdPlatformService {
      * @author wxz
      * @date 2021.03.19 15:22
     */
-    private void updateThirdPlatformCustomerRegInfo(ThirdPlatformFormDTO platformFormDTO) {
+    private void updateThirdPlatformCustomerRegInfo(String customerId, ThirdPlatformFormDTO platformFormDTO) {
         LambdaQueryWrapper<ThirdplatformCustomerRegisterEntity> conditions = new QueryWrapper<ThirdplatformCustomerRegisterEntity>()
                 .lambda()
-                .eq(ThirdplatformCustomerRegisterEntity::getCustomerId, platformFormDTO.getCustomerId())
+                .eq(ThirdplatformCustomerRegisterEntity::getCustomerId, customerId)
                 .eq(ThirdplatformCustomerRegisterEntity::getPlatformId, platformFormDTO.getPlatformId());
 
         ThirdplatformCustomerRegisterEntity entity = new ThirdplatformCustomerRegisterEntity();
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index 3595f23a94..6142562041 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -31,6 +31,7 @@ import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dao.CustomerProjectParameterDao;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
+import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
 import com.epmet.dto.form.ThirdPlatformConfigFormDTO;
 import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
@@ -327,7 +328,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         // 1.本地执行配置更新
         saveThirdPlatformSendProjectSwitch(customerId, sendProjectSwitch);
         // 2.调用远程third服务，更新或新增客户-平台-等信息  ThirdPlatformFormDTO thirdPlatformFormDTO = new ThirdPlatformFormDTO();
-        List<ThirdPlatformFormDTO> formDTOS = platformList.stream().map(p -> {
+        List<ThirdPlatformFormDTO> platforms = platformList.stream().map(p -> {
             ThirdPlatformFormDTO thirdPlatformFormDTO = new ThirdPlatformFormDTO();
             thirdPlatformFormDTO.setActionKey(ThirdPlatformActions.PROJECT_ASSIST);
             thirdPlatformFormDTO.setCustomerId(customerId);
@@ -336,7 +337,12 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
             thirdPlatformFormDTO.setPlatformName(p.getPlatformName());
             return thirdPlatformFormDTO;
         }).collect(Collectors.toList());
-        Result result = thirdOpenFeignClient.saveOrUpdateSelectedPlatformsInfo(formDTOS);
+
+        SaveOrUpdateCustSelPlatformFormDTO form = new SaveOrUpdateCustSelPlatformFormDTO();
+        form.setPlatforms(platforms);
+        form.setCustomerId(customerId);
+        form.setActionKey(ThirdPlatformActions.PROJECT_ASSIST);
+        Result result = thirdOpenFeignClient.saveOrUpdateSelectedPlatformsInfo(form);
         if (result == null || !result.success()) {
             throw new RenException("调用Third服务，保存第三方平台列表失败");
         }

From f04ac459e287fb96f140d91dfccd9b2f727a94f2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 22 Mar 2021 16:12:33 +0800
Subject: [PATCH 26/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20sql?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.7__platform.sql         | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql
new file mode 100644
index 0000000000..e4b723ea22
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql
@@ -0,0 +1,50 @@
+CREATE TABLE `project_sub_process` (
+                                       `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+                                       `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                                       `PROJECT_ID` varchar(64) NOT NULL COMMENT '项目ID',
+                                       `PROCESS_ID` varchar(64) NOT NULL COMMENT '节点ID',
+                                       `PROJECT_STAFF_ID` varchar(64) NOT NULL COMMENT '项目人员关联表ID：project_staff.id',
+                                       `PLATFORM_ID` varchar(64) NOT NULL COMMENT '系统ID',
+                                       `PLATFORM_NAME` varchar(32) NOT NULL COMMENT '系统名',
+                                       `TASK_ID` varchar(32) NOT NULL COMMENT '第三方平台返回的项目关联ID（事件Id）',
+                                       `RESULT` varchar(1024) DEFAULT NULL COMMENT '事件处理详细内容',
+                                       `EXTERNAL_STATUS` varchar(16) DEFAULT NULL COMMENT '外部状态:1待处理,2待核实,3已上报,4已完结,5处理中,6待分发,7归档,8催办,9超时',
+                                       `EXTERNAL_STATUS_DESC` varchar(32) DEFAULT NULL COMMENT '外部状态描述',
+                                       `INTERNAL_STATUS` varchar(16) DEFAULT NULL COMMENT '内部状态:待处理 pending，结案closed',
+                                       `HANDLE_DATE` datetime DEFAULT NULL COMMENT '处理日期',
+                                       `HANDLE_USER_NAME` varchar(32) DEFAULT NULL COMMENT '处理人姓名',
+                                       `DEL_FLAG` int(1) NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
+                                       `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                       `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                       `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                       `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                       `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                       PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='节点事件关联表 ';
+
+CREATE TABLE `project_sub_attachment` (
+                                          `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+                                          `PROJECT_ID` varchar(64) NOT NULL COMMENT '项目ID',
+                                          `SUB_ID` varchar(64) NOT NULL COMMENT '子节点ID，project_sub_process.id',
+                                          `TASK_ID` varchar(64) NOT NULL COMMENT '第三方平台返回的项目关联ID（事件Id）',
+                                          `ATTACHMENT_NAME` varchar(128) DEFAULT NULL COMMENT '附件名',
+                                          `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小 单位b',
+                                          `ATTACHMENT_FORMAT` varchar(32) DEFAULT NULL COMMENT '文件格式',
+                                          `ATTACHMENT_TYPE` varchar(32) DEFAULT NULL COMMENT '类型',
+                                          `ATTACHMENT_URL` varchar(256) DEFAULT NULL COMMENT '附件地址',
+                                          `DURATION` int(11) DEFAULT NULL COMMENT '语音或视频时长，秒',
+                                          `SORT` int(11) NOT NULL COMMENT '排序',
+                                          `DEL_FLAG` int(1) NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
+                                          `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                          `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                          `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                          `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                          `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                          PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='外部系统事件附件 ';
+
+ALTER TABLE `project_process`
+    ADD COLUMN `IS_SEND` int(1) NOT NULL DEFAULT 0 COMMENT '是否发送到外部系统 0否 1是' AFTER `END_TIME`;
+
+INSERT INTO `customer_project_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1006', 'default', 'third_platform_project_send', '发送外部系统项目协助开关', '0', '0：关（默认）  1：开 ', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');

From 0b0470e84eae17190898f79151028ac4deacd689 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 22 Mar 2021 16:26:41 +0800
Subject: [PATCH 27/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20sql?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/ProjectDetailDTO.java     | 11 ++++++++++-
 .../com/epmet/service/impl/ProjectServiceImpl.java    | 11 +++++++++--
 .../{V0.0.7__platform.sql => V0.0.8__platform.sql}    |  0
 3 files changed, 19 insertions(+), 3 deletions(-)
 rename epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/{V0.0.7__platform.sql => V0.0.8__platform.sql} (100%)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
index a3fa6c0ae7..8fb394aa93 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.util.List;
@@ -67,8 +68,16 @@ public class ProjectDetailDTO implements Serializable {
 
 	/**
 	 * 话题发表人电话
-	 * */
+	 */
 	private String topicPublisherMobile;
+	/**
+	 * 公开答复
+	 */
+	private String publicReply;
+	/**
+	 * 内部备注
+	 */
+	private String internalRemark;
 
 	@Override
 	public String toString() {
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 3429a814b6..5a6ffdd448 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
@@ -2075,9 +2075,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(imageList)) {
 				applyAssistFormDTO.setVideoLink(String.join(StrConstant.COMMA, videoList));
 			}
-
 		}
-
+		//获取工作人员信息
+		Result<CustomerStaffDTO> staffInfo = epmetUserOpenFeignClient.getCustomerStaff(formDTO.getUserId());
+		if (!staffInfo.success()) {
+			throw new RenException(staffInfo.getCode(), staffInfo.getMsg());
+		}
+		applyAssistFormDTO.setPersonName(staffInfo.getData().getRealName());
+		applyAssistFormDTO.setMobile(staffInfo.getData().getMobile());
 		//获取网格信息
 		List<ProjectRelatedPersonnelDTO> relatedPersonnel =  projectRelatedPersonnelService.getPersonnelListByProjectId(formDTO.getProjectId());
 		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
@@ -2098,6 +2103,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		ProjectDetailDTO projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData(), ProjectDetailDTO.class);
 		projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData().getTopicInfo(), ProjectDetailDTO.class);
+		projectDetailDTO.setPublicReply(formDTO.getPublicReply());
+		projectDetailDTO.setInternalRemark(formDTO.getInternalRemark());
 		applyAssistFormDTO.setDetail(projectDetailDTO.toString());
 		applyAssistFormDTO.setDetailAddress(projectDetailDTO.getBelongsGridName());
 		Result result = epmetThirdOpenFeignClient.applyAssist(applyAssistFormDTO);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql
similarity index 100%
rename from epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql
rename to epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql

From 0a174b88a7e05bf563e6791a06e5fc66a84790e4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 22 Mar 2021 17:50:28 +0800
Subject: [PATCH 28/51] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ProjectDetailResultDTO.java    |  5 ++++
 .../service/impl/ProjectServiceImpl.java      | 24 ++++++++++---------
 2 files changed, 18 insertions(+), 11 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 61c23453d9..0b1cb8d020 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
@@ -70,6 +70,11 @@ public class ProjectDetailResultDTO implements Serializable {
 	 */
 	private List<String> platformIds;
 
+	public ProjectDetailResultDTO() {
+		this.processable = false;
+		this.isSend = false;
+	}
+
 	@NoArgsConstructor
 	@Data
 	public static class DepartmentNameListBean {
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 5a6ffdd448..5b5a1c1988 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
@@ -310,20 +310,22 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
 				//TODO external_system值为1时，根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录，
 				// 如果没有记录或者INTERNAL_STATUS是closed，processable的值为true
-				if (parameterValue.equals(NumConstant.ONE_STR)) {
-					List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
-					// 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录
-					ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.selectSubProcess(projectStaffIds);
-					if (null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) {
-						resultDTO.setProcessable(true);
-						resultDTO.setIsSend(true);
+				if (StringUtils.isNotEmpty(parameterValue)){
+					if (parameterValue.equals(NumConstant.ONE_STR)) {
+						List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
+						// 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录
+						ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.selectSubProcess(projectStaffIds);
+						if (null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) {
+							resultDTO.setProcessable(true);
+							resultDTO.setIsSend(true);
+						} else {
+							resultDTO.setProcessable(false);
+							resultDTO.setIsSend(false);
+						}
 					} else {
-						resultDTO.setProcessable(false);
+						resultDTO.setProcessable(true);
 						resultDTO.setIsSend(false);
 					}
-				} else {
-					resultDTO.setProcessable(true);
-					resultDTO.setIsSend(false);
 				}
 			} else {
 				resultDTO.setProcessable(false);

From 45de6c7e2b8f9b50d85b33eaaa712b5aebf8b5d3 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 22 Mar 2021 17:55:30 +0800
Subject: [PATCH 29/51] =?UTF-8?q?=E9=80=BB=E8=BE=91=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/service/impl/ProjectServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5b5a1c1988..63d3dacc1d 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
@@ -297,7 +297,6 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
 		// 查询当前流转到外部系统的ID
 		resultDTO.setPlatformIds(projectProcessService.selectPlatFormIds(fromDTO.getProjectId()));
-		resultDTO.setIsSend((StringUtils.isEmpty(parameterValue) || parameterValue.equals(NumConstant.ZERO_STR)) ? false : resultDTO.getProcessable());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
 			resultDTO.setReturnable(false);
@@ -329,6 +328,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				}
 			} else {
 				resultDTO.setProcessable(false);
+				resultDTO.setIsSend(false);
 			}
 			ReturnListFromDTO returnListFromDTO = new ReturnListFromDTO();
 			returnListFromDTO.setProjectId(fromDTO.getProjectId());

From f7cc19944d0483b6284e21a6f2b66a91f6819015 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 23 Mar 2021 09:34:37 +0800
Subject: [PATCH 30/51] =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=9A=201.oper=5Fcr?=
 =?UTF-8?q?m=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84list=5Fby=5Fcustomer?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ProjectDetailResultDTO.java |  1 -
 .../com/epmet/feign/OperCrmOpenFeignClient.java  |  9 ---------
 .../fallback/OperCrmOpenFeignClientFallback.java |  5 -----
 .../com/epmet/controller/CustomerController.java | 13 -------------
 .../CustomerThirdplatApiServiceService.java      |  7 -------
 .../CustomerThirdplatApiServiceServiceImpl.java  | 16 ----------------
 6 files changed, 51 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 0b1cb8d020..cd3c278259 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
@@ -11,7 +11,6 @@ import java.util.List;
  * @dscription
  * @date 2020/5/11 15:33
  */
-@NoArgsConstructor
 @Data
 public class ProjectDetailResultDTO implements Serializable {
 
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
index f4dec72cac..0f4313dfad 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
@@ -122,13 +122,4 @@ public interface OperCrmOpenFeignClient {
 	 **/
 	@GetMapping("/oper/crm/customer/getallsubcustomerids/{customerId}")
     Result<List<String>> getAllSubCustomerIds(@PathVariable("customerId") String customerId);
-
-	/**
-	 * @Description 根据客户id列出该客户所有的apiService
-	 * @return
-	 * @author wxz
-	 * @date 2021.03.15 15:13
-	 */
-	@PostMapping("list-apiservice-by-customerid")
-	Result<List<ThirdplatApiserviceResultDTO>> listApiServiceByCustomerId(@RequestBody ApiServiceFormDTO form);
 }
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
index 134ffcb242..5de09ce167 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
@@ -95,9 +95,4 @@ public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient {
 	public Result<List<String>> getAllSubCustomerIds(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getAllSubCustomerIds", customerId);
 	}
-
-	@Override
-	public Result<List<ThirdplatApiserviceResultDTO>> listApiServiceByCustomerId(ApiServiceFormDTO form) {
-		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "listApiServiceByCustomerId", form);
-	}
 }
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 461c06f3f6..c5330a9abd 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
@@ -376,17 +376,4 @@ public class CustomerController {
 		}
 		return new Result<>();
 	}
-
-	/**
-	 * @Description 根据客户id列出该客户所有的apiService
-	 * @return
-	 * @author wxz
-	 * @date 2021.03.15 15:13
-	*/
-	@PostMapping("list-apiservice-by-customerid")
-	public Result<List<ThirdplatApiserviceResultDTO>> listApiServiceByCustomerId(@RequestBody ApiServiceFormDTO form) {
-		ValidatorUtils.validateEntity(form, ApiServiceFormDTO.GetByCustomerId.class);
-		String customerId = form.getCustomerId();
-		return new Result<List<ThirdplatApiserviceResultDTO>>().ok(customerThirdplatApiServiceService.listByCustomerId(customerId));
-	}
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
index eb6adbe6ec..59a9876535 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
@@ -15,11 +15,4 @@ public interface CustomerThirdplatApiServiceService {
     */
     ThirdplatApiserviceResultDTO getByCustomerId(String customerId);
 
-    /**
-     * 根据客户id列出第三方平台列表
-     * @param customerId
-     * @return
-     */
-    List<ThirdplatApiserviceResultDTO> listByCustomerId(String customerId);
-
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
index 9613f30f60..f5ff00ca39 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
@@ -25,10 +25,6 @@ public class CustomerThirdplatApiServiceServiceImpl implements CustomerThirdplat
     @Autowired
     private CustomerThirdplatApiserviceDao thirdplatApiserviceDao;
 
-    @Autowired
-    private RedisTemplate<String, ThirdplatApiserviceResultDTO> tpasRedisTemplate;
-
-
     @Override
     public ThirdplatApiserviceResultDTO getByCustomerId(String customerId) {
         ThirdplatApiserviceResultDTO apiService = null;
@@ -46,16 +42,4 @@ public class CustomerThirdplatApiServiceServiceImpl implements CustomerThirdplat
 
         return apiService;
     }
-
-    @Override
-    public List<ThirdplatApiserviceResultDTO> listByCustomerId(String customerId) {
-        List<ThirdplatApiserviceResultDTO> apiServices = tpasRedisTemplate.opsForList().range(RedisKeys.listCustomerApiServiceListKey(customerId), 0, -1);
-        if (!CollectionUtils.isEmpty(apiServices)) {
-            return apiServices;
-        }
-
-        apiServices = thirdplatApiserviceDao.listByCustomerId(customerId);
-        tpasRedisTemplate.opsForList().rightPushAll(RedisKeys.listCustomerApiServiceListKey(customerId), apiServices);
-        return apiServices;
-    }
 }

From ed2e3ff8e29eb2bcfda72b83646dbae51b4e33bc Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 24 Mar 2021 15:16:26 +0800
Subject: [PATCH 31/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9AApiService?=
 =?UTF-8?q?=E5=9F=BA=E7=B1=BB=E4=B8=AD=E7=9A=84=E4=B8=80=E4=BA=9B=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=9A=84=E5=BC=82=E5=B8=B8=E6=96=87=E6=A1=88=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=94=BE=E5=BC=80=E4=BA=86=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E7=BD=91=E6=A0=BC=E5=8C=96=E5=B9=B3=E5=8F=B0=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=20=E8=B0=83=E9=80=9A=E4=BA=86=E5=AF=B9?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=8C=96=E5=B9=B3=E5=8F=B0=E7=9A=84=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/apiservice/ApiService.java | 21 ++++++++++---------
 .../epmet/apiservice/impl/DemoApiService.java |  6 ++----
 .../impl/LuzhouGridPlatformApiService.java    | 21 ++++++++++++-------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 7aff23fd7a..ef54d00d93 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -1,12 +1,12 @@
 package com.epmet.apiservice;
 
+import com.alibaba.fastjson.JSON;
+import com.epmet.apiservice.result.LZGridPlatformBaseResult;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
-import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dao.ThirdplatformActionDao;
 import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
@@ -15,8 +15,6 @@ import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.entity.ThirdplatformEntity;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -77,7 +75,8 @@ public abstract class ApiService {
         if (result.success()) {
             throw new RenException("请求第三方平台，获取AccessToken失败。");
         }
-        judgeResultSuccess(result.getData());
+        LZGridPlatformBaseResult platformResult = JSON.parseObject(result.getData(), LZGridPlatformBaseResult.class);
+        judgeResultSuccess(platformResult);
         return result.getData();
     }
 
@@ -110,12 +109,14 @@ public abstract class ApiService {
                 headers);
 
         if (result == null) {
-            throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
+            throw new RenException("请求第三方平台，发送Post请求失败。result为null");
         }
-        if (result.success()) {
-            throw new RenException("请求第三方平台，获取AccessToken失败。");
+        if (!result.success()) {
+            throw new RenException("请求第三方平台，发送Post请求失败。错误信息:" + result.getMsg());
         }
-        judgeResultSuccess(result.getData());
+
+        LZGridPlatformBaseResult platformResult = JSON.parseObject(result.getData(), LZGridPlatformBaseResult.class);
+        judgeResultSuccess(platformResult);
         return result.getData();
     }
 
@@ -165,5 +166,5 @@ public abstract class ApiService {
      * @author wxz
      * @date 2021.03.22 10:32
     */
-    public abstract void judgeResultSuccess(String stringData);
+    public abstract void judgeResultSuccess(LZGridPlatformBaseResult result);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
index 1a1e00cd4e..63f718a0d5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
@@ -1,6 +1,7 @@
 package com.epmet.apiservice.impl;
 
 import com.epmet.apiservice.ApiService;
+import com.epmet.apiservice.result.LZGridPlatformBaseResult;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.feign.OperCrmOpenFeignClient;
@@ -17,9 +18,6 @@ public class DemoApiService extends ApiService {
 
     Logger logger = LoggerFactory.getLogger(DemoApiService.class);
 
-    @Autowired
-    private OperCrmOpenFeignClient operCrmOpenFeignClient;
-
     @Override
     public String getAccessToken(String platformId) {
         return null;
@@ -32,7 +30,7 @@ public class DemoApiService extends ApiService {
     }
 
     @Override
-    public void judgeResultSuccess(String stringData) {
+    public void judgeResultSuccess(LZGridPlatformBaseResult result) {
 
     }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 026b40654d..25586f743a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -45,14 +45,19 @@ public class LuzhouGridPlatformApiService extends ApiService {
             params.put("appKey", platformKey);
             params.put("appSecret", platformSecret);
             Result<String> result = HttpClientManager.getInstance().sendGet(baseUrl.concat(actionEntity.getApiUrl()), params);
+
             if (result == null) {
                 throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
             }
+
             if (!result.success()) {
                 throw new RenException("请求第三方平台，获取AccessToken失败。");
             }
-            judgeResultSuccess(result.getData());
-            token = result.getData();
+
+            LZGridPlatformBaseResult<String> platformResult = JSON.parseObject(result.getData(), LZGridPlatformBaseResult.class);
+            judgeResultSuccess(platformResult);
+
+            token = platformResult.getResult();
             rt.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), token);
         }
         return token;
@@ -63,28 +68,28 @@ public class LuzhouGridPlatformApiService extends ApiService {
         String platformId = formDTO.getPlatformId();
 
         // 正式调用第三方平台
-        //String result1 = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
+        String argsStr = JSON.toJSONString(formDTO);
+        String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, argsStr, null);
 
         // 开发阶段临时写死
-        String result = "{\"eventId\":\"test-task-id\"}";
+        //String result = "{\"eventId\":\"test-task-id\"}";
         ProjectAssistResult projectAssistResult = new ProjectAssistResult();
         if (!StringUtils.isBlank(result)) {
             // 此处要经过一系列业务处理，将第三方平台返回的数据进行解析，等处理最后转换成ProjectAssistResult类型，返回。ProjectAssistResult这个类型是
             // 所有apiService的projectAssist方法返回值的统一类型，是我们的epmet-cloud所需要的数据的实体，
             // 所有apiService都要想办法转化成这个类型。
-            LZGridPlatformProjectAssistResult lzResult = JSON.parseObject(result, LZGridPlatformProjectAssistResult.class);
+            LZGridPlatformBaseResult<String> lzResult = JSON.parseObject(result, LZGridPlatformBaseResult.class);
 
             // 此处设置为第三方系统返回的唯一id
-            projectAssistResult.setTaskId(lzResult.getEventId());
+            projectAssistResult.setTaskId(lzResult.getResult());
         }
         System.out.println("泸州网格化平台项目协助发送成功");
         return projectAssistResult;
     }
 
     @Override
-    public void judgeResultSuccess(String stringData) {
+    public void judgeResultSuccess(LZGridPlatformBaseResult result) {
         //LZGridPlatformBaseResult;
-        LZGridPlatformBaseResult result = JSON.parseObject(stringData, LZGridPlatformBaseResult.class);
         if (!"200".equalsIgnoreCase(result.getCode())) {
             throw new RenException("泸州网格化平台：返回失败结果，错误码:" + result.getCode());
         }

From e1dfc04a5c2316c4885ab86c66c181193b3f66d6 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 24 Mar 2021 15:25:29 +0800
Subject: [PATCH 32/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20detail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/EpmetThirdOpenFeignClient.java      |   2 +-
 .../EpmetThirdOpenFeignClientFallback.java    |   2 +-
 .../epmet/controller/ProjectController.java   |   4 +-
 .../com/epmet/constant/ProjectConstant.java   |   2 +-
 .../epmet/controller/ProjectController.java   |   5 +
 .../service/impl/ProjectServiceImpl.java      | 107 ++++++++++++++++--
 .../group/feign/ResiGroupOpenFeignClient.java |   9 ++
 .../ResiGroupOpenFeignClientFallback.java     |  10 ++
 8 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
index 0e2b93e4d3..9497f1bed8 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
@@ -36,6 +36,6 @@ public interface EpmetThirdOpenFeignClient {
 	 * @date 2021/3/18 11:08
 	 */
 	@PostMapping("third/project/apply-assist")
-	Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO);
+	Result<ProjectAssistResult> applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO);
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
index 10abcf6992..05c0d52fd7 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
@@ -32,7 +32,7 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli
 	 * @date 2021/3/18 11:08
 	 */
 	@Override
-	public Result applyAssist(ProjectApplyAssistFormDTO formDTO) {
+	public Result<ProjectAssistResult> applyAssist(ProjectApplyAssistFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "applyAssist", formDTO);
 	}
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index 0b32b9c2dd..699f70ec34 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -44,10 +44,10 @@ public class ProjectController {
      * @date 2021.03.15 21:13
     */
     @PostMapping("apply-assist")
-    public Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO) {
+    public Result<ProjectAssistResult> applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         ProjectAssistResult projectAssistResult = projectService.applyAssist(formDTO);
-        return new Result().ok(projectAssistResult);
+        return new Result<ProjectAssistResult>().ok(projectAssistResult);
     }
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index 6bae43e57b..4a8696fa01 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -159,5 +159,5 @@ public interface ProjectConstant {
 
 	String NOT_EXIST_PROJECT = "未查询带此项目信息......";
 
-	String EXTERNAL_SYSTEM = "external_system";
+	String EXTERNAL_SYSTEM = "third_platform_project_send";
 }
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 05fe6c04b4..60257a5e4d 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
@@ -217,4 +217,9 @@ public class ProjectController {
         }
         return new Result<>();
     }
+    @PostMapping("platformcallback")
+    public Result platformCallBack(@RequestBody PlatformCallBackFormDTO formDTO) {
+        projectService.platformCallBack(formDTO);
+        return new Result();
+    }
 }
\ 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 63d3dacc1d..73c293d828 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
@@ -45,9 +45,14 @@ import com.epmet.entity.*;
 import com.epmet.feign.*;
 import com.epmet.redis.ProjectRedis;
 import com.epmet.resi.group.constant.TopicConstant;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.service.*;
 import com.github.pagehelper.PageHelper;
+import com.google.common.base.Joiner;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.apache.commons.collections4.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
@@ -115,6 +120,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private EpmetThirdOpenFeignClient epmetThirdOpenFeignClient;
 	@Autowired
 	private GovOrgOpenFeignClient govOrgOpenFeignClient;
+	@Autowired
+	private ProjectTraceService projectTraceService;
+	@Autowired
+	private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
 
 
 	private final static String ONE_DAY = "<1";
@@ -325,6 +334,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 						resultDTO.setProcessable(true);
 						resultDTO.setIsSend(false);
 					}
+				} else {
+					resultDTO.setProcessable(true);
+					resultDTO.setIsSend(false);
 				}
 			} else {
 				resultDTO.setProcessable(false);
@@ -2061,6 +2073,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectApplyAssistFormDTO applyAssistFormDTO = new ProjectApplyAssistFormDTO();
 		applyAssistFormDTO.setCustomerId(projectStaff.getCustomerId());
 		applyAssistFormDTO.setPlatformId(formDTO.getPlatformId());
+		applyAssistFormDTO.setTitle(projectEntity.getTitle());
+
 		if (CollectionUtils.isNotEmpty(formDTO.getInternalFile())) {
 			List<String> imageList =
 					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.IMAGE.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
@@ -2089,13 +2103,6 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		List<ProjectRelatedPersonnelDTO> relatedPersonnel =  projectRelatedPersonnelService.getPersonnelListByProjectId(formDTO.getProjectId());
 		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
 		customerGridFormDTO.setGridId(relatedPersonnel.get(0).getGridId());
-		Result<CustomerGridDTO> gridResult =  govOrgOpenFeignClient.getCustomerGridByGridId(customerGridFormDTO);
-		if (!gridResult.success()) {
-			throw new RenException(gridResult.getCode(), gridResult.getMsg());
-		}
-		applyAssistFormDTO.setLatitude(gridResult.getData().getLatitude());
-		applyAssistFormDTO.setLongitude(gridResult.getData().getLongitude());
-
 		//获取议题详情
 		IssueDetailFormDTO issueDetailFormDTO = new IssueDetailFormDTO();
 		issueDetailFormDTO.setIssueId(projectEntity.getOriginId());
@@ -2103,18 +2110,44 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (!issueDetail.success()) {
 			throw new RenException(issueDetail.getCode(), issueDetail.getMsg());
 		}
+		Result<ResiTopicDTO> topic =  resiGroupOpenFeignClient.getTopicById(issueDetail.getData().getTopicInfo().getTopicId());
+		if (!topic.success()) {
+			throw new RenException(topic.getCode(), topic.getMsg());
+		}
+		applyAssistFormDTO.setLatitude(topic.getData().getDimension());
+		applyAssistFormDTO.setLongitude(topic.getData().getLongitude());
+		applyAssistFormDTO.setProvince(topic.getData().getProvince());
+		applyAssistFormDTO.setCity(topic.getData().getCity());
+		applyAssistFormDTO.setArea(topic.getData().getArea());
 		ProjectDetailDTO projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData(), ProjectDetailDTO.class);
-		projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData().getTopicInfo(), ProjectDetailDTO.class);
+		projectDetailDTO.setTopicContent(issueDetail.getData().getTopicInfo().getTopicContent());
+		projectDetailDTO.setTopicPublisher(issueDetail.getData().getTopicInfo().getTopicPublisher());
+		projectDetailDTO.setTopicPublisherMobile(issueDetail.getData().getTopicInfo().getTopicPublisherMobile());
+		projectDetailDTO.setTopicPublishTime(issueDetail.getData().getTopicInfo().getTopicPublishTime());
+		projectDetailDTO.setPhotoList(issueDetail.getData().getTopicInfo().getPhotoList());
 		projectDetailDTO.setPublicReply(formDTO.getPublicReply());
 		projectDetailDTO.setInternalRemark(formDTO.getInternalRemark());
-		applyAssistFormDTO.setDetail(projectDetailDTO.toString());
+		//项目详情
+		ProjectDetailFromDTO projectDetailFromDTO = new ProjectDetailFromDTO();
+		projectDetailFromDTO.setUserId(formDTO.getUserId());
+		projectDetailFromDTO.setProjectId(formDTO.getProjectId());
+		projectDetailFromDTO.setCustomerId(projectStaff.getCustomerId());
+		ProjectDetailResultDTO projectDetailResultDTO =  getProjectDetail(projectDetailFromDTO);
+
+		//项目进展
+		ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO();
+		processListV2FormDTO.setProjectId(formDTO.getProjectId());
+		List<ProcessListV2ResultDTO> processList =  projectTraceService.processListV2(processListV2FormDTO);
+
+		applyAssistFormDTO.setDetail(getDetail(projectDetailDTO, projectDetailResultDTO, processList));
 		applyAssistFormDTO.setDetailAddress(projectDetailDTO.getBelongsGridName());
-		Result result = epmetThirdOpenFeignClient.applyAssist(applyAssistFormDTO);
+		applyAssistFormDTO.setSource("党建引领");
+		applyAssistFormDTO.setNotifyUrl("/gov/project/project/platformcallback");
+		Result<ProjectAssistResult> result = epmetThirdOpenFeignClient.applyAssist(applyAssistFormDTO);
 		if (!result.success()) {
 			throw new RenException(result.getCode(), result.getMsg());
 		}
-		applyAssistFormDTO.setSource("党建引领");
-		ProjectAssistResult assistResult = (ProjectAssistResult)result.getData();
+		ProjectAssistResult assistResult = result.getData();
 		//发送到外部系统 end
 
 		//结果存入project_sub_process表
@@ -2202,4 +2235,54 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		//TODO 保存附件
 	}
 
+	private String getDetail(ProjectDetailDTO sourceDTO, ProjectDetailResultDTO projectDetail, List<ProcessListV2ResultDTO> processList) {
+		String detail = "";
+		detail = detail.concat("项目来源\n");
+		if (null == sourceDTO.getTopicContent()) {
+			sourceDTO.setTopicContent("");
+		}
+
+		if (CollectionUtils.isEmpty(sourceDTO.getPhotoList())) {
+			sourceDTO.setPhotoList(new ArrayList<>());
+		}
+		String source = "议题标题：" + sourceDTO.getIssueTitle() + "\n" +
+				"针对话题\n" +  (null == sourceDTO.getTopicContent()?"":sourceDTO.getTopicContent())  + "\n" +
+				"话题图片\n" +  Joiner.on(StrConstant.COMMA).join(sourceDTO.getPhotoList()) + "\n" +
+				"建议采用如下处理方式\n" + sourceDTO.getIssueSuggestion() + "\n" +
+				"所属网格：" + sourceDTO.getBelongsGridName() + "\n" +
+				"话题发表人：" + sourceDTO.getTopicPublisher() + sourceDTO.getTopicPublisherMobile() + "\n" +
+				"议题发表人：" + sourceDTO.getIssueInitiator() + sourceDTO.getIssuePublisherMobile() + "\n" +
+				"话题发表时间：" + DateUtils.formatTimestamp(sourceDTO.getTopicPublishTime(), DateUtils.DATE_TIME_PATTERN);
+		detail = detail.concat(source);
+		detail = detail.concat("\n项目详情\n");
+		detail = "项目标题：" +projectDetail.getProjectTitle() + "\n" +
+				"项目方案：:\n" + projectDetail.getPublicReply() + "\n" +
+				"内部备注：\n" + projectDetail.getInternalRemark() + "\n" +
+				"当前处理部门：\n";
+		for (ProjectDetailResultDTO.DepartmentNameListBean item : projectDetail.getDepartmentList()) {
+			String department = item.getDepartmentName() + "(" + Joiner.on(StrConstant.COMMA).join(item.getStaffList()) + ")\n";
+			detail = detail + department;
+		}
+		detail = detail.concat("\n处理进展\n");
+		for (ProcessListV2ResultDTO item : processList) {
+			String process = "【" + item.getProcessName() + "】\n" +
+					DateUtils.formatTimestamp(item.getProcessTime(), DateUtils.DATE_TIME_PATTERN) + "\n" +
+					"处理部门：" + item.getProcessName() + "\n" +
+					"说明：" + item.getPublicReply() + "\n";
+			//TODO 上传图片
+			detail = detail + process;
+		}
+
+		System.out.println(detail);
+		return detail;
+
+	}
+
+	private String toJson(Object object) {
+		GsonBuilder gsonBuilder = new GsonBuilder();
+		gsonBuilder.setPrettyPrinting();
+		Gson gson = gsonBuilder.create();
+		return gson.toJson(object);
+	}
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index 3c8a358f1c..fd0d8f7613 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -198,4 +198,13 @@ public interface ResiGroupOpenFeignClient {
 
     @GetMapping("resi/group/topic/querytopicinfobyissueid/{issueId}")
     Result<ResiTopicDTO> queryTopicInfoByIssueId(@PathVariable("issueId")String issueId);
+
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description 根据话题Id查询话题信息
+     **/
+    @PostMapping("/resi/group/topic/gettopicbyid/{topicId}")
+    Result<ResiTopicDTO> getTopicById(@PathVariable("topicId") String topicId);
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 881569ea10..397a56a077 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -139,4 +139,14 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<ResiTopicDTO> queryTopicInfoByIssueId(String issueId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryTopicInfoByIssueId", issueId);
     }
+
+    /**
+     * @param topicId@return
+     * @Author sun
+     * @Description 根据话题Id查询话题信息
+     **/
+    @Override
+    public Result<ResiTopicDTO> getTopicById(String topicId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicById", topicId);
+    }
 }

From 686d42b4cde1fcab525f7e6e15e6f181ab4c2477 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 24 Mar 2021 15:52:03 +0800
Subject: [PATCH 33/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?AccessToken=E7=BC=93=E5=AD=98=E5=8A=A8=E4=BD=9C=E4=BB=8E?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E7=9A=84=E5=AD=90=E7=B1=BB=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E5=88=B0=E4=BA=86ApiService=E4=B8=AD=EF=BC=8C=E5=AD=90?=
 =?UTF-8?q?=E7=B1=BB=E5=8F=AA=E9=9C=80=E8=A6=81=E8=B0=83=E7=94=A8ApiServic?=
 =?UTF-8?q?e=E6=8F=90=E4=BE=9B=E7=9A=84addAccessTokenToCache()/getAccessTo?=
 =?UTF-8?q?kenFromCache()=E6=96=B9=E6=B3=95=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/apiservice/ApiService.java | 43 +++++++++++++++++++
 .../impl/LuzhouGridPlatformApiService.java    |  5 +--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index ef54d00d93..89bb8f8e24 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -2,6 +2,7 @@ package com.epmet.apiservice;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.result.LZGridPlatformBaseResult;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.HttpClientManager;
@@ -15,6 +16,7 @@ import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.entity.ThirdplatformEntity;
+import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -116,6 +118,14 @@ public abstract class ApiService {
         }
 
         LZGridPlatformBaseResult platformResult = JSON.parseObject(result.getData(), LZGridPlatformBaseResult.class);
+
+        // token过期重试逻辑，先不加
+        //if ("402".equals(platformResult.getCode())) {
+        //    // 如果token过期
+        //    deleteAccessTokenFromCache(platformId);
+        //    getAccessToken(platformId);
+        //    return sendPostRequest(platformId, action, jsonString, headers);
+        //}
         judgeResultSuccess(platformResult);
         return result.getData();
     }
@@ -128,6 +138,39 @@ public abstract class ApiService {
     */
     public abstract String getAccessToken(String platformId);
 
+    /**
+     * @Description 从缓存中删除AccessToken
+     * @return
+     * @author wxz
+     * @date 2021.03.24 15:35
+    */
+    protected void deleteAccessTokenFromCache(String platformId) {
+        RedisTemplate<String, String> stringRedisTemplate = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
+        stringRedisTemplate.delete(RedisKeys.getThirdPlatformAccessTokenKey(platformId));
+    }
+
+    /**
+     * @Description 添加AccessToken到缓存
+     * @return
+     * @author wxz
+     * @date 2021.03.24 15:32
+    */
+    protected void addAccessTokenToCache(String platformId, String accessToken) {
+        RedisTemplate<String, String> stringRedisTemplate = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
+        stringRedisTemplate.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), accessToken);
+    }
+
+    /**
+     * @Description 从缓存中取token
+     * @return
+     * @author wxz
+     * @date 2021.03.24 15:40
+    */
+    protected String getAccessTokenFromCache(String platformId) {
+        RedisTemplate<String, String> stringRedisTemplate = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
+        return stringRedisTemplate.opsForValue().get(platformId);
+    }
+
     /**
      * @Description 判断客户是否注册了指定的平台，如果没有注册，则抛出异常
      * @return
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 25586f743a..5a903a6b08 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -30,8 +30,7 @@ public class LuzhouGridPlatformApiService extends ApiService {
 
     @Override
     public String getAccessToken(String platformId) {
-        RedisTemplate<String, String> rt = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
-        String token = rt.opsForValue().get(RedisKeys.getThirdPlatformAccessTokenKey(platformId));
+        String token = getAccessTokenFromCache(platformId);
         if (StringUtils.isBlank(token)) {
             ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
             ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
@@ -58,7 +57,7 @@ public class LuzhouGridPlatformApiService extends ApiService {
             judgeResultSuccess(platformResult);
 
             token = platformResult.getResult();
-            rt.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), token);
+            addAccessTokenToCache(platformId, token);
         }
         return token;
     }

From 45efc712475d79df3db9067d87ad7ebd9b323ae1 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 25 Mar 2021 09:56:41 +0800
Subject: [PATCH 34/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E8=AE=A4=E8=AF=81=E5=BD=93=E4=B8=AD=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/src/main/resources/bootstrap.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 7a6c236128..56e5bfbbc1 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -461,6 +461,7 @@ epmet:
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList:
     - /epmetuser/customerstaff/customerlist
+    - /gov/project/project/platformcallback
 
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:

From fb61e356cfa67a78abdaefbdddba2819498c575d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 25 Mar 2021 10:18:07 +0800
Subject: [PATCH 35/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=94=B3=E8=AF=B7=E5=8D=8F=E5=8A=A9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=A2=9E=E5=8A=A0notifyUrl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 5a903a6b08..de5522b547 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -66,6 +66,8 @@ public class LuzhouGridPlatformApiService extends ApiService {
     public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String platformId = formDTO.getPlatformId();
 
+        formDTO.setNotifyUrl("https://epmet-dev.elinkservice.cn/api/gov/project/project/platformcallback");
+
         // 正式调用第三方平台
         String argsStr = JSON.toJSONString(formDTO);
         String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, argsStr, null);

From 54b368dd156215170d78a325b20adefab80b8944 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 25 Mar 2021 16:22:03 +0800
Subject: [PATCH 36/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Athirdplatform?=
 =?UTF-8?q?=E7=9A=84db=20flyway=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.13__addPlatformDDLS.sql | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.13__addPlatformDDLS.sql

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.13__addPlatformDDLS.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.13__addPlatformDDLS.sql
new file mode 100644
index 0000000000..c8dfb5e614
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.13__addPlatformDDLS.sql
@@ -0,0 +1,61 @@
+CREATE TABLE `thirdplatform` (
+  `ID` varchar(64) NOT NULL,
+  `PLATFORM_NAME` varchar(32) NOT NULL COMMENT '平台名称',
+  `PLATFORM_KEY` varchar(32) NOT NULL COMMENT '平台唯一KEY',
+  `PLATFORM_SECRET` varchar(64) DEFAULT NULL,
+  `ICON` varchar(255) DEFAULT NULL,
+  `API_SERVICE` varchar(32) NOT NULL COMMENT 'api service实例名称',
+  `BASE_URL` varchar(128) NOT NULL COMMENT '平台基础url',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+CREATE TABLE `thirdplatform_customer_action` (
+  `ID` varchar(64) NOT NULL,
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `PLATFORM_ID` varchar(64) NOT NULL COMMENT '平台ID',
+  `ACTION_KEY` varchar(64) NOT NULL COMMENT '动作key',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`),
+  UNIQUE KEY `plat_custm_act` (`PLATFORM_ID`,`CUSTOMER_ID`,`ACTION_KEY`,`DEL_FLAG`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户针对指定操作所选用的第三方平台列表';
+
+CREATE TABLE `thirdplatform_customer_register` (
+  `ID` varchar(64) NOT NULL,
+  `CUSTOMER_ID` varchar(64) DEFAULT NULL,
+  `PLATFORM_ID` varchar(64) DEFAULT NULL,
+  `CUSTOMIZED_PLATFORM_NAME` varchar(32) DEFAULT NULL,
+  `CUSTOMIZED_PLATFORM_ICON` varchar(255) DEFAULT NULL,
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `thirdplatform_action` (
+  `ID` varchar(64) NOT NULL,
+  `PLATFORM_ID` varchar(64) DEFAULT NULL,
+  `ACTION_KEY` varchar(32) DEFAULT NULL,
+  `API_URL` varchar(64) NOT NULL COMMENT '动作对应的api的路径',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
\ No newline at end of file

From 7762bb5313874e38c4748f13638731f58b06c407 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 25 Mar 2021 17:40:32 +0800
Subject: [PATCH 37/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/utils/HttpClientManager.java        |  92 +++++++-
 .../epmet/constant/ThirdPlatformActions.java  |  17 +-
 .../com/epmet/dto/form/UploadFileFormDTO.java |  32 +++
 .../epmet/dto/result/UploadFileResultDTO.java |  16 ++
 .../feign/EpmetThirdOpenFeignClient.java      |  22 +-
 .../EpmetThirdOpenFeignClientFallback.java    |  20 +-
 .../java/com/epmet/apiservice/ApiService.java |  40 ++++
 .../impl/LuzhouGridPlatformApiService.java    |  33 +++
 .../epmet/controller/ProjectController.java   |  25 +-
 .../com/epmet/service/ProjectService.java     |  16 +-
 .../service/impl/ProjectServiceImpl.java      |  22 ++
 .../com/epmet/dto/result/PlatformFileDTO.java |  24 ++
 .../service/impl/ProjectServiceImpl.java      | 214 ++++++++++++++++--
 .../group/feign/ResiGroupOpenFeignClient.java |   9 +
 14 files changed, 533 insertions(+), 49 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadFileFormDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadFileResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
index 2481664829..55baf583a3 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
@@ -6,6 +6,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -23,6 +26,7 @@ import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -32,16 +36,15 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URLEncoder;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -239,6 +242,32 @@ public class HttpClientManager {
 		}
 	}
 
+	public Result<String> uploadFile(String url, boolean isHttps, File file, String fileName, Map<String, Object> headerMap) {
+		try {
+			HttpPost httppost = new HttpPost(url);
+			httppost.setConfig(requestConfig);
+			if (null != headerMap) {
+				headerMap.forEach((k, v) -> {
+					if (v != null) {
+						httppost.addHeader(k, v.toString());
+					}
+				});
+			}
+			if (file != null) {
+				HttpEntity entity = MultipartEntityBuilder
+						.create()
+						.addBinaryBody("file", file, ContentType.MULTIPART_FORM_DATA, fileName)
+						.setMode(HttpMultipartMode.RFC6532)
+						.build();
+				httppost.setEntity(entity);
+			}
+			return execute(httppost,isHttps);
+		} catch (Exception e) {
+			log.error("send exception", e);
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+		}
+	}
+
 	/**
 	 * desc:  https发送json post  请求
 	 * param: url,jsonStrParam
@@ -436,6 +465,61 @@ public class HttpClientManager {
 		}
 	}
 
+	public Result<MultipartFile> getFileItem(String url, String fileName) {
+
+		try {
+			URIBuilder builder = new URIBuilder(url);
+
+			HttpGet httpGet = new HttpGet(builder.build());
+			httpGet.setConfig(requestConfig);
+			return executeToFile(httpGet, fileName);
+		} catch (Exception e) {
+			log.error("sendGet exception", e);
+			return new Result<MultipartFile >().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+		}
+	}
+
+	private Result<MultipartFile> executeToFile(HttpRequestBase httpMethod, String fileName) {
+		CloseableHttpResponse response = null;
+		FileItem item = null;
+		try {
+			response = httpclient.execute(httpMethod);
+			log.debug("http send response:{}", JSON.toJSONString(response));
+			if (response != null && response.getStatusLine() != null) {
+				if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+					InputStream is = response.getEntity().getContent();
+					FileItemFactory factory = new DiskFileItemFactory(16, null);
+					String textFieldName = "uploadfile";
+					item = factory.createItem(textFieldName, ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
+					OutputStream os = item.getOutputStream();
+
+					int bytesRead = 0;
+					byte[] buffer = new byte[8192];
+					while ((bytesRead = is.read(buffer, 0, 8192)) != -1) {
+						os.write(buffer, 0, bytesRead);
+					}
+					os.close();
+					is.close();
+					return new Result<MultipartFile>().ok(new CommonsMultipartFile(item));
+				} else {
+					log.warn("execute http method fail,httpStatus:{0}", response.getStatusLine().getStatusCode());
+				}
+			}
+		} catch (Exception e) {
+			log.error("execute exception", e);
+			return new Result<MultipartFile>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+		} finally {
+			httpMethod.releaseConnection();
+			try {
+				if (response != null) {
+					response.close();
+				}
+			} catch (IOException e) {
+			}
+		}
+		return new Result<MultipartFile>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+	}
+
 	public Result<byte[]> getMediaByteArray(String url, String json) {
 
 		try {
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java
index 43390a2e14..dc17deca39 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdPlatformActions.java
@@ -2,12 +2,21 @@ package com.epmet.constant;
 
 /**
  * 第三方平台动作常量
+ * @author kamui
  */
 public interface ThirdPlatformActions {
 
-    // 获取accessToken
-    String GET_ACCESS_TOKEN = "GET_ACCESS_TOKEN";
-    // 项目协助
-    String PROJECT_ASSIST = "PROJECT_ASSIST";
+	/**
+	 * 获取accessToken
+	 */
+	String GET_ACCESS_TOKEN = "GET_ACCESS_TOKEN";
+	/**
+	 * 项目协助
+	 */
+	String PROJECT_ASSIST = "PROJECT_ASSIST";
+	/**
+	 * 上传文件
+	 */
+	String UPLOAD_FILE = "UPLOAD_FILE";
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadFileFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadFileFormDTO.java
new file mode 100644
index 0000000000..d5c060a4e5
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadFileFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/25 9:57
+ */
+@Data
+public class UploadFileFormDTO implements Serializable {
+	private static final long serialVersionUID = 2911010733366812636L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 平台ID
+	 */
+	@NotBlank(message = "平台ID不能为空")
+	private String platformId;
+
+	/**
+	 * 文件
+	 */
+	private MultipartFile file;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadFileResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadFileResultDTO.java
new file mode 100644
index 0000000000..e3916e8a07
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadFileResultDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/25 10:09
+ */
+@Data
+public class UploadFileResultDTO implements Serializable {
+	private static final long serialVersionUID = -4986665750488963082L;
+	private String url;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
index 9497f1bed8..932f7ecc2f 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
@@ -3,18 +3,13 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.form.ProcessListFormDTO;
-import com.epmet.dto.form.ProjectApplyAssistFormDTO;
-import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
-import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -38,4 +33,15 @@ public interface EpmetThirdOpenFeignClient {
 	@PostMapping("third/project/apply-assist")
 	Result<ProjectAssistResult> applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO);
 
+	/**
+	 * 上传文件
+	 * @author zhaoqifeng
+	 * @date 2021/3/25 16:10
+	 * @param file
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
+	 */
+	@PostMapping("third/project/uploadfile")
+	Result<UploadFileResultDTO> uploadFile(@RequestParam("file") MultipartFile file, UploadFileFormDTO formDTO);
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
index 05c0d52fd7..bbcd8a73ad 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
@@ -4,14 +4,12 @@ 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.ProjectDTO;
-import com.epmet.dto.form.ProcessListFormDTO;
-import com.epmet.dto.form.ProjectApplyAssistFormDTO;
-import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
-import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetThirdOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -35,4 +33,18 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli
 	public Result<ProjectAssistResult> applyAssist(ProjectApplyAssistFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "applyAssist", formDTO);
 	}
+
+	/**
+	 * 上传文件
+	 *
+	 * @param file
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2021/3/25 16:10
+	 */
+	@Override
+	public Result<UploadFileResultDTO> uploadFile(MultipartFile file, UploadFileFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", formDTO);
+	}
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 89bb8f8e24..5542c67eb9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -2,6 +2,7 @@ package com.epmet.apiservice;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.result.LZGridPlatformBaseResult;
+import com.epmet.dto.form.UploadFileFormDTO;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.exception.RenException;
@@ -13,11 +14,13 @@ import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.entity.ThirdplatformEntity;
 import org.springframework.data.redis.core.RedisTemplate;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -117,6 +120,37 @@ public abstract class ApiService {
             throw new RenException("请求第三方平台，发送Post请求失败。错误信息:" + result.getMsg());
         }
 
+        LZGridPlatformBaseResult platformResult = JSON.parseObject(result.getData(), LZGridPlatformBaseResult.class);
+        judgeResultSuccess(platformResult);
+        return result.getData();
+    }
+
+    public String sendPostRequestToUploadFile(String platformId, String action, File file, String fileName) {
+        // 1.获取token
+        String accessToken = getAccessToken(platformId);
+        //2.获取url
+        ThirdplatformEntity thirdplatform = SpringContextUtils.getBean(ThirdplatformDao.class).selectById(platformId);
+        ThirdplatformActionEntity actionEntity = SpringContextUtils.getBean(ThirdplatformActionDao.class)
+                .getByPlatformIdAndActionKey(platformId, action);
+
+        Map<String, Object> headers = new HashMap<>();
+
+        // 填充access token到头当中
+        headers.put("X-Access-Token", accessToken);
+
+        Result<String> result = HttpClientManager.getInstance().uploadFile(thirdplatform.getBaseUrl().concat(actionEntity.getApiUrl()),
+                thirdplatform.getBaseUrl().startsWith("https://"),
+                file,
+                fileName,
+                headers);
+
+        if (result == null) {
+            throw new RenException("请求第三方平台，发送Post请求失败。result为null");
+        }
+        if (!result.success()) {
+            throw new RenException("请求第三方平台，发送Post请求失败。错误信息:" + result.getMsg());
+        }
+
         LZGridPlatformBaseResult platformResult = JSON.parseObject(result.getData(), LZGridPlatformBaseResult.class);
 
         // token过期重试逻辑，先不加
@@ -210,4 +244,10 @@ public abstract class ApiService {
      * @date 2021.03.22 10:32
     */
     public abstract void judgeResultSuccess(LZGridPlatformBaseResult result);
+
+    public UploadFileResultDTO uploadFile(UploadFileFormDTO formDTO) {
+        return null;
+    }
+
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index de5522b547..e893469ec1 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.LZGridPlatformBaseResult;
 import com.epmet.apiservice.result.LZGridPlatformProjectAssistResult;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.utils.HttpClientManager;
@@ -12,15 +13,21 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dao.ThirdplatformActionDao;
 import com.epmet.dao.ThirdplatformDao;
+import com.epmet.dto.form.UploadFileFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformEntity;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.util.HashMap;
+import java.util.Objects;
 
 /**
  * 泸州网格化平台ApiService
@@ -95,4 +102,30 @@ public class LuzhouGridPlatformApiService extends ApiService {
             throw new RenException("泸州网格化平台：返回失败结果，错误码:" + result.getCode());
         }
     }
+
+    @Override
+    public UploadFileResultDTO uploadFile(UploadFileFormDTO formDTO) {
+        UploadFileResultDTO resultDTO = new UploadFileResultDTO();
+        String platformId = formDTO.getPlatformId();
+        try {
+            String fileName = formDTO.getFile().getOriginalFilename();
+            // 正式调用第三方平台
+            File file = new File(formDTO.getFile().getOriginalFilename());
+            FileUtils.copyInputStreamToFile(formDTO.getFile().getInputStream(), file);
+            String result = sendPostRequestToUploadFile(platformId, ThirdPlatformActions.UPLOAD_FILE, file, fileName);
+            if (!StringUtils.isBlank(result)) {
+                // 此处要经过一系列业务处理，将第三方平台返回的数据进行解析，等处理最后转换成ProjectAssistResult类型，返回。ProjectAssistResult这个类型是
+                // 所有apiService的projectAssist方法返回值的统一类型，是我们的epmet-cloud所需要的数据的实体，
+                // 所有apiService都要想办法转化成这个类型。
+                LZGridPlatformBaseResult lzResult = JSON.parseObject(result, LZGridPlatformBaseResult.class);
+
+                // 此处设置为第三方系统返回的唯一id
+                resultDTO.setUrl((String) lzResult.getResult());
+            }
+            System.out.println("泸州网格化平台项目文件上传成功");
+        } catch (Exception e) {
+            throw new RenException("上传失败");
+        }
+        return resultDTO;
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index 699f70ec34..d645bac2b6 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -1,16 +1,16 @@
 package com.epmet.controller;
 
+import com.epmet.dto.form.UploadFileFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 对接第三方平台业务Project相关的controller
@@ -50,4 +50,21 @@ public class ProjectController {
         return new Result<ProjectAssistResult>().ok(projectAssistResult);
     }
 
+    /**
+     * 上传文件
+     * @author zhaoqifeng
+     * @date 2021/3/25 11:13
+     * @param file
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
+     */
+    @PostMapping("uploadfile")
+    public Result<UploadFileResultDTO> uploadFile(@RequestParam("file") MultipartFile file, UploadFileFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setFile(file);
+        UploadFileResultDTO result = projectService.uploadFile(formDTO);
+        return new Result<UploadFileResultDTO>().ok(result);
+    }
+
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
index 2b6e8601a5..ce6c0cd3a2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -1,8 +1,10 @@
 package com.epmet.service;
 
+import com.epmet.dto.form.UploadFileFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.result.UploadFileResultDTO;
 
 /**
  * 该service用于封装project相关的代码
@@ -12,8 +14,20 @@ public interface ProjectService {
     String demoAction(TPFDemoFormDTO formDTO);
 
     /**
-     *
+     * 项目协同处理
+     * @author wangxz
+     * @date 2021/3/25 10:59
      * @param formDTO
+     * @return com.epmet.dto.result.ProjectAssistResult
      */
     ProjectAssistResult applyAssist(ProjectApplyAssistFormDTO formDTO);
+
+    /**
+     * 文件上传
+     * @author zhaoqifeng
+     * @date 2021/3/25 10:59
+     * @param formDTO
+     * @return com.epmet.dto.result.UploadFileResultDTO
+     */
+    UploadFileResultDTO uploadFile(UploadFileFormDTO formDTO);
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index b9f539a7a7..dddf8a9909 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -1,9 +1,11 @@
 package com.epmet.service.impl;
 
 import com.epmet.apiservice.ApiService;
+import com.epmet.dto.form.UploadFileFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.service.ApiServiceSelector;
 import com.epmet.service.ProjectService;
 import org.springframework.stereotype.Service;
@@ -35,4 +37,24 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
 
         return apiService.projectAssist(formDTO);
     }
+
+    /**
+     * 文件上传
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.UploadFileResultDTO
+     * @author zhaoqifeng
+     * @date 2021/3/25 10:59
+     */
+    @Override
+    public UploadFileResultDTO uploadFile(UploadFileFormDTO formDTO) {
+        String customerId = formDTO.getCustomerId();
+        String platformId = formDTO.getPlatformId();
+
+        // 根据平台ID找到注意，此处会如果找不到对应的ApiService会抛出异常
+        ApiService apiService = selectApiService(platformId);
+        // 判断该客户是否注册了该平台，如果没有的话，抛出异常
+        apiService.judgeRegistered(customerId, platformId);
+        return apiService.uploadFile(formDTO);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java
new file mode 100644
index 0000000000..841b1ea207
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/3/25 16:47
+ */
+@Data
+public class PlatformFileDTO implements Serializable {
+	private static final long serialVersionUID = 1090878172073142780L;
+	String projectImages;
+	String projectVoices;
+	String projectVideos;
+	String projectDocs;
+	String topicImages;
+	String topicVoices;
+	String topicVideos;
+	String topicDocs;
+}
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 73c293d828..4042b79217 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -28,10 +28,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.ScanContentUtils;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.ParameterKeyConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.constant.SmsTemplateConstant;
@@ -46,6 +43,9 @@ import com.epmet.feign.*;
 import com.epmet.redis.ProjectRedis;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
+import com.epmet.resi.group.dto.topic.form.TopicAttachmentFormDTO;
+import com.epmet.resi.group.dto.topic.result.TopicAttachmentResultDTO;
+import com.epmet.resi.group.dto.topic.result.TopicFileResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.service.*;
@@ -63,6 +63,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 
 import java.text.SimpleDateFormat;
@@ -2074,22 +2075,93 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		applyAssistFormDTO.setCustomerId(projectStaff.getCustomerId());
 		applyAssistFormDTO.setPlatformId(formDTO.getPlatformId());
 		applyAssistFormDTO.setTitle(projectEntity.getTitle());
-
+		UploadFileFormDTO uploadFileFormDTO = new UploadFileFormDTO();
+		uploadFileFormDTO.setCustomerId(projectStaff.getCustomerId());
+		uploadFileFormDTO.setPlatformId(formDTO.getPlatformId());
+		//存放项目和话题的附件
+		PlatformFileDTO platformFileDTO = new PlatformFileDTO();
 		if (CollectionUtils.isNotEmpty(formDTO.getInternalFile())) {
-			List<String> imageList =
-					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.IMAGE.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
+			//附件上传到第三方平台，获取返回的链接
+			List<FileDTO> imageList =
+					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.IMAGE.equals(fileDTO.getType())).collect(Collectors.toList());
 			if (CollectionUtils.isNotEmpty(imageList)) {
-				applyAssistFormDTO.setImageLink(String.join(StrConstant.COMMA, imageList));
+				List<String> images = new ArrayList<>();
+				for (FileDTO file : imageList) {
+					Result<MultipartFile> multipartFileResult =  HttpClientManager.getInstance().getFileItem(file.getUrl(), file.getName());
+					if (!multipartFileResult.success()) {
+						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+					}
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					if (!uploadResult.success()) {
+						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+					}
+					images.add(uploadResult.getData().getUrl());
+				}
+				if (CollectionUtils.isNotEmpty(images)) {
+					String all = String.join(StrConstant.COMMA, images);
+					applyAssistFormDTO.setImageLink(all);
+					platformFileDTO.setProjectImages(all);
+				}
 			}
-			List<String> voiceList =
-					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.VOICE.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
-			if (CollectionUtils.isNotEmpty(imageList)) {
-				applyAssistFormDTO.setVoiceLink(String.join(StrConstant.COMMA, voiceList));
+			List<FileDTO> voiceList =
+					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.VOICE.equals(fileDTO.getType())).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(voiceList)) {
+				List<String> voices = new ArrayList<>();
+				for (FileDTO file : voiceList) {
+					Result<MultipartFile> multipartFileResult =  HttpClientManager.getInstance().getFileItem(file.getUrl(), file.getName());
+					if (!multipartFileResult.success()) {
+						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+					}
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					if (!uploadResult.success()) {
+						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+					}
+					voices.add(uploadResult.getData().getUrl());
+				}
+				if (CollectionUtils.isNotEmpty(voices)) {
+					String all = String.join(StrConstant.COMMA, voices);
+					applyAssistFormDTO.setVoiceLink(all);
+					platformFileDTO.setProjectVoices(all);
+				}
 			}
-			List<String> videoList =
-					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.VIDEO.equals(fileDTO.getType())).map(FileDTO::getUrl).collect(Collectors.toList());
-			if (CollectionUtils.isNotEmpty(imageList)) {
-				applyAssistFormDTO.setVideoLink(String.join(StrConstant.COMMA, videoList));
+			List<FileDTO> videoList =
+					formDTO.getInternalFile().stream().filter(fileDTO -> TopicConstant.VIDEO.equals(fileDTO.getType())).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(videoList)) {
+				List<String> videos = new ArrayList<>();
+				for (FileDTO file : videoList) {
+					Result<MultipartFile> multipartFileResult =  HttpClientManager.getInstance().getFileItem(file.getUrl(), file.getName());
+					if (!multipartFileResult.success()) {
+						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+					}
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					if (!uploadResult.success()) {
+						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+					}
+					videos.add(uploadResult.getData().getUrl());
+				}
+				if (CollectionUtils.isNotEmpty(videos)) {
+					String all = String.join(StrConstant.COMMA, videos);
+					applyAssistFormDTO.setVideoLink(all);
+					platformFileDTO.setProjectVideos(all);
+				}
+			}
+			if (CollectionUtils.isNotEmpty(formDTO.getInternalFile())) {
+				List<String> docs = new ArrayList<>();
+				for (FileDTO file : formDTO.getInternalFile()) {
+					Result<MultipartFile> multipartFileResult =  HttpClientManager.getInstance().getFileItem(file.getUrl(), file.getName());
+					if (!multipartFileResult.success()) {
+						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+					}
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					if (!uploadResult.success()) {
+						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+					}
+					docs.add(uploadResult.getData().getUrl());
+				}
+				if (CollectionUtils.isNotEmpty(docs)) {
+					String all = String.join(StrConstant.COMMA, docs);
+					platformFileDTO.setProjectDocs(all);
+				}
 			}
 		}
 		//获取工作人员信息
@@ -2110,6 +2182,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (!issueDetail.success()) {
 			throw new RenException(issueDetail.getCode(), issueDetail.getMsg());
 		}
+		//获取话题详情
 		Result<ResiTopicDTO> topic =  resiGroupOpenFeignClient.getTopicById(issueDetail.getData().getTopicInfo().getTopicId());
 		if (!topic.success()) {
 			throw new RenException(topic.getCode(), topic.getMsg());
@@ -2119,6 +2192,89 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		applyAssistFormDTO.setProvince(topic.getData().getProvince());
 		applyAssistFormDTO.setCity(topic.getData().getCity());
 		applyAssistFormDTO.setArea(topic.getData().getArea());
+		//获取话题附件
+		TopicAttachmentFormDTO topicAttachmentFormDTO = new TopicAttachmentFormDTO();
+		topicAttachmentFormDTO.setTopicId(issueDetail.getData().getTopicInfo().getTopicId());
+		Result<TopicAttachmentResultDTO> topicAttachment =  resiGroupOpenFeignClient.topicAttachmentList(topicAttachmentFormDTO);
+		if (!topicAttachment.success()) {
+			throw new RenException(topicAttachment.getCode(), topicAttachment.getMsg());
+		}
+		if (CollectionUtils.isNotEmpty(issueDetail.getData().getTopicInfo().getPhotoList())) {
+			List<String> files = new ArrayList<>();
+			for (String url : issueDetail.getData().getTopicInfo().getPhotoList()) {
+				Result<MultipartFile> multipartFileResult =
+						HttpClientManager.getInstance().getFileItem(url, UUID.randomUUID().toString().replace("-", ""));
+				if (!multipartFileResult.success()) {
+					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+				}
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				if (!uploadResult.success()) {
+					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+				}
+				files.add(uploadResult.getData().getUrl());
+			}
+			if (CollectionUtils.isNotEmpty(files)) {
+				String all = String.join(StrConstant.COMMA, files);
+				platformFileDTO.setTopicImages(all);
+			}
+		}
+		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getVoiceList())) {
+			List<String> files = new ArrayList<>();
+			for (TopicFileResultDTO item : topicAttachment.getData().getVoiceList()) {
+				Result<MultipartFile> multipartFileResult =
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+				if (!multipartFileResult.success()) {
+					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+				}
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				if (!uploadResult.success()) {
+					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+				}
+				files.add(uploadResult.getData().getUrl());
+			}
+			if (CollectionUtils.isNotEmpty(files)) {
+				String all = String.join(StrConstant.COMMA, files);
+				platformFileDTO.setTopicVoices(all);
+			}
+		}
+		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getVideoList())) {
+			List<String> files = new ArrayList<>();
+			for (TopicFileResultDTO item : topicAttachment.getData().getVideoList()) {
+				Result<MultipartFile> multipartFileResult =
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+				if (!multipartFileResult.success()) {
+					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+				}
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				if (!uploadResult.success()) {
+					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+				}
+				files.add(uploadResult.getData().getUrl());
+			}
+			if (CollectionUtils.isNotEmpty(files)) {
+				String all = String.join(StrConstant.COMMA, files);
+				platformFileDTO.setTopicVideos(all);
+			}
+		}
+		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getDocList())) {
+			List<String> files = new ArrayList<>();
+			for (TopicFileResultDTO item : topicAttachment.getData().getDocList()) {
+				Result<MultipartFile> multipartFileResult =
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+				if (!multipartFileResult.success()) {
+					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
+				}
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				if (!uploadResult.success()) {
+					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
+				}
+				files.add(uploadResult.getData().getUrl());
+			}
+			if (CollectionUtils.isNotEmpty(files)) {
+				String all = String.join(StrConstant.COMMA, files);
+				platformFileDTO.setTopicDocs(all);
+			}
+		}
 		ProjectDetailDTO projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData(), ProjectDetailDTO.class);
 		projectDetailDTO.setTopicContent(issueDetail.getData().getTopicInfo().getTopicContent());
 		projectDetailDTO.setTopicPublisher(issueDetail.getData().getTopicInfo().getTopicPublisher());
@@ -2139,7 +2295,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		processListV2FormDTO.setProjectId(formDTO.getProjectId());
 		List<ProcessListV2ResultDTO> processList =  projectTraceService.processListV2(processListV2FormDTO);
 
-		applyAssistFormDTO.setDetail(getDetail(projectDetailDTO, projectDetailResultDTO, processList));
+		applyAssistFormDTO.setDetail(getDetail(projectDetailDTO, projectDetailResultDTO, processList, platformFileDTO));
 		applyAssistFormDTO.setDetailAddress(projectDetailDTO.getBelongsGridName());
 		applyAssistFormDTO.setSource("党建引领");
 		applyAssistFormDTO.setNotifyUrl("/gov/project/project/platformcallback");
@@ -2235,7 +2391,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		//TODO 保存附件
 	}
 
-	private String getDetail(ProjectDetailDTO sourceDTO, ProjectDetailResultDTO projectDetail, List<ProcessListV2ResultDTO> processList) {
+	private String getDetail(ProjectDetailDTO sourceDTO, ProjectDetailResultDTO projectDetail, List<ProcessListV2ResultDTO> processList, PlatformFileDTO platformFileDTO) {
 		String detail = "";
 		detail = detail.concat("项目来源\n");
 		if (null == sourceDTO.getTopicContent()) {
@@ -2246,16 +2402,27 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			sourceDTO.setPhotoList(new ArrayList<>());
 		}
 		String source = "议题标题：" + sourceDTO.getIssueTitle() + "\n" +
-				"针对话题\n" +  (null == sourceDTO.getTopicContent()?"":sourceDTO.getTopicContent())  + "\n" +
-				"话题图片\n" +  Joiner.on(StrConstant.COMMA).join(sourceDTO.getPhotoList()) + "\n" +
-				"建议采用如下处理方式\n" + sourceDTO.getIssueSuggestion() + "\n" +
+				"针对话题\n" +  (null == sourceDTO.getTopicContent()?"":sourceDTO.getTopicContent()) + "\n";
+		if (StringUtils.isNotEmpty(platformFileDTO.getTopicImages())) {
+			source = source + "话题图片:" + platformFileDTO.getTopicImages() + "\n";
+		}
+		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVoices())) {
+			source = source + "话题语音:" + platformFileDTO.getTopicVoices() + "\n";
+		}
+		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVideos())) {
+			source = source + "话题视频:" + platformFileDTO.getTopicVideos() + "\n";
+		}
+		if (StringUtils.isNotEmpty(platformFileDTO.getTopicDocs())) {
+			source = source + "话题文档:" + platformFileDTO.getTopicDocs() + "\n";
+		}
+		source = source + "建议采用如下处理方式\n" + sourceDTO.getIssueSuggestion() + "\n" +
 				"所属网格：" + sourceDTO.getBelongsGridName() + "\n" +
 				"话题发表人：" + sourceDTO.getTopicPublisher() + sourceDTO.getTopicPublisherMobile() + "\n" +
 				"议题发表人：" + sourceDTO.getIssueInitiator() + sourceDTO.getIssuePublisherMobile() + "\n" +
 				"话题发表时间：" + DateUtils.formatTimestamp(sourceDTO.getTopicPublishTime(), DateUtils.DATE_TIME_PATTERN);
 		detail = detail.concat(source);
 		detail = detail.concat("\n项目详情\n");
-		detail = "项目标题：" +projectDetail.getProjectTitle() + "\n" +
+		detail = detail + "项目标题：" +projectDetail.getProjectTitle() + "\n" +
 				"项目方案：:\n" + projectDetail.getPublicReply() + "\n" +
 				"内部备注：\n" + projectDetail.getInternalRemark() + "\n" +
 				"当前处理部门：\n";
@@ -2267,12 +2434,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		for (ProcessListV2ResultDTO item : processList) {
 			String process = "【" + item.getProcessName() + "】\n" +
 					DateUtils.formatTimestamp(item.getProcessTime(), DateUtils.DATE_TIME_PATTERN) + "\n" +
-					"处理部门：" + item.getProcessName() + "\n" +
+					"处理部门：" + item.getDepartmentName() + "\n" +
 					"说明：" + item.getPublicReply() + "\n";
 			//TODO 上传图片
 			detail = detail + process;
 		}
-
 		System.out.println(detail);
 		return detail;
 
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index fd0d8f7613..d604e0abc6 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -207,4 +207,13 @@ public interface ResiGroupOpenFeignClient {
      **/
     @PostMapping("/resi/group/topic/gettopicbyid/{topicId}")
     Result<ResiTopicDTO> getTopicById(@PathVariable("topicId") String topicId);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取话题附件信息
+     **/
+    @PostMapping(value = "/resi/group/topic/topicattachmentlist")
+    Result<TopicAttachmentResultDTO> topicAttachmentList(@RequestBody TopicAttachmentFormDTO formDTO);
 }

From 717a8dae45283a4fe9e493617b05a69ad52209f9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 25 Mar 2021 17:46:26 +0800
Subject: [PATCH 38/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResiGroupOpenFeignClientFallback.java        | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 397a56a077..7babdb5ac9 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -12,10 +12,7 @@ import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
-import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
-import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
-import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
-import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.stereotype.Component;
@@ -149,4 +146,15 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<ResiTopicDTO> getTopicById(String topicId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicById", topicId);
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取话题附件信息
+     **/
+    @Override
+    public Result<TopicAttachmentResultDTO> topicAttachmentList(TopicAttachmentFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicById", formDTO);
+    }
 }

From 2ab028f0d6bc28b726751ea629f57e71fc6866f0 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 26 Mar 2021 09:25:14 +0800
Subject: [PATCH 39/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0access=5Ftoken=E7=9A=84?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/apiservice/ApiService.java       | 5 +++--
 .../epmet/apiservice/impl/LuzhouGridPlatformApiService.java  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 5542c67eb9..9980f5dbc5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -23,6 +23,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * ApiService，对接第三方平台的抽象类。每一个子类都对应一个第三方平台，每个第三方平台都实现唯一一个子类
@@ -189,9 +190,9 @@ public abstract class ApiService {
      * @author wxz
      * @date 2021.03.24 15:32
     */
-    protected void addAccessTokenToCache(String platformId, String accessToken) {
+    protected void addAccessTokenToCache(String platformId, String accessToken, long expire, TimeUnit timeUnit) {
         RedisTemplate<String, String> stringRedisTemplate = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
-        stringRedisTemplate.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), accessToken);
+        stringRedisTemplate.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), accessToken, expire, timeUnit);
     }
 
     /**
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index e893469ec1..d3b39f4f47 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 泸州网格化平台ApiService
@@ -64,7 +65,7 @@ public class LuzhouGridPlatformApiService extends ApiService {
             judgeResultSuccess(platformResult);
 
             token = platformResult.getResult();
-            addAccessTokenToCache(platformId, token);
+            addAccessTokenToCache(platformId, token, (long)(3600*1.8*1000), TimeUnit.MILLISECONDS);
         }
         return token;
     }

From 8b0c3116f1d5ea424acb613dbcf171fc590c8dd0 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 26 Mar 2021 09:25:21 +0800
Subject: [PATCH 40/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/feign/fallback/ResiGroupOpenFeignClientFallback.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 7babdb5ac9..b53570bfa8 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -155,6 +155,6 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
      **/
     @Override
     public Result<TopicAttachmentResultDTO> topicAttachmentList(TopicAttachmentFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicById", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicAttachmentList", formDTO);
     }
 }

From 11e2690ca58b2f978c2aad15c3c9a81ba16329ec Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 26 Mar 2021 10:31:41 +0800
Subject: [PATCH 41/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/utils/HttpClientManager.java        |  2 +-
 .../epmet-third/epmet-third-client/pom.xml    | 21 ++++++++++++++
 .../feign/EpmetThirdOpenFeignClient.java      | 29 +++++++++++++++----
 .../EpmetThirdOpenFeignClientFallback.java    | 10 ++++---
 .../epmet/controller/ProjectController.java   | 13 ++++++---
 .../service/impl/ProjectServiceImpl.java      | 19 +++++++-----
 6 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
index 55baf583a3..ab38563025 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
@@ -489,7 +489,7 @@ public class HttpClientManager {
 				if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
 					InputStream is = response.getEntity().getContent();
 					FileItemFactory factory = new DiskFileItemFactory(16, null);
-					String textFieldName = "uploadfile";
+					String textFieldName = "file";
 					item = factory.createItem(textFieldName, ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
 					OutputStream os = item.getOutputStream();
 
diff --git a/epmet-module/epmet-third/epmet-third-client/pom.xml b/epmet-module/epmet-third/epmet-third-client/pom.xml
index 3899202cf7..37b51d9479 100644
--- a/epmet-module/epmet-third/epmet-third-client/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-client/pom.xml
@@ -19,6 +19,12 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>feign-form-spring</artifactId>
+                    <groupId>io.github.openfeign.form</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.binarywang</groupId>
@@ -32,6 +38,21 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form-spring</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.3</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
index 932f7ecc2f..125bcb0f48 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
@@ -6,8 +6,13 @@ import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallback;
+import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -19,8 +24,10 @@ import java.util.List;
  * @author zhaoqifeng
  * @date 2021/3/18 14:18
  */
-// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = GovProjectOpenFeignClientFallback.class,url = "localhost:8110")
-@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class)
+// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class,configuration =
+//		 EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110")
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdOpenFeignClientFallback.class, configuration =
+		EpmetThirdOpenFeignClient.MultipartSupportConfig.class)
 public interface EpmetThirdOpenFeignClient {
 	/**
 	 * 请求项目协助
@@ -36,12 +43,22 @@ public interface EpmetThirdOpenFeignClient {
 	/**
 	 * 上传文件
 	 * @author zhaoqifeng
-	 * @date 2021/3/25 16:10
+	 * @date 2021/3/25 18:36
 	 * @param file
-	 * @param formDTO
+	 * @param customerId
+	 * @param platformId
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
 	 */
-	@PostMapping("third/project/uploadfile")
-	Result<UploadFileResultDTO> uploadFile(@RequestParam("file") MultipartFile file, UploadFileFormDTO formDTO);
+	@PostMapping(value= "third/project/uploadfile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	Result<UploadFileResultDTO> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("customerId") String customerId, @RequestParam(
+			"platformId") String platformId);
+
+	class MultipartSupportConfig {
+		@Bean
+		public Encoder feignFormEncoder() {
+			return new SpringFormEncoder();
+		}
+	}
+
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
index bbcd8a73ad..89f2245fce 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
@@ -38,13 +38,15 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli
 	 * 上传文件
 	 *
 	 * @param file
-	 * @param formDTO
+	 * @param customerId
+	 * @param platformId
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
 	 * @author zhaoqifeng
-	 * @date 2021/3/25 16:10
+	 * @date 2021/3/25 18:36
 	 */
 	@Override
-	public Result<UploadFileResultDTO> uploadFile(MultipartFile file, UploadFileFormDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", formDTO);
+	public Result<UploadFileResultDTO> uploadFile(MultipartFile file, String customerId, String platformId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", customerId);
 	}
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index d645bac2b6..9eb8bd06bb 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -9,6 +9,7 @@ import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -55,13 +56,17 @@ public class ProjectController {
      * @author zhaoqifeng
      * @date 2021/3/25 11:13
      * @param file
-     * @param formDTO
+     * @param customerId
+     * @param platformId
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UploadFileResultDTO>
      */
-    @PostMapping("uploadfile")
-    public Result<UploadFileResultDTO> uploadFile(@RequestParam("file") MultipartFile file, UploadFileFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+    @PostMapping(value= "uploadfile" , consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public Result<UploadFileResultDTO> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("customerId") String customerId, @RequestParam("platformId") String platformId) {
+        UploadFileFormDTO formDTO = new UploadFileFormDTO();
         formDTO.setFile(file);
+        formDTO.setPlatformId(platformId);
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO);
         UploadFileResultDTO result = projectService.uploadFile(formDTO);
         return new Result<UploadFileResultDTO>().ok(result);
     }
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 4042b79217..4d9344ac43 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
@@ -2091,7 +2091,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					uploadFileFormDTO.setFile(multipartFileResult.getData());
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2112,7 +2113,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2133,7 +2134,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2152,7 +2153,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					if (!multipartFileResult.success()) {
 						throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 					}
-					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+					Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 					if (!uploadResult.success()) {
 						throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 					}
@@ -2207,7 +2208,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),
+						projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2226,7 +2228,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2245,7 +2247,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2264,7 +2266,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
-				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(), uploadFileFormDTO);
+				Result<UploadFileResultDTO> uploadResult = epmetThirdOpenFeignClient.uploadFile(multipartFileResult.getData(),projectStaff.getCustomerId(), formDTO.getPlatformId());
 				if (!uploadResult.success()) {
 					throw new RenException(uploadResult.getCode(), uploadResult.getMsg());
 				}
@@ -2440,6 +2442,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			detail = detail + process;
 		}
 		System.out.println(detail);
+		log.debug(detail);
 		return detail;
 
 	}

From 0d12e7c6b06a41c166894f420eea2b411a276c21 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 26 Mar 2021 14:14:24 +0800
Subject: [PATCH 42/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/ProjectSubProcessDao.java  |  6 +++---
 .../epmet/service/ProjectSubProcessService.java   |  4 ++--
 .../epmet/service/impl/ProjectServiceImpl.java    | 15 ++++++++++-----
 .../impl/ProjectSubProcessServiceImpl.java        |  6 +++---
 .../resources/mapper/ProjectSubProcessDao.xml     |  4 ++--
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
index dca510a468..e1e9658a0a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java
@@ -52,12 +52,12 @@ public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
     List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processIds")List<String> processIds);
 
     /**
-     * 根据platformId查找最新的记录
+     * 根据taskId查找最新的记录
      * @author zhaoqifeng
      * @date 2021/3/19 15:26
-     * @param platformId
+     * @param taskId
      * @return com.epmet.dto.ProjectSubProcessDTO
      */
-    ProjectSubProcessDTO selectSubProcessByPlatformId(@Param("platformId") String platformId);
+    ProjectSubProcessDTO selectSubProcessByTaskId(@Param("taskId") String taskId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
index 702192d210..cfc6180e6a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java
@@ -115,8 +115,8 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
      *
      * @author zhaoqifeng
      * @date 2021/3/19 15:24
-     * @param platformId
+     * @param taskId
      * @return com.epmet.dto.ProjectSubProcessDTO
      */
-    ProjectSubProcessDTO getSubProcessByPlatformId(String platformId);
+    ProjectSubProcessDTO getSubProcessByTaskId(String taskId);
 }
\ 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 4d9344ac43..8df752974f 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
@@ -56,6 +56,7 @@ import com.google.gson.GsonBuilder;
 import org.apache.commons.collections4.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -2204,7 +2205,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (String url : issueDetail.getData().getTopicInfo().getPhotoList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(url, UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(url, "image." + FilenameUtils.getExtension(url));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2224,7 +2225,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (TopicFileResultDTO item : topicAttachment.getData().getVoiceList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), "voice." + FilenameUtils.getExtension(item.getUrl()));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2243,7 +2244,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (TopicFileResultDTO item : topicAttachment.getData().getVideoList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), "video." + FilenameUtils.getExtension(item.getUrl()));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2262,7 +2263,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (TopicFileResultDTO item : topicAttachment.getData().getDocList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), "doc." + FilenameUtils.getExtension(item.getUrl()));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2352,7 +2353,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
 	@Override
 	public void platformCallBack(PlatformCallBackFormDTO formDTO) {
-		ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.getSubProcessByPlatformId(formDTO.getEventId());
+		ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.getSubProcessByTaskId(formDTO.getEventId());
 		projectSubProcessDTO.setExternalStatus(formDTO.getStatus());
 		projectSubProcessDTO.setResult(formDTO.getNote());
 		projectSubProcessDTO.setHandleDate(DateUtils.stringToDate(formDTO.getHandleDate(), DateUtils.DATE_TIME_PATTERN));
@@ -2454,4 +2455,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return gson.toJson(object);
 	}
 
+	private String getFileName(String url) {
+		return UUID.randomUUID().toString().replace("-", "") + "." + FilenameUtils.getExtension(url);
+	}
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
index 9506c781bd..7570da63d3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
@@ -132,14 +132,14 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
     /**
      * 根据platformId查找最新的记录
      *
-     * @param platformId
+     * @param taskId
      * @return com.epmet.dto.ProjectSubProcessDTO
      * @author zhaoqifeng
      * @date 2021/3/19 15:24
      */
     @Override
-    public ProjectSubProcessDTO getSubProcessByPlatformId(String platformId) {
-        return baseDao.selectSubProcessByPlatformId(platformId);
+    public ProjectSubProcessDTO getSubProcessByTaskId(String taskId) {
+        return baseDao.selectSubProcessByTaskId(taskId);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index 8beb65d0b2..5625f08d60 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -84,7 +84,7 @@
           AND psa.SUB_ID = #{subId}
         order by psa.sort
     </select>
-    <select id="selectSubProcessByPlatformId" resultType="com.epmet.dto.ProjectSubProcessDTO">
+    <select id="selectSubProcessByTaskId" resultType="com.epmet.dto.ProjectSubProcessDTO">
         select
             ID,
             CUSTOMER_ID,
@@ -103,7 +103,7 @@
         from project_sub_process
         where
               DEL_FLAG = '0'
-            AND PLATFORM_ID = #{platformId}
+            AND TASK_ID = #{taskId}
         order by CREATED_TIME DESC limit 1
 
     </select>

From d1418c4b5359bf4a1e57a267781808e3dded01d4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 26 Mar 2021 14:28:13 +0800
Subject: [PATCH 43/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index 5625f08d60..3e98453d09 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -86,7 +86,6 @@
     </select>
     <select id="selectSubProcessByTaskId" resultType="com.epmet.dto.ProjectSubProcessDTO">
         select
-            ID,
             CUSTOMER_ID,
             PROJECT_ID,
             PROCESS_ID,

From ef942e7017af32584c3126a3afc11f74aff0da55 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 26 Mar 2021 15:46:49 +0800
Subject: [PATCH 44/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ProjectServiceImpl.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 8df752974f..49ce81b9c5 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
@@ -2361,31 +2361,39 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		switch (formDTO.getStatus()) {
 			case NumConstant.ONE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("待处理");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.TWO_STR:
 				projectSubProcessDTO.setExternalStatusDesc("待核实");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.THREE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("已上报");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.FOUR_STR:
 				projectSubProcessDTO.setExternalStatusDesc("已完结");
-				projectSubProcessDTO.setInternalStatus(NumConstant.ONE_STR);
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.CLOSED);
 				break;
 			case NumConstant.FIVE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("处理中");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.SIX_STR:
 				projectSubProcessDTO.setExternalStatusDesc("待分发");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.SEVEN_STR:
 				projectSubProcessDTO.setExternalStatusDesc("归档");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.EIGHT_STR:
 				projectSubProcessDTO.setExternalStatusDesc("催办");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.NINE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("超时");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			default:
 				break;

From a30f68b5dd8dde0d9f6130f3a9874b4d78396698 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Mar 2021 15:59:47 +0800
Subject: [PATCH 45/51] =?UTF-8?q?subProcess=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ProjectTraceServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/ProjectSubProcessDao.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index e86057c3d6..d3b4e1d55f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -149,9 +149,9 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 		// 是否发送到外部系统 0否 1是
 		if (!CollectionUtils.isEmpty(subProcess)){
 			processList.forEach(p -> {
+				List<SubProcessDTO> process = new ArrayList<>();
 				subProcess.forEach(s -> {
 					if (p.getProcessId().equals(s.getProcessId())){
-						List<SubProcessDTO> process = new ArrayList<>();
 						process.add(s);
 						p.setSubProcess(process);
 					}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
index 3e98453d09..ef4ca830ed 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml
@@ -60,8 +60,8 @@
             psp.PLATFORM_NAME as platformName,
             psp.EXTERNAL_STATUS as externalStatus,
             psp.CREATED_TIME AS processTime,
-            psp.HANDLE_USER_NAME as handleUserName,
-            psp.RESULT as result,
+            IFNULL(psp.HANDLE_USER_NAME,'') as handleUserName,
+            IFNULL(psp.RESULT,'') as result,
             psp.process_id as processId
         FROM project_sub_process psp
         WHERE psp.DEL_FLAG = 0

From ec577333bf4ae247e37ef029d00547c6d7da6fd2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 1 Apr 2021 17:27:56 +0800
Subject: [PATCH 46/51] =?UTF-8?q?httpclient=E8=AF=BB=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
index ab38563025..74809f9d30 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
@@ -65,7 +65,7 @@ public class HttpClientManager {
 	// 连接超时时间,毫秒
 	private static int connectionTimeout = 5000;
 	// 读取数据超时时间，毫秒
-	private static int soTimeout = 20000;
+	private static int soTimeout = 45000;
 	private static String HEADER_CONTENT_TYPE = "Content-Type";
 	private static String HEADER_APPLICATION_JSON = "application/json;charset=utf-8";
 	private static String UTF8 = "utf-8";

From 90575798dcdbaca57983c4895f2a50c39ff2a097 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 2 Apr 2021 14:34:43 +0800
Subject: [PATCH 47/51] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9token=E9=87=8D=E8=AF=952=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/apiservice/ApiService.java |  4 ++++
 .../impl/LuzhouGridPlatformApiService.java    | 24 ++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index 9980f5dbc5..f1b01dbc96 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -31,6 +31,10 @@ import java.util.concurrent.TimeUnit;
  * 此抽象类中定义方法的具体返回类型，所有子类都要统一使用，在具体实现中做转换。若是不需要返回，返回null即可。
  */
 public abstract class ApiService {
+    /**
+     * 重试次数
+     */
+    protected final int RETRY_TIME = 3;
 
     /**
      * @Description 判断该客户是否注册了该平台
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index d3b39f4f47..52dce2bc30 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -3,36 +3,32 @@ package com.epmet.apiservice.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.LZGridPlatformBaseResult;
-import com.epmet.apiservice.result.LZGridPlatformProjectAssistResult;
-import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.ThirdPlatformActions;
 import com.epmet.dao.ThirdplatformActionDao;
 import com.epmet.dao.ThirdplatformDao;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.UploadFileFormDTO;
 import com.epmet.dto.result.ProjectAssistResult;
-import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformEntity;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**
  * 泸州网格化平台ApiService
  */
+@Slf4j
 @Component("luzhouGridPlatformApiService")
 public class LuzhouGridPlatformApiService extends ApiService {
 
@@ -51,13 +47,13 @@ public class LuzhouGridPlatformApiService extends ApiService {
             HashMap<String, Object> params = new HashMap<>();
             params.put("appKey", platformKey);
             params.put("appSecret", platformSecret);
-            Result<String> result = HttpClientManager.getInstance().sendGet(baseUrl.concat(actionEntity.getApiUrl()), params);
-
-            if (result == null) {
-                throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
-            }
+            Result<String> result = null;
+            int tryTime = 0;
+            do {
+                result = HttpClientManager.getInstance().sendGet(baseUrl.concat(actionEntity.getApiUrl()), params);
+            } while ((result == null || !result.success()) && super.RETRY_TIME<tryTime++);
 
-            if (!result.success()) {
+            if (result == null || !result.success()) {
                 throw new RenException("请求第三方平台，获取AccessToken失败。");
             }
 
@@ -92,7 +88,7 @@ public class LuzhouGridPlatformApiService extends ApiService {
             // 此处设置为第三方系统返回的唯一id
             projectAssistResult.setTaskId(lzResult.getResult());
         }
-        System.out.println("泸州网格化平台项目协助发送成功");
+        log.info("projectAssist 泸州网格化平台项目协助发送成功");
         return projectAssistResult;
     }
 

From 7fd52560d56c7ee17b5f662d8aca68f7b61e0973 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 2 Apr 2021 17:50:02 +0800
Subject: [PATCH 48/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 49ce81b9c5..bebf4654b5 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
@@ -2219,6 +2219,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(files)) {
 				String all = String.join(StrConstant.COMMA, files);
 				platformFileDTO.setTopicImages(all);
+				applyAssistFormDTO.setImageLink(all);
 			}
 		}
 		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getVoiceList())) {
@@ -2238,6 +2239,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(files)) {
 				String all = String.join(StrConstant.COMMA, files);
 				platformFileDTO.setTopicVoices(all);
+				applyAssistFormDTO.setVoiceLink(all);
 			}
 		}
 		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getVideoList())) {
@@ -2257,6 +2259,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(files)) {
 				String all = String.join(StrConstant.COMMA, files);
 				platformFileDTO.setTopicVideos(all);
+				applyAssistFormDTO.setVideoLink(all);
 			}
 		}
 		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getDocList())) {
@@ -2414,18 +2417,18 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		String source = "议题标题：" + sourceDTO.getIssueTitle() + "\n" +
 				"针对话题\n" +  (null == sourceDTO.getTopicContent()?"":sourceDTO.getTopicContent()) + "\n";
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicImages())) {
-			source = source + "话题图片:" + platformFileDTO.getTopicImages() + "\n";
-		}
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVoices())) {
-			source = source + "话题语音:" + platformFileDTO.getTopicVoices() + "\n";
-		}
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVideos())) {
-			source = source + "话题视频:" + platformFileDTO.getTopicVideos() + "\n";
-		}
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicDocs())) {
-			source = source + "话题文档:" + platformFileDTO.getTopicDocs() + "\n";
-		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicImages())) {
+//			source = source + "话题图片:" + platformFileDTO.getTopicImages() + "\n";
+//		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVoices())) {
+//			source = source + "话题语音:" + platformFileDTO.getTopicVoices() + "\n";
+//		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVideos())) {
+//			source = source + "话题视频:" + platformFileDTO.getTopicVideos() + "\n";
+//		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicDocs())) {
+//			source = source + "话题文档:" + platformFileDTO.getTopicDocs() + "\n";
+//		}
 		source = source + "建议采用如下处理方式\n" + sourceDTO.getIssueSuggestion() + "\n" +
 				"所属网格：" + sourceDTO.getBelongsGridName() + "\n" +
 				"话题发表人：" + sourceDTO.getTopicPublisher() + sourceDTO.getTopicPublisherMobile() + "\n" +
@@ -2447,7 +2450,6 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					DateUtils.formatTimestamp(item.getProcessTime(), DateUtils.DATE_TIME_PATTERN) + "\n" +
 					"处理部门：" + item.getDepartmentName() + "\n" +
 					"说明：" + item.getPublicReply() + "\n";
-			//TODO 上传图片
 			detail = detail + process;
 		}
 		System.out.println(detail);

From 8d10c15bcb146524111ab1a239dc97bad9cfe522 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 6 Apr 2021 09:55:34 +0800
Subject: [PATCH 49/51] =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=EF=BC=9B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80=20=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/apiservice/ApiService.java | 19 +++++++++++--------
 .../impl/LuzhouGridPlatformApiService.java    | 11 ++++++++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
index f1b01dbc96..36117287e1 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java
@@ -2,10 +2,8 @@ package com.epmet.apiservice;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.result.LZGridPlatformBaseResult;
-import com.epmet.dto.form.UploadFileFormDTO;
-import com.epmet.commons.tools.redis.RedisKeys;
-import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
@@ -14,10 +12,13 @@ import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.form.UploadFileFormDTO;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.entity.ThirdplatformEntity;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.io.File;
@@ -30,6 +31,7 @@ import java.util.concurrent.TimeUnit;
  * 每一个具体平台的ApiService都是该抽象类的子类，选择性实现抽象类中的某些需要实现方法，提供具体业务逻辑
  * 此抽象类中定义方法的具体返回类型，所有子类都要统一使用，在具体实现中做转换。若是不需要返回，返回null即可。
  */
+@Slf4j
 public abstract class ApiService {
     /**
      * 重试次数
@@ -73,12 +75,12 @@ public abstract class ApiService {
 
         // 填充access token到头当中
         headers.put("X-Access-Token", accessToken);
-
+        log.info("apiService sendGetRequest param:{},headers:{}",params,headers);
         Result<String> result = HttpClientManager.getInstance().sendGet(thirdplatform.getBaseUrl().concat(actionEntity.getApiUrl()),
                     thirdplatform.getBaseUrl().startsWith("https://"),
                     params,
                     headers);
-
+        log.info("apiService sendGetRequest result:{}",JSON.toJSONString(result));
         if (result == null) {
             throw new RenException("请求第三方平台，获取AccessToken失败。result为null");
         }
@@ -113,11 +115,12 @@ public abstract class ApiService {
         // 填充access token到头当中
         headers.put("X-Access-Token", accessToken);
 
+        log.info("apiService sendPostRequest param:{},headers:{}",jsonString,headers);
         Result<String> result = HttpClientManager.getInstance().sendPost(thirdplatform.getBaseUrl().concat(actionEntity.getApiUrl()),
                 thirdplatform.getBaseUrl().startsWith("https://"),
                 jsonString,
                 headers);
-
+        log.info("apiService sendPostRequest result:{}",JSON.toJSONString(result));
         if (result == null) {
             throw new RenException("请求第三方平台，发送Post请求失败。result为null");
         }
@@ -142,13 +145,13 @@ public abstract class ApiService {
 
         // 填充access token到头当中
         headers.put("X-Access-Token", accessToken);
-
+        log.info("apiService sendPostRequestToUploadFile fileName:{}",headers);
         Result<String> result = HttpClientManager.getInstance().uploadFile(thirdplatform.getBaseUrl().concat(actionEntity.getApiUrl()),
                 thirdplatform.getBaseUrl().startsWith("https://"),
                 file,
                 fileName,
                 headers);
-
+        log.info("apiService sendPostRequestToUploadFile result:{}",JSON.toJSONString(result));
         if (result == null) {
             throw new RenException("请求第三方平台，发送Post请求失败。result为null");
         }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
index 52dce2bc30..abbaad2255 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java
@@ -3,6 +3,7 @@ package com.epmet.apiservice.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.LZGridPlatformBaseResult;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
@@ -69,8 +70,16 @@ public class LuzhouGridPlatformApiService extends ApiService {
     @Override
     public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String platformId = formDTO.getPlatformId();
+        //开发环境由测试环境转发 所以 开发和本地 都使用测试环境地址
+        //todo 项目回调地址 仍需要从参数中获取
+        EnvEnum currentEnv = EnvEnum.getCurrentEnv();
+        if (EnvEnum.PROD.getCode().equals(currentEnv.getCode())) {
+            formDTO.setNotifyUrl(EnvEnum.PROD.getUrl().concat("gov/project/project/platformcallback"));
+        } else {
+            formDTO.setNotifyUrl(EnvEnum.TEST.getUrl().concat("gov/project/project/platformcallback"));
+        }
+
 
-        formDTO.setNotifyUrl("https://epmet-dev.elinkservice.cn/api/gov/project/project/platformcallback");
 
         // 正式调用第三方平台
         String argsStr = JSON.toJSONString(formDTO);

From d99618d4333b241c6a54d36639a2b8f01d2bf0d4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 6 Apr 2021 14:18:51 +0800
Subject: [PATCH 50/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ProjectServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index bebf4654b5..251e86ec57 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
@@ -2181,12 +2181,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		IssueDetailFormDTO issueDetailFormDTO = new IssueDetailFormDTO();
 		issueDetailFormDTO.setIssueId(projectEntity.getOriginId());
 		Result<GovIssueDetailResultDTO> issueDetail = govIssueOpenFeignClient.votingissuedetail(issueDetailFormDTO);
-		if (!issueDetail.success()) {
+		if (!issueDetail.success() || null == issueDetail.getData()) {
 			throw new RenException(issueDetail.getCode(), issueDetail.getMsg());
 		}
 		//获取话题详情
 		Result<ResiTopicDTO> topic =  resiGroupOpenFeignClient.getTopicById(issueDetail.getData().getTopicInfo().getTopicId());
-		if (!topic.success()) {
+		if (!topic.success() || null == topic.getData()) {
 			throw new RenException(topic.getCode(), topic.getMsg());
 		}
 		applyAssistFormDTO.setLatitude(topic.getData().getDimension());
@@ -2198,7 +2198,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		TopicAttachmentFormDTO topicAttachmentFormDTO = new TopicAttachmentFormDTO();
 		topicAttachmentFormDTO.setTopicId(issueDetail.getData().getTopicInfo().getTopicId());
 		Result<TopicAttachmentResultDTO> topicAttachment =  resiGroupOpenFeignClient.topicAttachmentList(topicAttachmentFormDTO);
-		if (!topicAttachment.success()) {
+		if (!topicAttachment.success() || null == topicAttachment.getData()) {
 			throw new RenException(topicAttachment.getCode(), topicAttachment.getMsg());
 		}
 		if (CollectionUtils.isNotEmpty(issueDetail.getData().getTopicInfo().getPhotoList())) {

From e1bbddcde29aad05b3020a0c5b1291dc104575c3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 7 Apr 2021 13:50:29 +0800
Subject: [PATCH 51/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/{V0.0.8__platform.sql => V0.0.10__platform.sql}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/{V0.0.8__platform.sql => V0.0.10__platform.sql} (100%)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.10__platform.sql
similarity index 100%
rename from epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql
rename to epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.10__platform.sql