From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 八月 2024 11:57:15 +0800
Subject: [PATCH] 2024.8.15 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/bgtask/TaskController.kt | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/timingtask/TaskController.kt b/src/main/kotlin/cn/flightfeather/supervision/bgtask/TaskController.kt
similarity index 71%
rename from src/main/kotlin/cn/flightfeather/supervision/timingtask/TaskController.kt
rename to src/main/kotlin/cn/flightfeather/supervision/bgtask/TaskController.kt
index 26cf551..9aec38d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/timingtask/TaskController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/bgtask/TaskController.kt
@@ -1,6 +1,7 @@
-package cn.flightfeather.supervision.timingtask
+package cn.flightfeather.supervision.bgtask
import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Component
import java.time.LocalDateTime
import java.time.LocalTime
@@ -14,7 +15,18 @@
*/
@Component
class TaskController(
- fetchVOC: TaskFetchVOC, pushFume: TaskPushFume, ledgerCopy: TaskLedgerCopy
+ fetchVOC: TaskFetchVOC,
+ pushFume: TaskPushFume,
+ ledgerCopy: TaskLedgerCopy,
+ ledgerRemind: TaskLedgerRemind,
+ taskJinAnLampEnterBaseInfo: TaskJinAnLampEnterBaseInfo,
+ taskJinAnLampDeviceData: TaskJinAnLampDeviceData,
+ taskJinAnConstructionSiteInfo: TaskJinAnConstructionSiteInfo,
+ taskJinAnHourlyDustData: TaskJinAnHourlyDustData,
+ taskAutoLedger:TaskAutoLedger,
+ // 鏍规嵁app涓嶅悓锛屽垏鎹笉鍚岀殑瀹氭椂浠诲姟
+ @Value("\${systemIsApp}")
+ systemIsApp: Boolean,
) {
companion object {
@@ -33,11 +45,19 @@
LOGGER.info("娣诲姞瀹氭椂浠诲姟")
timeTask.clear()
//椋炵窘鐜锛岃幏鍙杤oc鏁版嵁銆佹帹閫佹补鐑熸暟鎹�
-// timeTask.add(fetchVOC)
-// timeTask.add(pushFume)
-
- //寰俊灏忕▼搴忥紙涓皬浼佷笟瀹堟硶鑷姪锛夛紝鍙拌处澶嶅埗銆佸畾鏃朵换鍔℃帹閫佺瓑
- timeTask.add(ledgerCopy)
+ if (systemIsApp) {
+ timeTask.add(fetchVOC)
+ timeTask.add(pushFume)
+ } else {
+ //寰俊灏忕▼搴忥紙涓皬浼佷笟瀹堟硶鑷姪锛夛紝鍙拌处澶嶅埗銆佸畾鏃朵换鍔℃帹閫佺瓑
+// timeTask.add(ledgerCopy)
+ timeTask.add(ledgerRemind)
+ timeTask.add(taskJinAnLampEnterBaseInfo)
+// timeTask.add(taskJinAnLampDeviceData)
+ timeTask.add(taskJinAnConstructionSiteInfo)
+// timeTask.add(taskJinAnHourlyDustData)
+ timeTask.add(taskAutoLedger)
+ }
LOGGER.info("娣诲姞瀹氭椂浠诲姟瀹屾垚锛屼换鍔℃�昏${timeTask.size}涓�")
}
--
Gitblit v1.9.3