From 35294ac61aaa821abedf29506816c5790ec50b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 3 Mar 2021 14:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- .../esua/epdc/feign/AnalysisFeignClient.java | 10 +- .../fallback/AnalysisFeignClientFallback.java | 21 ++-- .../ScreenProjectDataPushDayTaskImpl.java | 61 +-------- .../screen/ScreenPublicDataPushTaskImpl.java | 116 ++++++++++++++++-- 5 files changed, 129 insertions(+), 81 deletions(-) diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 43f964b..48965c0 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 43f964b23834db67899f4dac0f97ab99d25e225a +Subproject commit 48965c0cc93cfb5dbaf3f6f649f11ac9856ee8e4 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 dfcd8d9..5f7c86d 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 @@ -391,7 +391,7 @@ public interface AnalysisFeignClient { * @since 2020/9/17 14:02 */ @PostMapping("analysis/data/stats/screencoll/orgrankdata") - Result orgrankdata(); + Result orgrankdata(ScreenJobFormDTO formDto); /** * 005、党建引领|基层治理-居民（党员）积分排行榜 * @@ -418,7 +418,7 @@ public interface AnalysisFeignClient { * @since 2020/9/17 14:02 */ @PostMapping("analysis/data/stats/screencoll/userjoin") - Result userjoin(); + Result userjoin(ScreenJobFormDTO formDto); /** * 008、公众参与各类总数 * @@ -436,7 +436,7 @@ public interface AnalysisFeignClient { * @since 2020/9/17 14:02 */ @PostMapping("analysis/data/stats/screencoll/governrankdata") - Result governrankdata(); + Result governrankdata(ScreenJobFormDTO formDto); /** * 010、中央区各类总数 * @@ -497,7 +497,7 @@ public interface AnalysisFeignClient { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("analysis/data/stats/project/quantity-grid-monthly") - Result quantityGridMonthly(); + Result quantityGridMonthly(ScreenJobFormDTO formDto); /** * @describe: 【事件/项目分析】组织内月度数量统计 @@ -507,7 +507,7 @@ public interface AnalysisFeignClient { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("analysis/data/stats/project/quantity-org-monthly") - Result quantityOrgMonthly(); + Result quantityOrgMonthly(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 41362ec..ba8bf05 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 @@ -186,13 +186,13 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result quantityGridMonthly() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "quantityGridMonthly"); + public Result quantityGridMonthly(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "quantityGridMonthly",formDto); } @Override - public Result quantityOrgMonthly() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "quantityOrgMonthly"); + public Result quantityOrgMonthly(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "quantityOrgMonthly",formDto); } @Override @@ -221,8 +221,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result orgrankdata() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "orgrankdata"); + public Result orgrankdata(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "orgrankdata",formDto); } @Override @@ -236,18 +236,17 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result userjoin() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "userjoin"); + public Result userjoin(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "userjoin",formDto); } - @Override public Result publicpartitotaldata() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "publicpartitotaldata"); } @Override - public Result governrankdata() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "governrankdata"); + public Result governrankdata(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "governrankdata",formDto); } @Override diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushDayTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushDayTaskImpl.java index 9ed1785..03901da 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushDayTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushDayTaskImpl.java @@ -42,7 +42,7 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP @Override public void run(String param) { - for(int i = 0 ; i < 14 ; i++){ + for(int i = 0 ; i < 11 ; i++){ createThread(i); } } @@ -70,24 +70,15 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP //003、党建引领-党员联系群众数据 customerPartylinkmassesdata(); }else if (methodIndex == 7){ - //004、党建引领-先进排行榜单-先进支部排行 - customerOrgrankdata(); - }else if (methodIndex == 8){ //005、党建引领|基层治理-居民（党员）积分排行榜 customerPartyuserrankdata(); - }else if (methodIndex == 9){ + }else if (methodIndex == 8){ //006、基层治理-难点赌点项目上报 customerDifficultydata(); - }else if (methodIndex == 10){ - //007、基层治理-公众参与 - customerUserjoin(); - }else if (methodIndex == 11){ + }else if (methodIndex == 9){ // 008、公众参与各类总数 customerPublicpartitotaldata(); - }else if (methodIndex == 12){ - //009、基层治理-治理能力数据 - customerGovernrankdata(); - }else if (methodIndex == 13){ + }else if (methodIndex == 10){ // 010、中央区各类总数 customerUsertotaldata(); } @@ -217,20 +208,7 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP logger.info("<" + methodName + "|中央区各类总数>定时任务执行结束"); } - /** - * 009、基层治理-治理能力数据 - * - * @return void - * @author WK - * @since 2020/9/17 14:01 - */ - private void customerGovernrankdata() { - // 方法名 - String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); - logger.info("<" + methodName + "|基层治理-治理能力数据>定时任务开始执行"); - analysisFeignClient.governrankdata(); - logger.info("<" + methodName + "|基层治理-治理能力数据>定时任务执行结束"); - } + /** * 008、公众参与各类总数 @@ -247,20 +225,7 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP logger.info("<" + methodName + "|公众参与各类总数>定时任务执行结束"); } - /** - * 007、基层治理-公众参与 - * - * @return void - * @author WK - * @since 2020/9/17 14:01 - */ - private void customerUserjoin() { - // 方法名 - String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); - logger.info("<" + methodName + "|基层治理-公众参与>定时任务开始执行"); - analysisFeignClient.userjoin(); - logger.info("<" + methodName + "|基层治理-公众参与>定时任务执行结束"); - } + /** * 006、基层治理-难点赌点项目上报 @@ -292,20 +257,6 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP logger.info("<" + methodName + "|党建引领|基层治理-居民（党员）积分排行榜>定时任务执行结束"); } - /** - * 004、党建引领-先进排行榜单-先进支部排行 - * - * @return void - * @author WK - * @since 2020/9/17 14:01 - */ - private void customerOrgrankdata() { - // 方法名 - String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); - logger.info("<" + methodName + "|党建引领-先进排行榜单-先进支部排行>定时任务开始执行"); - analysisFeignClient.orgrankdata(); - logger.info("<" + methodName + "|党建引领-先进排行榜单-先进支部排行>定时任务执行结束"); - } /** * 003、党建引领-党员联系群众数据 diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java index 8d8f5d4..bd3eee6 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java @@ -2,6 +2,8 @@ package com.elink.esua.epdc.task.screen; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.ScreenJobBasicDataParamDTO; +import com.elink.esua.epdc.dto.ScreenJobMonthDataParamDTO; +import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -33,26 +35,33 @@ public class ScreenPublicDataPushTaskImpl implements ScreenPublicDataPushTask { @Override public void run(String param) { // 参数处理 - ScreenJobBasicDataParamDTO paramDto = new ScreenJobBasicDataParamDTO(); + ScreenJobMonthDataParamDTO paramDto = new ScreenJobMonthDataParamDTO(); if (StringUtils.isNotEmpty(param)) { - paramDto = JSONObject.parseObject(param, ScreenJobBasicDataParamDTO.class); + paramDto = JSONObject.parseObject(param, ScreenJobMonthDataParamDTO.class); } - for(int i = 0 ; i < 3 ; i++){ - createThread(i, paramDto); + for(int i = 0 ; i < 5 ; i++){ + createThread(i,paramDto); } } - public Integer createThread(Integer methodIndex, ScreenJobBasicDataParamDTO paramDto){ + public Integer createThread(Integer methodIndex, ScreenJobMonthDataParamDTO paramDto){ Future future = service.submit(new Callable() { @Override public Integer call() throws Exception { Thread.sleep(200); if (methodIndex == 0) { - customerAgency(); + quantityGridMonthly(paramDto.getGridMonthDataMonthId()); } else if (methodIndex == 1){ - customerGrid(); - } else if (methodIndex == 2){ - customerDept(); + quantityOrgMonthly(paramDto.getOrgMonthDataMonthId()); + }else if (methodIndex == 2){ + //004、党建引领-先进排行榜单-先进支部排行 -- + customerOrgrankdata(paramDto.getCustomerOrgRankDataMonthId()); + }else if (methodIndex == 3){ + //007、基层治理-公众参与 -- + customerUserjoin(paramDto.getCustomerUserJoinMonthId()); + }else if (methodIndex == 4){ + //009、基层治理-治理能力数据 -- + customerGovernrankdata(paramDto.getCustomerGovernRankData()); } return 0; } @@ -80,7 +89,41 @@ public class ScreenPublicDataPushTaskImpl implements ScreenPublicDataPushTask { analysisFeignClient.customerAgency(); logger.info("<" + methodName + "|组织层级上传>定时任务执行结束"); } + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 13:57 + * @params [] + * @return void + * @param gridMonthDataMonthId + */ + private void quantityGridMonthly(String gridMonthDataMonthId) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(gridMonthDataMonthId); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|【事件/项目分析】网格内月度数量统计>定时任务开始执行"); + analysisFeignClient.quantityGridMonthly(formDto); + logger.info("<" + methodName + "|【事件/项目分析】网格内月度数量统计>定时任务执行结束"); + } + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 13:57 + * @params [] + * @return void + * @param orgMonthDataMonthId + */ + private void quantityOrgMonthly(String orgMonthDataMonthId) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(orgMonthDataMonthId); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|事件/项目分析】组织内月度数量统计>定时任务开始执行"); + analysisFeignClient.quantityOrgMonthly(formDto); + logger.info("<" + methodName + "|事件/项目分析】组织内月度数量统计>定时任务执行结束"); + } /** * 015、网格信息上传 * @@ -110,4 +153,59 @@ public class ScreenPublicDataPushTaskImpl implements ScreenPublicDataPushTask { analysisFeignClient.customerDept(); logger.info("<" + methodName + "|部门信息上传>定时任务执行结束"); } + + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * + * @return void + * @author WK + * @since 2020/9/17 14:01 + * @param customerOrgRankDataMonthId + */ + private void customerOrgrankdata(String customerOrgRankDataMonthId) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(customerOrgRankDataMonthId); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|党建引领-先进排行榜单-先进支部排行>定时任务开始执行"); + analysisFeignClient.orgrankdata(formDto); + logger.info("<" + methodName + "|党建引领-先进排行榜单-先进支部排行>定时任务执行结束"); + } + + /** + * 007、基层治理-公众参与 + * + * @return void + * @author WK + * @since 2020/9/17 14:01 + * @param customerUserJoinMonthId + */ + private void customerUserjoin(String customerUserJoinMonthId) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(customerUserJoinMonthId); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|基层治理-公众参与>定时任务开始执行"); + analysisFeignClient.userjoin(formDto); + logger.info("<" + methodName + "|基层治理-公众参与>定时任务执行结束"); + } + + + /** + * 009、基层治理-治理能力数据 + * + * @return void + * @author WK + * @since 2020/9/17 14:01 + * @param customerGovernRankData + */ + private void customerGovernrankdata(String customerGovernRankData) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(customerGovernRankData); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|基层治理-治理能力数据>定时任务开始执行"); + analysisFeignClient.governrankdata(formDto); + logger.info("<" + methodName + "|基层治理-治理能力数据>定时任务执行结束"); + } }