From 7e5452d35bb30dad5bc9e37360047b5a43732dcd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 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 88b63a2..635efde 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
@@ -5,10 +5,15 @@
import com.moral.api.service.HistoryDailyService;
import com.moral.api.service.HistoryFiveMinutelyService;
+import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.HistoryMonthlyService;
import com.moral.api.service.HistoryWeeklyService;
import com.xxl.job.core.biz.model.ReturnT;
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 {
@@ -17,10 +22,16 @@
private HistoryFiveMinutelyService historyFiveMinutelyService;
@Autowired
+ private HistoryHourlyService historyHourlyService;
+
+ @Autowired
private HistoryDailyService historyDailyService;
@Autowired
private HistoryWeeklyService historyWeeklyService;
+
+ @Autowired
+ private HistoryMonthlyService historyMonthlyService;
//5������������������
@XxlJob("insertHistoryFiveMinutely")
@@ -29,7 +40,7 @@
historyFiveMinutelyService.insertHistoryFiveMinutely();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
- return ReturnT.FAIL;
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
}
return ReturnT.SUCCESS;
}
@@ -38,7 +49,8 @@
@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;
@@ -53,7 +65,54 @@
historyWeeklyService.insertHistoryWeekly();
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
- return ReturnT.FAIL;
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ //���������������
+ @XxlJob("insertHistoryMonthly")
+ public ReturnT insertHistoryMonthly() {
+ try {
+ historyMonthlyService.insertHistoryMonthly();
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ 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;
+ }
+
+ @XxlJob("dateToChangShu")
+ public ReturnT dateToChangShu(){
+ try {
+ historyHourlyService.dateToChangShu(null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
}
return ReturnT.SUCCESS;
}
--
Gitblit v1.8.0