Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-gateway/src/main/resources/bootstrap.yml

@@ -440,9 +440,7 @@ epmet:
 
   # 外部应用认证，使用AccessToken等头进行认证
   externalAuthUrls:
-    - /data/report/test/test
+    - /data/report/**
-    - /data/report/screen/**
-    - /data/report/kcscreen/**
     - /epmetuser/customerstaff/customerlist
 
   swaggerUrls:

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
@@ -229,4 +230,14 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping(value = "/data/stats/screenextract/extractdailyall")
     Result extractDailyAll(@RequestBody(required = false) ExtractOriginFormDTO extractOriginFormDTO);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param extractScreenFormDTO
+     * @author yinzuomei
+     * @description
+     * @Date 2020/9/28 11:05
+     **/
+    @PostMapping("/data/stats/screenextract/extractmonthlyall")
+    Result extractMonthlyAll(ExtractScreenFormDTO extractScreenFormDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
@@ -217,4 +218,16 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result extractDailyAll(ExtractOriginFormDTO extractOriginFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "extractDailyAll", extractOriginFormDTO);
     }
+
+    /**
+     * @param extractScreenFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description
+     * @Date 2020/9/28 11:05
+     **/
+    @Override
+    public Result extractMonthlyAll(ExtractScreenFormDTO extractScreenFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "screenExtractMonthly", extractScreenFormDTO);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java

@@ -39,7 +39,7 @@ public class ScreenExtractDailyController {
      * @author zxc
      * @date 2020/9/24 10:15 上午
      */
-    @PostMapping("extractmonthlyyall")
+    @PostMapping("extractmonthlyall")
     public Result screenExtractMonthly(@RequestBody ExtractScreenFormDTO formDTO) {
         screenExtractService.extractMonthlyAll(formDTO);
         return new Result();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -36,6 +36,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private OrgRankExtractService orgRankExtractService;
     @Autowired
     private GovernRankDataExtractService governRankDataExtractService;
+    @Autowired
+    private PublicPartiTotalDataExtractService publicPartiTotalDataExtractService;
 
     /**
      * @param extractOriginFormDTO
@@ -108,10 +110,14 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
      * @date 2020/9/24 10:16 上午
      */
     public void extractDaily(String customerId, String dateId) {
-//        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId);
+        //党员基本情况
+        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId);
+        //先锋模范
         pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
         pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
         pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
+        //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）
+        publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId,dateId);
     }
 
     /**
@@ -124,6 +130,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         formDTO.setCustomerId(customerId);
         formDTO.setMonthId(monthId);
 
+        //基层治理-公众参与screen_user_join
         publicPartExtractService.extractTotalDataMonthly(formDTO);
         //治理能力排行
         governRankDataExtractService.extractGridData(customerId, monthId);

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ScreenExtractTaskService.java

@@ -8,6 +8,15 @@ import com.epmet.commons.tools.utils.Result;
  */
 public interface ScreenExtractTaskService {
 
+
     Result screenExtractDaily(String params);
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param params
+     * @author yinzuomei
+     * @description 大屏数据抽取-按月统计
+     * @Date 2020/9/28 10:49
+     **/
+    Result screenExtractMonthly(String params);
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ScreenExtractTaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.service.ScreenExtractTaskService;
 import lombok.extern.slf4j.Slf4j;
@@ -30,4 +31,20 @@ public class ScreenExtractTaskServiceImpl implements ScreenExtractTaskService {
         }
         return dataStatisticalOpenFeignClient.extractDailyAll(extractOriginFormDTO);
     }
+
+    /**
+     * @param params
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 大屏数据抽取-按月统计
+     * @Date 2020/9/28 10:49
+     **/
+    @Override
+    public Result screenExtractMonthly(String params) {
+        ExtractScreenFormDTO extractScreenFormDTO=new ExtractScreenFormDTO();
+        if(StringUtils.isNotBlank(params)){
+            extractScreenFormDTO=JSON.parseObject(params,ExtractScreenFormDTO.class);
+        }
+        return dataStatisticalOpenFeignClient.extractMonthlyAll(extractScreenFormDTO);
+    }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ScreenExtractMonthlyTask.java

@@ -0,0 +1,34 @@
+package com.epmet.task;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.ScreenExtractTaskService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 大屏数据抽取-按月统计
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/28 10:39
+ */
+@Component("screenExtractMonthlyTask")
+public class ScreenExtractMonthlyTask implements ITask{
+    @Autowired
+    private ScreenExtractTaskService screenExtractTaskService;
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+
+    @Override
+    public void run(String params) {
+        logger.info("ScreenExtractMonthlyTask定时任务正在执行，参数为：{}", params);
+        Result result = screenExtractTaskService.screenExtractMonthly(params);
+        if (result.success()){
+            logger.info("ScreenExtractMonthlyTask定时任务执行成功");
+        }else {
+            logger.error("ScreenExtractMonthlyTask定时任务执行失败:" + result.getMsg());
+        }
+    }
+}