From d065676ab52c19ad0ebfe4bb52ad0e3122588f2d Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 25 Feb 2021 14:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8A=E6=8A=A5=E5=92=8C?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E4=B8=8A=E7=8F=ADbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SysDeptServiceImpl.java | 2 +- .../commons/tools/constant/EpmetConstant.java | 10 ++++ .../controller/ScreenIndexDataController.java | 14 +++++ .../impl/ScreenProjectDataServiceImpl.java | 60 ++++++++++--------- .../mapper/screen/ScreenProjectDataDao.xml | 5 +- .../esua/epdc/feign/AnalysisFeignClient.java | 10 ++++ .../fallback/AnalysisFeignClientFallback.java | 5 ++ .../screen/ScreenIndexDataPushTaskImpl.java | 19 ++++++ 8 files changed, 94 insertions(+), 31 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 035b53ee..67b35e6e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -931,7 +931,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO); if(deptCodeResult.getData()!=null){ DeptCodeOption deptCodeOption = deptCodeResult.getData(); - redisUtils.set(RedisKeys.getAllDeptCodeOptionKey(), deptCodeOption); + redisUtils.set(RedisKeys.getAllDeptCodeOptionKey(), deptCodeOption,RedisUtils.MINUTE_TEN_EXPIRE); } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java index 58f4f06a..2853d89b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java @@ -193,6 +193,16 @@ public interface EpmetConstant { */ String EPMET_PROJECT_ORG_MONTHLY = "/data/stats/project/quantity-org-monthly"; + /** + * 项目信息上报 + */ + String EPMET_PROJECT_UPLOAD_PROJECT_INFO = "/data/stats/project/uploadprojectinfo"; + + /** + * 项目处理进展上报 + */ + String EPMET_PROJECT_UPLOAD_PROJECT_PROCESS = "/data/stats/project/uploadprojectprocess"; + /** * 行政地区编码查询 - 平阴县 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java index b53c9804..2ef45363 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java @@ -126,4 +126,18 @@ public class ScreenIndexDataController { return screenIndexDataService.deptGovernAbility(formDto.getYearMonth()); } + /** + * 指标数据传输完毕通知接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/9/17 10:26 + */ + @PostMapping("all") + public Result all(@RequestBody ScreenJobFormDTO formDto) { + return screenIndexDataService.all(formDto.getYearMonth()); + } + + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java index 5ca2500e..c552d1d7 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java @@ -28,22 +28,24 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl data = baseDao.uploadProjectInfo(screenProjectFormDTO); - if (data.size() > 1000) { - List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); - if (formList != null && formList.size() > NumConstant.ZERO) { - for (int i = NumConstant.ZERO; i < formList.size(); i++) { - String dataJson = ""; - // 数据格式化 - dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); - // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson); + if(data.size()!=0) { + if (data.size() > 1000) { + List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); + if (formList != null && formList.size() > NumConstant.ZERO) { + for (int i = NumConstant.ZERO; i < formList.size(); i++) { + String dataJson = ""; + // 数据格式化 + dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson); + } } + } else { + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson); } - } else { - // 数据格式化 - String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); - // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson); } return new Result(); } @@ -52,22 +54,24 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl data = baseDao.uploadProjectProcess(screenProjectFormDTO); - if (data.size() > 1000) { - List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); - if (formList != null && formList.size() > NumConstant.ZERO) { - for (int i = NumConstant.ZERO; i < formList.size(); i++) { - String dataJson = ""; - // 数据格式化 - dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); - // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson); + if(data.size()!=0){ + if (data.size() > 1000) { + List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); + if (formList != null && formList.size() > NumConstant.ZERO) { + for (int i = NumConstant.ZERO; i < formList.size(); i++) { + String dataJson = ""; + // 数据格式化 + dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson); + } } + } else { + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson); } - } else { - // 数据格式化 - String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); - // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson); } return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 152be7aa..590519ff 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -50,10 +50,11 @@ FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) order by ID)a group by a.EVENT_ID) t1 - left join esua_epdc_events.epdc_img t2 on t1.ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' + left join esua_epdc_events.epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' left join esua_epdc_events.epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10 where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d') and date_format(t1.UPDATED_TIME, '%Y-%m-%d') <= date_sub(curdate(),interval 1 day) + order by t2.CREATED_TIME @@ -78,7 +79,7 @@ resultMap="uploadprojectprocessMap"> select t.*, t3.ID as attachmentId, - case t3.IMG_TYPE when 'itemHandle' then 'internal' when 'itemOutHandle' then 'public' else '' End as filePlace, + case t3.IMG_TYPE when 'itemHandle' then 'internal' when 'itemOutHandle' then 'public' else null End as filePlace, t3.IMG_URL as attachmentUrl, t3.DEL_FLAG from ( diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 1f7947ec..98da7d62 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -104,6 +104,16 @@ public interface AnalysisFeignClient { @PostMapping("analysis/data/stats/indexcollect/deptgovrnability") Result deptGovernAbility(ScreenJobFormDTO formDto); + /** + * 指标数据传输完毕通知接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/9/17 10:08 + */ + @PostMapping("analysis/data/stats/indexcollect/all") + Result all(ScreenJobFormDTO formDto); + /** * 014、组织层级 * diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 83e40a95..ac5715a3 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -54,6 +54,11 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "deptGovernAbility"); } + @Override + public Result all(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "all"); + } + @Override public Result customerAgency() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "customerAgency"); diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java index eef5e54d..6600783b 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java @@ -47,6 +47,8 @@ public class ScreenIndexDataPushTaskImpl implements ScreenIndexDataPushTask { orgGovernAbility(paramDto.getOrgGovernAbility()); // 08、治理能力-部门相关指标 deptGovernAbility(paramDto.getDeptGovernAbility()); + // 指标数据传输完毕通知接口 + all(paramDto.getAll()); } /** @@ -192,5 +194,22 @@ public class ScreenIndexDataPushTaskImpl implements ScreenIndexDataPushTask { analysisFeignClient.deptGovernAbility(formDto); logger.info("<" + methodName + "|治理能力-部门相关指标>定时任务执行结束"); } + /** + * 指标数据传输完毕通知接口 + * + * @param yearMonth 计算月份 + * @return void + * @author Liuchuang + * @since 2020/9/17 10:05 + */ + public void all(String yearMonth) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(yearMonth); + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|指标数据传输完毕通知接口>定时任务开始执行"); + analysisFeignClient.all(formDto); + logger.info("<" + methodName + "|指标数据传输完毕通知接口>定时任务执行结束"); + } }