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 741b8f9..549f1d4 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 @@ -711,20 +711,56 @@ public interface AnalysisFeignClient { Result agencygrouptotal(ScreenJobFormDTO formDto); /** - * @Description 网格员数据分析上报 + * @Description 网格员数据分析上报 * @Author songyunpeng - * @Date 2021/7/12 + * @Date 2021/7/12 * @Param [customId] **/ @PostMapping("analysis/girdManager/gridManagerUploadData") Result selectGridManagerUploadData(); + /** - * @Description 网格员事件总数上报 + * @Description 网格员事件总数上报 * @Author songyunpeng - * @Date 2021/7/12 + * @Date 2021/7/12 * @Param [customId] **/ @PostMapping("analysis/girdManager/gridManagerUploadEvent") Result selectGridManagerUploadEvent(ScreenJobFormDTO formDto); + // 治理能力 + + /** + * 01、治理能力排行数据(按日统计)数据 + * + * @param formDto 定时入参 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 10:57 + */ + @PostMapping("analysis/data/stats/governance/governrankdatadaily") + Result governrankdatadaily(ScreenJobFormDTO formDto); + + /** + * 02、网格治理指数(天) + * + * @param formDto 定时入参 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 10:57 + */ + @PostMapping("analysis/data/stats/governance/gridgoverndaily") + Result gridgoverndaily(ScreenJobFormDTO formDto); + + /** + * 03、组织治理指数(天) + * + * @param formDto 定时入参 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/6/28 10:57 + */ + @PostMapping("analysis/data/stats/governance/agencygoverndaily") + Result agencygoverndaily(ScreenJobFormDTO formDto); + } 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 e9de33c..cab7bea 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 @@ -350,4 +350,19 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result selectGridManagerUploadEvent(ScreenJobFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridManagerUploadEvent",formDto); } + + @Override + public Result governrankdatadaily(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "governrankdatadaily",formDto); + } + + @Override + public Result gridgoverndaily(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridgoverndaily",formDto); + } + + @Override + public Result agencygoverndaily(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencygoverndaily",formDto); + } } diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTask.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTask.java new file mode 100644 index 0000000..54aef2f --- /dev/null +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTask.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.task.screen; + +/** + * 治理能力数据推送 + * + * @author zhy + * @date 2021/6/28 10:42 + */ +public interface ScreenGovernancePushTask { + + /** + * 大屏数据推送 + * + * @param param 入参 + * 参数格式:{'gridPartyMemberData':'2020-08','gridPartyAbility':'2020-08','orgPartyAbility':'2020-08','gridServiceAbility':'2020-08','orgServiceAbility':'2020-08','gridGovernAbility':'2020-08','orgGovernAbility':'2020-08','deptGovernAbility':'2020-08','all':'2020-08'} + * @return void + * @author Liuchuang + * @since 2020/9/9 15:21 + */ + void run(String param); +} diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTaskImpl.java new file mode 100644 index 0000000..94668e7 --- /dev/null +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTaskImpl.java @@ -0,0 +1,97 @@ +package com.elink.esua.epdc.task.screen; + +import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.dto.ScreenGovernanceParamDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 治理能力数据推送 + * + * @author zhy + * @date 2021/6/28 10:42 + */ +@Component("screenGovernancePushTask") +public class ScreenGovernancePushTaskImpl implements ScreenGovernancePushTask { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private AnalysisFeignClient analysisFeignClient; + + @Override + public void run(String param) { + // 参数处理 + ScreenGovernanceParamDTO paramDto = new ScreenGovernanceParamDTO(); + if (StringUtils.isNotEmpty(param)) { + paramDto = JSONObject.parseObject(param, ScreenGovernanceParamDTO.class); + } + // 01、治理能力排行数据(按日统计)数据 + governrankdatadaily(paramDto.getGovernrankdatadaily()); + // 02、网格治理指数(天) + gridgoverndaily(paramDto.getGridgoverndaily()); + // 03、组织治理指数(天) + agencygoverndaily(paramDto.getAgencygoverndaily()); + + } + + /** + * 01、治理能力排行数据(按日统计)数据 + * + * @param yearMonth 统计月份,格式yyyyMMdd + * @return void + * @author zhy + * @date 2021/6/28 10:47 + */ + public void governrankdatadaily(String yearMonth) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(yearMonth); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|治理能力排行数据(按日统计)数据>定时任务开始执行" + yearMonth); + analysisFeignClient.governrankdatadaily(formDto); + logger.info("<" + methodName + "|治理能力排行数据(按日统计)数据>定时任务执行结束"); + } + + /** + * 02、网格治理指数(天) + * + * @param yearMonth + * @return void + * @author zhy + * @date 2021/6/28 10:47 + */ + public void gridgoverndaily(String yearMonth) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(yearMonth); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|网格治理指数>定时任务开始执行"); + analysisFeignClient.gridgoverndaily(formDto); + logger.info("<" + methodName + "|网格治理指数>定时任务执行结束"); + } + + /** + * 03、组织治理指数(天) + * + * @param yearMonth + * @return void + * @author zhy + * @date 2021/6/28 10:47 + */ + public void agencygoverndaily(String yearMonth) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(yearMonth); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|组织治理指数>定时任务开始执行"); + analysisFeignClient.agencygoverndaily(formDto); + logger.info("<" + methodName + "|组织治理指数>定时任务执行结束"); + } + +}