From 1498bc16c9f4282d1b8db76df0f21762dab881f8 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 6 Jan 2022 17:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=8C=BA?=
 =?UTF-8?q?=E5=9D=97=E9=93=BE=E4=B8=8A=E9=93=BE=E8=B0=83=E7=94=A8third=20f?=
 =?UTF-8?q?eign=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/ThirdOpenFeignClient.java | 21 +++++++++++++++----
 .../ThirdOpenFeignClientFallback.java         | 15 +++++++++----
 .../impl/BlockChainUploadServiceImpl.java     |  3 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
index d4efa88cc9..3dfd425fd9 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -2,10 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
-import com.epmet.dto.form.ComponentAccessTokenFormDTO;
-import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
-import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallback;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallbackFactory;
@@ -57,4 +54,20 @@ public interface ThirdOpenFeignClient {
      */
     @PostMapping("/third/private-epmet/push-authorizer-tokens")
     Result pushAuthorizerTokens(@RequestBody AuthorizerAccessTokenFormDTO input);
+
+    /**
+     * 区块链：立项
+     * @param input
+     * @return
+     */
+    @PostMapping("/third/blockchain/project/create")
+    Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input);
+
+    /**
+     * 区块链：处理进展
+     * @param input
+     * @return
+     */
+    @PostMapping("/third/blockchain/project/process")
+    Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input);
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
index b6929b9883..5e21b0b853 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
@@ -3,10 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
-import com.epmet.dto.form.ComponentAccessTokenFormDTO;
-import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
-import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.ThirdOpenFeignClient;
 import org.springframework.stereotype.Component;
@@ -34,4 +31,14 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
     public Result pushAuthorizerTokens(AuthorizerAccessTokenFormDTO input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "pushAuthorizerTokens", input);
     }
+
+    @Override
+    public Result blockChainCreateProject(BlockChainCreateProjectFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "blockChainCreateProject", input);
+    }
+
+    @Override
+    public Result blockChainProcessProject(BlockChainProcessProjectFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "blockChainProcessProject", input);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
index 5197b2a20b..18f4d39d4a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
@@ -8,6 +8,7 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.EpmetThirdOpenFeignClient;
+import com.epmet.feign.ThirdOpenFeignClient;
 import com.epmet.service.BlockChainUploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -27,7 +28,7 @@ import java.util.stream.Collectors;
 public class BlockChainUploadServiceImpl implements BlockChainUploadService {
 
     @Autowired
-    private EpmetThirdOpenFeignClient thirdOpenFeignClient;
+    private ThirdOpenFeignClient thirdOpenFeignClient;
 
     @Autowired
     private ProjectStaffDao projectStaffDao;