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/HistoryTableInsertTask.java | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java b/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
index 5ef990c..9f33024 100644
--- a/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
@@ -12,6 +12,9 @@
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
+import javax.xml.crypto.Data;
+import java.util.Date;
+
@Component
public class HistoryTableInsertTask {
@@ -37,29 +40,17 @@
historyFiveMinutelyService.insertHistoryFiveMinutely();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
- return ReturnT.FAIL;
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
}
return ReturnT.SUCCESS;
}
-
- //���������������������������������������
- @XxlJob("insertHistoryHourly")
- public ReturnT insertHistoryHourly() {
- try {
- historyHourlyService.insertHistoryHourly();
- } catch (Exception e) {
- XxlJobHelper.log(e.getMessage());
- return ReturnT.FAIL;
- }
- return ReturnT.SUCCESS;
- }
-
//���������������
@XxlJob("insertHistoryDaily")
public ReturnT insertHistoryDaily() {
try {
- historyDailyService.insertHistoryDaily();
+ Date now = new Date();
+ historyDailyService.insertHistoryDaily(null);
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
return ReturnT.FAIL;
@@ -74,7 +65,7 @@
historyWeeklyService.insertHistoryWeekly();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
- return ReturnT.FAIL;
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
}
return ReturnT.SUCCESS;
}
@@ -86,7 +77,31 @@
historyMonthlyService.insertHistoryMonthly();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
- return ReturnT.FAIL;
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ //������������������������
+ @XxlJob("historyHourlySupplement")
+ public ReturnT historyHourlySupplement() {
+ try {
+ historyHourlyService.insertHistoryHourly();
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ //���������������������������������������������������������������
+ @XxlJob("insertHistoryHourlyComplete")
+ public ReturnT insertHistoryHourlyComplete(){
+ try {
+ historyHourlyService.insertHistoryHourlyComplete();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
}
return ReturnT.SUCCESS;
}
--
Gitblit v1.8.0