From 30d475ca8f7f09ab6ad4802add508dd51d9e20a2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Sat, 09 Oct 2021 11:32:27 +0800
Subject: [PATCH] 修改臭氧八小时滑动平均值在臭氧无值情况下为0的问题

---
 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 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..79bcfe9 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
@@ -37,23 +37,10 @@
             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")
@@ -74,7 +61,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 +73,19 @@
             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;
     }

--
Gitblit v1.8.0