From f05383c46370ec8c4f4b8b8165ffab3769dd06a2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Jun 2024 14:19:09 +0800
Subject: [PATCH] fix:路段定时任务提交

---
 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java |   86 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 81 insertions(+), 5 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 0ef79d9..9ae95c9 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
@@ -8,9 +8,13 @@
 import com.moral.api.service.HistoryHourlyService;
 import com.moral.api.service.HistoryMonthlyService;
 import com.moral.api.service.HistoryWeeklyService;
+import com.moral.api.service.ManageCoordinateDetailService;
 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 +34,10 @@
     @Autowired
     private HistoryMonthlyService historyMonthlyService;
 
+
+    @Autowired
+    private ManageCoordinateDetailService manageCoordinateDetailService;
+
     //5������������������
     @XxlJob("insertHistoryFiveMinutely")
     public ReturnT insertHistoryFiveMinutely() {
@@ -37,7 +45,7 @@
             historyFiveMinutelyService.insertHistoryFiveMinutely();
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
-            return ReturnT.FAIL;
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
         }
         return ReturnT.SUCCESS;
     }
@@ -46,7 +54,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;
@@ -61,7 +70,7 @@
             historyWeeklyService.insertHistoryWeekly();
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
-            return ReturnT.FAIL;
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
         }
         return ReturnT.SUCCESS;
     }
@@ -73,7 +82,7 @@
             historyMonthlyService.insertHistoryMonthly();
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
-            return ReturnT.FAIL;
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
         }
         return ReturnT.SUCCESS;
     }
@@ -85,8 +94,75 @@
             historyHourlyService.insertHistoryHourly();
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
-            return ReturnT.FAIL;
+            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;
+
+    }
+
+
 }

--
Gitblit v1.8.0