增加类别的task

epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -365,6 +366,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/cpcbasedata")
     Result cpcbasedata();
+
     /**
      * 002、党建引领-先锋模范数据
      *
@@ -374,6 +376,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/pioneerdata")
     Result pioneerdata();
+
     /**
      * 003、党建引领-党员联系群众数据
      *
@@ -383,6 +386,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/partylinkmassesdata")
     Result partylinkmassesdata();
+
     /**
      * 004、党建引领-先进排行榜单-先进支部排行
      *
@@ -392,6 +396,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/orgrankdata")
     Result orgrankdata(ScreenJobFormDTO formDto);
+
     /**
      * 005、党建引领|基层治理-居民（党员）积分排行榜
      *
@@ -401,8 +406,9 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/partyuserrankdata")
     Result partyuserrankdata();
+
     /**
-     *  006、基层治理-难点赌点项目上报
+     * 006、基层治理-难点赌点项目上报
      *
      * @return void
      * @author Liuchuang
@@ -410,6 +416,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/difficultydata")
     Result difficultydata();
+
     /**
      * 007、基层治理-公众参与
      *
@@ -419,6 +426,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/userjoin")
     Result userjoin(ScreenJobFormDTO formDto);
+
     /**
      * 008、公众参与各类总数
      *
@@ -428,6 +436,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/publicpartitotaldata")
     Result publicpartitotaldata();
+
     /**
      * 009、基层治理-治理能力数据
      *
@@ -437,6 +446,7 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/screencoll/governrankdata")
     Result governrankdata(ScreenJobFormDTO formDto);
+
     /**
      * 010、中央区各类总数
      *
@@ -449,65 +459,97 @@ public interface AnalysisFeignClient {
 
 
     /**
-     * @Description  项目信息上报
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 项目信息上报
      * @Author songyunpeng
-     * @Date  2021/2/23
+     * @Date 2021/2/23
      * @Param []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @PostMapping("analysis/data/stats/project/uploadprojectinfo")
     Result uploadProjectInfo(@RequestBody ScreenProjectFormDTO screenProjectFormDTO);
+
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Description 项目处理进展上报
      * @Author songyunpeng
-     * @Date  2021/2/23
+     * @Date 2021/2/23
      * @Param []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @PostMapping("analysis/data/stats/project/uploadprojectprocess")
     Result uploadProjectProcess(@RequestBody ScreenProjectFormDTO screenProjectFormDTO);
 
 
     //*************************【事件/项目分析】*6**********************
+
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 【事件/项目分析】网格内事件
      * @author wangtong
      * @date 2021/2/24 14:08
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("analysis/data/stats/project/project-grid-daily")
     Result projectGridDaily();
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 【事件/项目分析】组织内事件
      * @author wangtong
      * @date 2021/2/24 14:09
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("analysis/data/stats/project/project/project-org-daily")
     Result projectOrgDaily();
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 【事件/项目分析】网格内月度数量统计
      * @author wangtong
      * @date 2021/2/24 14:09
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("analysis/data/stats/project/quantity-grid-monthly")
     Result quantityGridMonthly(ScreenJobFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 【事件/项目分析】组织内月度数量统计
      * @author wangtong
      * @date 2021/2/24 14:09
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("analysis/data/stats/project/quantity-org-monthly")
     Result quantityOrgMonthly(ScreenJobFormDTO formDto);
 
+    /**
+     * 【事件/项目分析】按类别统计-网格（03-22已确定）
+     *
+     * @param date
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/3/23 14:35
+     */
+    @GetMapping("analysis/item/categoryGridDaily")
+    Result getCategoryGridDaily(String date);
+
+    /**
+     * 【事件/项目分析】按类别统计-组织（03-22已确定）
+     *
+     * @param date
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/3/23 14:35
+     */
+    @GetMapping("analysis/item/categoryOrgDaily")
+    Result getCategoryOrgDaily(String date);
 
+    /**
+     * @Description 分类编码上报
+     * @Author songyunpeng
+     * @Date  2021/2/23
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("analysis/category/uploadCategoryCode")
+    Result uploadCategoryCode();
 }

epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -254,4 +254,18 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "usertotaldata");
     }
 
+    @Override
+    public Result getCategoryGridDaily(String date) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryGridDaily");
+    }
+
+    @Override
+    public Result getCategoryOrgDaily(String date) {
+        return  ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryOrgDaily", "");
+    }
+
+    @Override
+    public Result uploadCategoryCode() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "uploadCategoryCode");
+    }
 }

epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/CategoryDailyReportTask.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.task.analysis;
+
+/**
+ * 【事件/项目分析】按类别统计-网格（03-22已确定）
+ *
+ * @author zhy
+ * @date 2021/3/23 14:28
+ */
+public interface CategoryDailyReportTask {
+
+    /**
+     * 【事件/项目分析】按类别统计-网格（03-22已确定）
+     *
+     * @param params
+     * @return void
+     * @author zhy
+     * @date 2021/3/23 14:28
+     */
+    void run(String params);
+}

epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/CategoryDailyReportTaskImpl.java

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.task.analysis;
+
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 【事件/项目分析】按类别统计-网格（03-22已确定）
+ *
+ * @author zhy
+ * @date 2021/3/23 14:28
+ */
+@Component("CategoryDailyTask")
+public class CategoryDailyReportTaskImpl implements CategoryDailyReportTask {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private AnalysisFeignClient analysisFeignClient;
+
+    @Override
+    public void run(String params) {
+        logger.debug("CategoryGridDailyTask定时任务正在执行，参数为：{}", params);
+        analysisFeignClient.getCategoryGridDaily(params);
+        logger.debug("CategoryOrgDailyTask定时任务正在执行，参数为：{}", params);
+        analysisFeignClient.getCategoryOrgDaily(params);
+
+        logger.info("<项目分类字典上报>定时任务开始执行");
+        analysisFeignClient.uploadCategoryCode();
+        logger.info("<项目分类字典上报>定时任务执行结束");
+    }
+}