From 8eb584869b4fd4de0f51c93f2616f12e51df9193 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 17:48:29 +0800
Subject: [PATCH] 2025.12.18 1. 动态溯源相关分析逻辑调整； 2. 走航报告接口参数调整；
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedClue.kt | 70 +----------------------------------
1 files changed, 2 insertions(+), 68 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedClue.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedClue.kt
index 6035ec5..e8c29b7 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedClue.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedClue.kt
@@ -20,18 +20,6 @@
*/
class PollutedClue() : BaseExceptionResult() {
-// constructor(
-// tag: ExceptionTag, factor: FactorFilter.SelectedFactor, eType: ExceptionType, config: RTExcWindLevelConfig,
-// windLevelCondition: RTExcWindLevelConfig.WindLevelCondition?,
-// ) : this() {
-// if (tag.exceptionData.isEmpty()) return
-// deviceCode = tag.startData?.deviceCode
-// pollutedData = PollutedData(
-// tag.startData!!, tag.endData, factor, tag.exceptionData, tag.historyData, eType, windLevelCondition
-// )
-// pollutedArea = PollutedArea(tag.historyData, tag.exceptionData, config, windLevelCondition)
-// }
-
constructor(
exceptions: List<Pair<FactorFilter.SelectedFactor, ExceptionTag>>,
eType: ExceptionType,
@@ -40,68 +28,14 @@
) : this() {
if (exceptions.isEmpty() || exceptions[0].second.exceptionData.isEmpty()) return
deviceCode = exceptions[0].second.startData?.deviceCode
- var startData: BaseRealTimeData? = null
- var endData: BaseRealTimeData? = null
- var exceptionData = mutableListOf<BaseRealTimeData>()
- var historyData = mutableListOf<BaseRealTimeData>()
- exceptions.forEach { e ->
- // 灏嗛噰鏍锋椂闂存渶鏃╃殑浣滀负寮�濮嬫暟鎹�
- if (startData == null) {
- startData = e.second.startData
- } else {
- if (e.second.startData?.dataTime!! < startData!!.dataTime) {
- startData = e.second.startData
- }
- }
- // 灏嗛噰鏍锋椂闂存渶鏅氱殑浣滀负缁撴潫鏁版嵁
- if (endData == null) {
- endData = e.second.endData
- } else {
- if (e.second.endData?.dataTime!! > endData!!.dataTime) {
- endData = e.second.endData
- }
- }
-
- // 灏嗘墍鏈夊紓甯告暟鎹幓閲嶅悎骞�
- if (exceptionData.isEmpty()) {
- exceptionData = e.second.exceptionData
- } else {
- e.second.exceptionData.forEach {
- if (exceptionData.find { d -> d.dataTime == it.dataTime } == null) {
- exceptionData.add(it)
- }
- }
- }
-
- // 灏嗘墍鏈夊巻鍙叉暟鎹幓閲嶅悎骞�
- if (historyData.isEmpty()) {
- historyData = e.second.historyData
- } else {
- e.second.historyData.forEach {
- if (historyData.find { d -> d.dataTime == it.dataTime } == null) {
- historyData.add(it)
- }
- }
- }
- }
- // 鎸夌収閲囨牱鏃堕棿鍗囧簭鎺掑垪
- exceptionData.sortBy { it.dataTime }
- historyData.sortBy { it.dataTime }
// 鑾峰彇鍘婚噸鍚庣殑鐩戞祴鍥犲瓙绫诲瀷
val factorList = exceptions.map { it.first }.distinct()
- pollutedData = PollutedData(
- startData!!, endData, factorList, exceptionData, historyData, eType, windLevelCondition
- )
- pollutedArea = PollutedArea(historyData, exceptionData, config, windLevelCondition)
+ pollutedData = PollutedData(exceptions, eType)
+ pollutedArea = PollutedArea(pollutedData!!, config, windLevelCondition)
}
-
-
- /**
- * 6. 灞曠ず鏁版嵁鍙樺寲鎯呭喌锛屼笂鍗囬�熺巼绛夌瓑
- */
/**
* @see [MsgType]
--
Gitblit v1.9.3