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/analysis/dust/RiskAnalysisController.kt | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
index afc6bc1..d43c341 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
@@ -22,8 +22,8 @@
private val dustStatisticValueRep: DustStatisticsValueRep,
) {
- private var running1 = false
- private var running2 = false
+ var running1 = false
+ var running2 = false
private var taskDaily: DustRiskAnalysis? = null
private var taskMonthly: DustRiskMonthAnalysis? = null
@@ -75,7 +75,7 @@
// 鑾峰彇鎵�鏈夊綋鍓嶄笂绾垮拰鍋滆繍鐨勮澶�
dustSiteStatusRep.select(listOf(DeviceStatus.ONLINE, DeviceStatus.STOP)).forEach { s ->
s?.let {
- taskDaily?.roundInit()
+ taskDaily?.roundInit(s.mnCode, date)
val dustSiteDataList = dustSiteDataRep.select(s.mnCode, date)
val dustExceptionDataList = dustExceptionDataRep.select(s.mnCode, date)
val dustStatisticValueList = dustStatisticValueRep.select(s.mnCode, date)
@@ -95,8 +95,8 @@
taskMonthly?.init()
dustSiteStatusRep.select(listOf(DeviceStatus.ONLINE, DeviceStatus.STOP)).forEach { s ->
s?.let {
- taskMonthly?.roundInit()
- val riskValueList = riskValueRep.select(s.mnCode, date)
+ taskMonthly?.roundInit(s.mnCode, date)
+ val riskValueList = riskValueRep.select(s.mnCode, date, "day")
taskMonthly?.roundCal(riskValueList)
}
}
--
Gitblit v1.9.3