From a15f3dccec3c370f90005068350173768a5e222d Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 16:07:53 +0800
Subject: [PATCH] 新增了根据点位名称查询设备编号的接口
---
src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt b/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
index 02f5d16..99108fe 100644
--- a/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
+++ b/src/main/java/com/flightfeather/monitor/scheduledtasks/TaskController.kt
@@ -1,6 +1,6 @@
package com.flightfeather.monitor.scheduledtasks
-import lombok.extern.slf4j.Slf4j
+import com.flightfeather.monitor.scheduledtasks.dust.*
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Component
@@ -14,17 +14,18 @@
/**
* 鏁版嵁鑾峰彇鎺у埗鍣�
*/
-@Slf4j
@Component
class TaskController(
dustExceptionAnalysisTask: DustExceptionAnalysisTask,
- dustDailyStatisticAnalysisTask: DustDailyStatisticAnalysisTask,
- dustMonthlyStatisticAnalysisTask: DustMonthlyStatisticAnalysisTask,
+ dustDailyAnalysisTask: DustDailyAnalysisTask,
+ dustMonthlyAnalysisTask: DustMonthlyAnalysisTask,
+ riskDailyAnalysisTask: RiskDailyAnalysisTask,
+ riskMonthlyAnalysisTask: RiskMonthlyAnalysisTask,
) {
companion object {
- private const val FETCH_PERIOD_MIN = 1L * 60
- private const val MAINTAIN_PERIOD_MIN = 5L * 60
+ private const val FETCH_PERIOD_MIN = 15L
+ private const val MAINTAIN_PERIOD_MIN = 15L
val log: Logger = LoggerFactory.getLogger(TaskController::class.java)
}
@@ -37,10 +38,11 @@
init {
log.info("娣诲姞瀹氭椂浠诲姟")
timeTask.clear()
- /*鍋氱殑瀹氭椂浠诲姟鍔犺繘鏉�*/
timeTask.add(dustExceptionAnalysisTask)
- timeTask.add(dustDailyStatisticAnalysisTask)
- timeTask.add(dustMonthlyStatisticAnalysisTask)
+ timeTask.add(dustDailyAnalysisTask)
+ timeTask.add(dustMonthlyAnalysisTask)
+ timeTask.add(riskDailyAnalysisTask)
+ timeTask.add(riskMonthlyAnalysisTask)
log.info("娣诲姞瀹氭椂浠诲姟瀹屾垚锛屼换鍔℃�昏${timeTask.size}涓�")
}
@@ -51,8 +53,8 @@
private fun fetchTask(isFirst: Boolean = false) {
val time = LocalTime.now()
- val sec = time.second
- val delay = 60L - sec
+ val min = time.minute
+ val delay = FETCH_PERIOD_MIN - min % FETCH_PERIOD_MIN
// var localtime = LocalDateTime.of(2021, 4, 16, 9, 0)
if (!isFirst) {
schedule = closeThread(schedule)
@@ -70,7 +72,7 @@
it.execute(localtime)
}
// localtime = localtime.plusMinutes(1)
- }, delay, FETCH_PERIOD_MIN, TimeUnit.SECONDS)
+ }, delay, FETCH_PERIOD_MIN, TimeUnit.MINUTES)
}
private fun maintainTask(isFirst: Boolean = false) {
@@ -82,7 +84,7 @@
if (Date().time - taskTime.time > (FETCH_PERIOD_MIN + 1) * 60 * 1000) {
fetchTask()
}
- }, 0, MAINTAIN_PERIOD_MIN, TimeUnit.SECONDS)
+ }, 0, MAINTAIN_PERIOD_MIN, TimeUnit.MINUTES)
}
private fun closeThread(s: ScheduledExecutorService): ScheduledExecutorService {
--
Gitblit v1.9.3