From 72086303e261a8f0971299f26409baea4baa18cb Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Mon, 15 Nov 2021 15:41:04 +0800 Subject: [PATCH] 国控站数据time改为开始时间 --- screen-job/src/main/java/com/moral/api/task/CreateTableTask.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/screen-job/src/main/java/com/moral/api/task/CreateTableTask.java b/screen-job/src/main/java/com/moral/api/task/CreateTableTask.java index 2fab184..3b1fab3 100644 --- a/screen-job/src/main/java/com/moral/api/task/CreateTableTask.java +++ b/screen-job/src/main/java/com/moral/api/task/CreateTableTask.java @@ -4,6 +4,7 @@ import org.springframework.stereotype.Component; import com.moral.api.service.HistoryFiveMinutelyService; +import com.moral.api.service.HistoryHourlyService; import com.moral.api.service.HistoryMinutelyService; import com.moral.constant.Constants; import com.moral.util.DateUtils; @@ -20,6 +21,9 @@ @Autowired private HistoryMinutelyService historyMinutelyService; + @Autowired + private HistoryHourlyService historyHourlyService; + //��������������������� @XxlJob("createHistoryMinutelyTable") @@ -32,7 +36,7 @@ historyMinutelyService.createTable(timeUnits + "_" + Constants.UN_ADJUST); } catch (Exception e) { XxlJobHelper.log(e.getMessage()); - return ReturnT.FAIL; + return new ReturnT(ReturnT.FAIL_CODE, e.getMessage()); } return ReturnT.SUCCESS; } @@ -45,7 +49,23 @@ historyFiveMinutelyService.createTable(timeUnits); } catch (Exception e) { XxlJobHelper.log(e.getMessage()); - return ReturnT.FAIL; + return new ReturnT(ReturnT.FAIL_CODE, e.getMessage()); + } + return ReturnT.SUCCESS; + } + + //��������������������� + @XxlJob("createHistoryHourlyTable") + public ReturnT createHistoryHourlyTable() { + String timeUnits = DateUtils.getDateStringOfMon(1, DateUtils.yyyyMM_EN); + try { + //������������������ + historyHourlyService.createTable(timeUnits); + //������������������ + historyHourlyService.createTable(timeUnits + "_" + Constants.UN_ADJUST); + } catch (Exception e) { + XxlJobHelper.log(e.getMessage()); + return new ReturnT(ReturnT.FAIL_CODE, e.getMessage()); } return ReturnT.SUCCESS; } -- Gitblit v1.8.0