diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java index ab847a280..eafb1892a 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java @@ -25,7 +25,7 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl cpcbasedata() { - List result = baseDao.cpcbasedata(); + List resultList = baseDao.cpcbasedata(); return null; } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java index 3907e37de..28743eac2 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClintFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; /** * @author: qushutong @@ -38,4 +39,54 @@ public interface AnalysisFeignClint { @GetMapping("analysis/metauserpartyrank/toLeadPartyRankData") Result toLeadPartyRankData(); + /** + * @describe: <大屏-党员基本情况>数据推送 + * @author wangtong + * @date 2020/8/24 14:01 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/cpcbasedata") + Result cpcbasedata(); + + /** + * @describe: <大屏-事件数据>数据推送 + * @author wangtong + * @date 2020/8/24 14:15 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/eventdata") + Result eventdata(); + + /** + * @describe: <大屏-党建引领-党员联系群众数据>数据推送 + * @author wangtong + * @date 2020/8/24 14:15 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/partylinkmassesdata") + Result partylinkmassesdata(); + + /** + * @describe: <大屏-党建引领-先锋模范数据>数据推送 + * @author wangtong + * @date 2020/8/24 14:15 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/pioneerdata") + Result pioneerdata(); + + /** + * @describe: <大屏-中央区各类总数>数据推送 + * @author wangtong + * @date 2020/8/24 14:15 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/usertotaldata") + Result usertotaldata(); + } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java index dc3783417..b5d1a09fe 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java @@ -28,4 +28,29 @@ public class AnalysisFeignClintFallback implements AnalysisFeignClint { public Result toLeadPartyRankData() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "toLeadPartyRankData", ""); } + + @Override + public Result cpcbasedata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "cpcbasedata", ""); + } + + @Override + public Result eventdata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "eventdata", ""); + } + + @Override + public Result partylinkmassesdata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partylinkmassesdata", ""); + } + + @Override + public Result pioneerdata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "pioneerdata", ""); + } + + @Override + public Result usertotaldata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "usertotaldata", ""); + } } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTask.java new file mode 100644 index 000000000..12240a1f5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTask.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.task.screen; + + +/** +* @describe: 大屏展示推送数据接口-每5分钟推送一次 +* @author wangtong +* @date 2020/8/24 13:54 +*/ +public interface PushDataEveryFiveMinTask { + + /** + * @describe: 大屏数据推送 + * @author wangtong + * @date 2020/8/24 13:55 + * @params [] + * @return void + */ + void run(); + + +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java new file mode 100644 index 000000000..2cc817b2f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java @@ -0,0 +1,73 @@ +package com.elink.esua.epdc.task.screen; + +import com.elink.esua.epdc.feign.AnalysisFeignClint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @program: esua-epdc + * @description: 大屏展示推送数据-每5分钟 + * @author: wangtong + * @create: 2020-08-24 13:45 + **/ +@Component("pushDataEveryFiveMinTask") +public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private AnalysisFeignClint analysisFeignClint; + + @Override + public void run() { + + } + + + public void cpcbasedata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|党员基本情况>定时任务开始执行"); + analysisFeignClint.cpcbasedata(); + logger.info("<"+methodName+"|党员基本情况>定时任务执行结束"); + } + + + public void eventdata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|事件数据>定时任务开始执行"); + analysisFeignClint.eventdata(); + logger.info("<"+methodName+"|事件数据>定时任务执行结束"); + } + + + public void partylinkmassesdata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务开始执行"); + analysisFeignClint.partylinkmassesdata(); + logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务执行结束"); + } + + + public void pioneerdata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务开始执行"); + analysisFeignClint.pioneerdata(); + logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务执行结束"); + } + + + public void usertotaldata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|中央区各类总数>定时任务开始执行"); + analysisFeignClint.usertotaldata(); + logger.info("<"+methodName+"|中央区各类总数>定时任务执行结束"); + } + +} \ No newline at end of file