From 92f5514b8329f6fc9a7627c1eeb9c5033fc70b78 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 19 Apr 2022 17:45:48 +0800 Subject: [PATCH] uploadProjectInfo --- .../resources/mapper/screen/ScreenProjectDataDao.xml | 1 + .../epdc/task/screen/ScreenProjectPushTaskImpl.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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 23fb8e86..8c93a453 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 @@ -70,6 +70,7 @@ 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.CREATED_TIME, '%Y-%m-%d') = ]]> #{yearMonthDay} and DATE_FORMAT(t1.CREATED_TIME, '%Y-%m-%d') now() + group by t1.ID order by t2.CREATED_TIME diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java index a509b567..c80a5a09 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java @@ -91,6 +91,9 @@ public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask { screenRecordEntity = screenRecordEntities.get(0); screenProjectFormDTO.setYearMonthDay(screenRecordEntity.getStatisticsTime()); } + + analysisFeignClient.uploadProjectInfo(screenProjectFormDTO); + //记录此次统计时间 并更新时间或者新增 screenRecordEntity.setStatisticsTime(new Date()); if (StringUtils.isNotBlank(screenRecordEntity.getId())) { @@ -99,7 +102,7 @@ public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask { screenRecordEntity.setJobName("uploadProjectInfo"); screenRecordDao.insert(screenRecordEntity); } - analysisFeignClient.uploadProjectInfo(screenProjectFormDTO); + logger.info("<" + methodName + "|项目信息上报>定时任务执行结束"); } @@ -126,6 +129,9 @@ public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask { screenRecordEntity = screenRecordEntities.get(0); screenProjectFormDTO.setYearMonthDay(screenRecordEntity.getStatisticsTime()); } + + analysisFeignClient.uploadProjectProcess(screenProjectFormDTO); + //记录此次统计时间 并更新时间或者新增 screenRecordEntity.setStatisticsTime(new Date()); if (StringUtils.isNotBlank(screenRecordEntity.getId())) { @@ -134,7 +140,7 @@ public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask { screenRecordEntity.setJobName("uploadProjectProcess"); screenRecordDao.insert(screenRecordEntity); } - analysisFeignClient.uploadProjectProcess(screenProjectFormDTO); + logger.info("<" + methodName + "|项目处理流程信息上报>定时任务执行结束"); } }