From 70a7d1ec98064e1acb3130e56e16c45af52ade6c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 24 十月 2023 12:03:49 +0800
Subject: [PATCH] 新增数据分析模块完成
---
src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
index 5839d7c..02f5d16 100644
--- a/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
+++ b/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
@@ -1,6 +1,7 @@
package com.flightfeather.monitor.scheduledtasks
-import cn.flightfeather.supervision.timingtask.BaseTimingTask
+import lombok.extern.slf4j.Slf4j
+import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Component
import java.time.LocalDateTime
@@ -13,23 +14,18 @@
/**
* 鏁版嵁鑾峰彇鎺у埗鍣�
*/
+@Slf4j
@Component
class TaskController(
- /*瀹炰緥鍚� 绫诲悕*/
-// fetchVOC: TaskFetchVOC,
-// pushFume: TaskPushFume,
-// ledgerCopy: TaskLedgerCopy,
-// ledgerRemind: TaskLedgerRemind,
-// taskJinAnLampEnterBaseInfo: TaskJinAnLampEnterBaseInfo,
-// taskJinAnLampDeviceData: TaskJinAnLampDeviceData,
-// taskJinAnConstructionSiteInfo: TaskJinAnConstructionSiteInfo,
-// taskJinAnHourlyDustData: TaskJinAnHourlyDustData
+ dustExceptionAnalysisTask: DustExceptionAnalysisTask,
+ dustDailyStatisticAnalysisTask: DustDailyStatisticAnalysisTask,
+ dustMonthlyStatisticAnalysisTask: DustMonthlyStatisticAnalysisTask,
) {
companion object {
private const val FETCH_PERIOD_MIN = 1L * 60
private const val MAINTAIN_PERIOD_MIN = 5L * 60
- val LOGGER = LoggerFactory.getLogger(TaskController::class.java)
+ val log: Logger = LoggerFactory.getLogger(TaskController::class.java)
}
private val timeTask = mutableListOf<BaseTimingTask>()
@@ -39,13 +35,13 @@
private var maintainTime: Date = Date()
init {
- LOGGER.info("娣诲姞瀹氭椂浠诲姟")
+ log.info("娣诲姞瀹氭椂浠诲姟")
timeTask.clear()
-
/*鍋氱殑瀹氭椂浠诲姟鍔犺繘鏉�*/
-
-
- LOGGER.info("娣诲姞瀹氭椂浠诲姟瀹屾垚锛屼换鍔℃�昏${timeTask.size}涓�")
+ timeTask.add(dustExceptionAnalysisTask)
+ timeTask.add(dustDailyStatisticAnalysisTask)
+ timeTask.add(dustMonthlyStatisticAnalysisTask)
+ log.info("娣诲姞瀹氭椂浠诲姟瀹屾垚锛屼换鍔℃�昏${timeTask.size}涓�")
}
fun run() {
@@ -54,7 +50,6 @@
}
private fun fetchTask(isFirst: Boolean = false) {
- val cal = Calendar.getInstance()
val time = LocalTime.now()
val sec = time.second
val delay = 60L - sec
--
Gitblit v1.9.3