From 6fdacca914ef38e6cc91292ef07c5af32bd92991 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 03 十二月 2024 11:12:40 +0800
Subject: [PATCH] 1. BgTask增加onStatusChange参数，通过外界传递如何发送状态改变的消息 2. BackgroundTaskCtrl.kt 创建了BgTask对象并传递了onStatusChange参数 3. WebSocketMessageUtil 类名修改为 WebSocketMessageDecoder 4. SendWebSocketMessageUtil 类名修改为 WebSocketSendMessageUtil
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
index 31e2109..9c2af53 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/JACsDataAnalysis.kt
@@ -52,6 +52,10 @@
}
}
+ override fun getDeviceCode(data: HourDustData?): String? {
+ return data?.mncode
+ }
+
override fun fetchDataResources(evaluationScene: AopDataSource.EvaluationScene): List<List<HourDustData?>> {
val dustSiteMaps = dustSiteMapMapper.selectByExample(Example(DustSiteMap::class.java).apply {
createCriteria().andEqualTo("svUserId", evaluationScene.userInfo.value?.guid)
@@ -60,6 +64,8 @@
if (dustSiteMaps.isEmpty()) return emptyList()
val mnCodeList = dustSiteMaps.map { it?.jaMnCode }
+ if (mnCodeList.isEmpty()) return emptyList()
+
val map = mutableMapOf<String?, MutableList<HourDustData?>>()
hourDustDataMapper.selectByExample(Example(HourDustData::class.java).apply {
createCriteria().andBetween("lst", evaluationScene.config?.startTime, evaluationScene.config?.endTime)
@@ -117,11 +123,7 @@
}
override fun overAvgRate(avg: Double, dAvg: Double?): Double? {
- return if (dAvg != null) {
- round(((avg - dAvg) / dAvg) * 1000) / 1000
- } else {
- null
- }
+ return super.overAvgRate(avg, dAvg)
}
override fun count(dataList: List<List<HourDustData?>>): Int {
--
Gitblit v1.9.3