From 8fc27dba6719041402e3e3c099e2f3e01d9d52c7 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 16 七月 2025 17:30:56 +0800
Subject: [PATCH] 2025.7.16 1. 修改动态溯源异常判断逻辑
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt
index d721f59..0e4c5ef 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt
@@ -32,7 +32,7 @@
this.sceneInfoRep = sceneInfoRep
this.sourceTraceRep = sourceTraceRep
this.config = if (factorFilter != null) {
- RTExcWindLevelConfig(factorFilter, emptyList())
+ RTExcWindLevelConfig(factorFilter)
} else {
RTExcWindLevelConfig(
FactorFilter.builder()
@@ -44,11 +44,13 @@
.withMain(FactorType.PM25)
.withMain(FactorType.PM10)
.withMain(FactorType.VOC)
- .create(),
- listOf(
- listOf(FactorType.PM25, FactorType.PM10),
- listOf(FactorType.VOC, FactorType.CO),
- )
+ .withCombination(
+ listOf(
+ listOf(FactorType.PM25, FactorType.PM10),
+ listOf(FactorType.VOC, FactorType.CO),
+ )
+ )
+ .create()
)
}
pollutedSummary = PollutedSummary(config) { summaryCallback(it) }
@@ -110,32 +112,28 @@
}
// 鏁版嵁绐佸彉寮傚父鍥炶皟
- private fun exceptionCallback(ex: List<PollutedClue>) {
- ex.forEach {
- // 婧簮姹℃煋婧愪俊鎭�
- it.searchScenes(sceneInfoRep)
- it.msgType = MsgType.PolClue.value
- }
+ private fun exceptionCallback(ex: PollutedClue) {
+ // 婧簮姹℃煋婧愪俊鎭�
+ ex.searchScenes(sceneInfoRep)
+ ex.msgType = MsgType.PolClue.value
// 骞挎挱姹℃煋婧簮寮傚父缁撴灉
UnderwayWebSocketSender.broadcast(MsgType.PolClue.value, ex)
- sourceTraceRep.insertList(MsgType.PolClue, ex)
+ sourceTraceRep.insert(MsgType.PolClue, ex)
// 璁板綍姹℃煋绾跨储
- pollutedSummary.addClueList(ex)
+ pollutedSummary.addClue(ex)
}
// 鏁版嵁鍙樺寲鎻愰啋鍥炶皟
- private fun dataChangeCallback(ex: List<PollutedClue>) {
- ex.forEach {
- // 婧簮姹℃煋婧愪俊鎭�
- it.searchScenes(sceneInfoRep)
- it.msgType = MsgType.DataChange.value
- }
+ private fun dataChangeCallback(ex: PollutedClue) {
+ // 婧簮姹℃煋婧愪俊鎭�
+ ex.searchScenes(sceneInfoRep)
+ ex.msgType = MsgType.DataChange.value
// 骞挎挱鏁版嵁鍙樺寲鎻愰啋
UnderwayWebSocketSender.broadcast(MsgType.DataChange.value, ex)
- sourceTraceRep.insertList(MsgType.DataChange, ex)
+ sourceTraceRep.insert(MsgType.DataChange, ex)
}
private fun summaryCallback(ex: AnalysisResult) {
--
Gitblit v1.9.3