From c3893ac53bfb9f8deeccce74327becfa966eb821 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 18 Nov 2021 10:48:11 +0800
Subject: [PATCH] =?UTF-8?q?merge=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/feign/AnalysisFeignClient.java  | 20 +++++++++++++++++++
 .../fallback/AnalysisFeignClientFallback.java | 10 ++++++++++
 2 files changed, 30 insertions(+)

diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index 549f1d4..606c1af 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -763,4 +763,24 @@ public interface AnalysisFeignClient {
     @PostMapping("analysis/data/stats/governance/agencygoverndaily")
     Result agencygoverndaily(ScreenJobFormDTO formDto);
 
+    /**
+     * @describe: 网格开通情况
+     * @author wangtong
+     * @date 2021/8/24 14:57
+     * @params []
+     * @return void
+     */
+    @GetMapping("analysis/user/gridOpeningJob")
+    void gridOpeningJob();
+
+    /**
+     * 获取组织活动信息并保存
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author lc
+     * @since 2021/8/28 19:25
+     */
+    @PostMapping("analysis/workLog/saveOrgInfo")
+    Result getAndSaveOrgActInfoFromWorkLogSystem();
+
 }
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
index cab7bea..9240717 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -365,4 +365,14 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result agencygoverndaily(ScreenJobFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencygoverndaily",formDto);
     }
+
+    @Override
+    public void gridOpeningJob( ) {
+        ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridOpeningJob");
+    }
+
+    @Override
+    public Result getAndSaveOrgActInfoFromWorkLogSystem() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getAndSaveOrgActInfoFromWorkLogSystem");
+    }
 }