From f577294fad6b5636a22ce872b3b762ae40fd7799 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Fri, 05 Jul 2024 10:59:08 +0800
Subject: [PATCH] fix:补充提交
---
screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 114 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..c4a6323 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
@@ -7,10 +7,16 @@
import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.HistoryMonthlyService;
+import com.moral.api.service.HistorySecondCruiserService;
import com.moral.api.service.HistoryWeeklyService;
+import com.moral.api.service.ManageCoordinateDetailService;
+import com.moral.api.service.impl.HistorySecondCruiserServiceImpl;
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 {
@@ -30,6 +36,14 @@
@Autowired
private HistoryMonthlyService historyMonthlyService;
+
+ @Autowired
+ private ManageCoordinateDetailService manageCoordinateDetailService;
+
+
+ @Autowired
+ private HistorySecondCruiserService historySecondCruiserService;
+
//5������������������
@XxlJob("insertHistoryFiveMinutely")
public ReturnT insertHistoryFiveMinutely() {
@@ -37,29 +51,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 +76,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,8 +88,103 @@
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;
+ }
+
+ @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;
+ }
+
+ //������������������������
+ @XxlJob("dateInsertHistoryHourlyAvg")
+ public ReturnT dateInsertHistoryHourlyAvg(){
+ try {
+ historyHourlyService.dateInsertHistoryHourlyAvg();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+
+ //������������������������������
+ @XxlJob("dateInsertHistoryHourlyJKAvg")
+ public ReturnT dateInsertHistoryHourlyJKAvg(){
+ try {
+ historyHourlyService.dateInsertHistoryHourlyJKAvg(null,null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+
+ /**
+ * ������������������
+ * @return
+ */
+ @XxlJob("manageCoordinateDetail")
+ public ReturnT manageCoordinateDetail(){
+ try {
+ manageCoordinateDetailService.insertCoordinateDetail(null,null);
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+
+ }
+
+
+ /**
+ * ���������������������
+ * @return
+ */
+ @XxlJob("secondCruiserSort")
+ public ReturnT secondCruiserSort(){
+ try {
+ historySecondCruiserService.sort(null,null);
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+
+ }
+
}
--
Gitblit v1.8.0