From 43c631ad573535f4434caf19423824d4bd3f8ca7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 19 Jul 2023 13:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/java/com/moral/api/task/CreateTableTask.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 3b1fab3..b6e0621 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
@@ -1,5 +1,6 @@
package com.moral.api.task;
+import com.moral.api.service.AlarmInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -23,6 +24,9 @@
@Autowired
private HistoryHourlyService historyHourlyService;
+
+ @Autowired
+ private AlarmInfoService alarmInfoService;
//���������������������
@@ -69,4 +73,30 @@
}
return ReturnT.SUCCESS;
}
+
+ //���������������������������������������������������������������
+ @XxlJob("createHistoryHourlyCompleteTable")
+ public ReturnT createHistoryHourlyCompleteTable(){
+ String timeUnits = DateUtils.getDateStringOfMon(1, DateUtils.yyyyMM_EN);
+ try {
+ historyHourlyService.createTableComplete(timeUnits);
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ //���������������������
+ @XxlJob("createAlarmInfoTable")
+ public ReturnT createAlarmInfoTable() {
+ String timeUnits = DateUtils.getDateStringOfMon(1, DateUtils.yyyyMM_EN);
+ try {
+ alarmInfoService.createTable(timeUnits);
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
}
--
Gitblit v1.8.0