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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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/17] =?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>