merge缺失

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();
+
 }

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");
+    }
 }