From 9c797fa0d704ef8ffb65cd1716b8eb694b4c46c3 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 04 七月 2025 17:28:00 +0800 Subject: [PATCH] 2025.7.4 1. 新增动态污染溯源新的判定逻辑 --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 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 662cd6b..504efa2 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/SourceTraceController.kt @@ -5,11 +5,13 @@ import com.flightfeather.uav.biz.sourcetrace.RealTimeAnalysisConfig import com.flightfeather.uav.biz.sourcetrace.config.RTExcWindLevelConfig import com.flightfeather.uav.biz.sourcetrace.exceptiontype.* +import com.flightfeather.uav.biz.sourcetrace.model.AnalysisResult import com.flightfeather.uav.biz.sourcetrace.model.PollutedClue import com.flightfeather.uav.biz.sourcetrace.model.PollutedSummary import com.flightfeather.uav.common.utils.GsonUtils import com.flightfeather.uav.domain.entity.BaseRealTimeData import com.flightfeather.uav.domain.repository.SceneInfoRep +import com.flightfeather.uav.domain.repository.SourceTraceRep import com.flightfeather.uav.socket.eunm.FactorType import com.flightfeather.uav.socket.sender.MsgType import com.flightfeather.uav.socket.sender.UnderwayWebSocketSender @@ -28,11 +30,12 @@ * 姣忎竴鍒婚挓瀵瑰巻鍙茬嚎绱㈣繘琛岀粺璁★紝鎻愬嚭浼氬晢寤鸿锛堢姹℃煋婧愯緝杩溿�佹薄鏌撴簮鏁伴噺銆佸嚭鐜版鏁帮級銆佽蛋鑸矾绾胯皟鏁村缓璁紙绂绘薄鏌撴簮杈冭繎銆佽蛋鑸建杩规湭鎺ヨ繎婧簮鍦烘櫙锛� */ - constructor(sceneInfoRep: SceneInfoRep, factorFilter: FactorFilter?) { + constructor(sceneInfoRep: SceneInfoRep, sourceTraceRep: SourceTraceRep, factorFilter: FactorFilter?) { this.sceneInfoRep = sceneInfoRep - this.config = if (factorFilter != null) + this.sourceTraceRep = sourceTraceRep + this.config = if (factorFilter != null) { RTExcWindLevelConfig(factorFilter) - else + } else { RTExcWindLevelConfig( FactorFilter.builder() // .withMain(FactorType.NO2) @@ -45,16 +48,16 @@ .withMain(FactorType.VOC) .create() ) + } pollutedSummary = PollutedSummary(config) { summaryCallback(it) } newTask() } - constructor(sceneInfoRep: SceneInfoRep) : this(sceneInfoRep, null) + constructor(sceneInfoRep: SceneInfoRep, sourceTraceRep: SourceTraceRep) : this(sceneInfoRep, sourceTraceRep, null) private val pollutedSummary: PollutedSummary - private val sceneInfoRep: SceneInfoRep - + private val sourceTraceRep: SourceTraceRep private val config: RTExcWindLevelConfig private val taskList = mutableListOf<BaseExceptionAnalysis<RTExcWindLevelConfig, PollutedClue>>() @@ -72,6 +75,7 @@ add(RTExcWindLevel4(config) { exceptionCallback(it) }.also { it.init() }) add(RTExcWindLevel6(config) { exceptionCallback(it) }.also { it.init() }) add(RTExcChangeRate(config) { exceptionCallback(it) }.also { it.init() }) + add(RTWarnChangeRate(config) { dataChangeCallback(it) }.also { it.init() }) } } @@ -102,16 +106,31 @@ private fun exceptionCallback(ex: PollutedClue) { // 婧簮姹℃煋婧愪俊鎭� ex.searchScenes(sceneInfoRep) + ex.msgType = MsgType.PolClue.value // 骞挎挱姹℃煋婧簮寮傚父缁撴灉 UnderwayWebSocketSender.broadcast(MsgType.PolClue.value, ex) + sourceTraceRep.insert(MsgType.PolClue, ex) // 璁板綍姹℃煋绾跨储 pollutedSummary.addClue(ex) } - private fun summaryCallback(ex: PollutedSummary.AnalysisResult) { + // 鏁版嵁鍙樺寲鎻愰啋鍥炶皟 + private fun dataChangeCallback(ex: PollutedClue) { + // 婧簮姹℃煋婧愪俊鎭� + ex.searchScenes(sceneInfoRep) + ex.msgType = MsgType.DataChange.value + + // 骞挎挱鏁版嵁鍙樺寲鎻愰啋 + UnderwayWebSocketSender.broadcast(MsgType.DataChange.value, ex) + sourceTraceRep.insert(MsgType.DataChange, ex) + } + + private fun summaryCallback(ex: AnalysisResult) { + ex.msgType = MsgType.AnaResult.value // 骞挎挱姹℃煋婧簮寮傚父缁撴灉 UnderwayWebSocketSender.broadcast(MsgType.AnaResult.value, ex) + sourceTraceRep.insert(ex) } } \ No newline at end of file -- Gitblit v1.9.3