From beb40a62ce723b391964dab56de6aa0f98f50613 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Mar 2022 15:08:25 +0800
Subject: [PATCH] city_aqi月,年数据定时任务修改,每日累计统计

---
 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 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..199f6ae 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,6 +5,8 @@
 
 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;
@@ -17,10 +19,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 +37,7 @@
             historyFiveMinutelyService.insertHistoryFiveMinutely();
         } catch (Exception e) {
             XxlJobHelper.log(e.getMessage());
-            return ReturnT.FAIL;
+            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
         }
         return ReturnT.SUCCESS;
     }
@@ -53,7 +61,43 @@
             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;
     }

--
Gitblit v1.8.0