From 7f580342dce92cb321e2566ef9a02827435a2de2 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 07 十一月 2023 17:30:27 +0800
Subject: [PATCH] 1. 新增风险值数据库表; 2. 修改异常分析模块的代码位置;

---
 src/main/java/com/flightfeather/monitor/scheduledtasks/DustAnalysisTask.kt |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/flightfeather/monitor/scheduledtasks/DustAnalysisTask.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/DustAnalysisTask.kt
index 631da3a..6a2d142 100644
--- a/src/main/java/com/flightfeather/monitor/scheduledtasks/DustAnalysisTask.kt
+++ b/src/main/java/com/flightfeather/monitor/scheduledtasks/DustAnalysisTask.kt
@@ -33,26 +33,29 @@
             // 鍒ゆ柇浠婃棩鐖彇浠诲姟鏄惁瀹屾垚
             val task = requestTaskRep.findLatestTask(localtime)
             task1Delay = isTaskDelay(task)
-            if (task1Delay) return
-            log.info("寮傚父鍒嗘瀽鎵ц")
-            exceptionAnalysisController.init()
-            exceptionAnalysisController.autoRun()
+            if (!task1Delay) {
+                log.info("寮傚父鍒嗘瀽鎵ц")
+                exceptionAnalysisController.init()
+                exceptionAnalysisController.autoRun()
+            }
         }
 
         if (task2Delay || (localtime.hour == 9 && localtime.minute == 0)) {
             val task = requestTaskRep.findLatestTask(localtime)
             task2Delay = isTaskDelay(task)
-            if (task2Delay) return
-            log.info("鏃ュ垎鏋愭墽琛�")
-            statisticAnalysisController.autoRunDailyStatics()
+            if (!task2Delay) {
+                log.info("鏃ュ垎鏋愭墽琛�")
+                statisticAnalysisController.autoRunDailyStatics()
+            }
         }
 
-        if (localtime.dayOfMonth == 1 && localtime.hour == 9 && localtime.minute == 0) {
+        if (task3Delay || (localtime.dayOfMonth == 1 && localtime.hour == 9 && localtime.minute == 0)) {
             val task = requestTaskRep.findLatestTask(localtime)
             task3Delay = isTaskDelay(task)
-            if (task3Delay) return
-            log.info("鏈堝垎鏋愭墽琛�")
-            statisticAnalysisController.autoRunMonthlyStatics()
+            if (!task3Delay) {
+                log.info("鏈堝垎鏋愭墽琛�")
+                statisticAnalysisController.autoRunMonthlyStatics()
+            }
         }
     }
 

--
Gitblit v1.9.3