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/exceptiontype/BaseRTExcWindLevel.kt |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcWindLevel.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcWindLevel.kt
index 2fa4571..5fc728c 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcWindLevel.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcWindLevel.kt
@@ -116,10 +116,17 @@
     }
 
     override fun newResult(tag: ExceptionTag, factor: FactorFilter.SelectedFactor): PollutedClue {
-        return PollutedClue(tag, factor, getExceptionType(), config, windLevelCondition)
+        return PollutedClue()
     }
 
-//    override fun newResult(
+    override fun newResult(exceptions: List<Pair<FactorFilter.SelectedFactor, ExceptionTag>>): PollutedClue {
+        return if (exceptions.isEmpty())
+            PollutedClue()
+        else
+            PollutedClue(exceptions, getExceptionType(), config, windLevelCondition)
+    }
+
+    //    override fun newResult(
 //        start: BaseRealTimeData,
 //        end: BaseRealTimeData?,
 //        factor: FactorFilter.SelectedFactor,
@@ -134,9 +141,24 @@
         exceptionStatus: ExceptionStatusType,
     ) {
         super.onNewException(tag, factor, exceptionStatus)
+//        callback?.let { func ->
+//            val exc = tag.exceptionResult.last()
+//            func.invoke(exc as PollutedClue)
+//        }
+    }
+
+    override fun mergeExceptionResult() {
+        super.mergeExceptionResult()
         callback?.let { func ->
-            val exc = tag.exceptionResult.last()
-            func.invoke(exc as PollutedClue)
+            result.forEach {
+                func.invoke(it)
+            }
+//            latestExceptions.forEach {
+//                func.invoke(listOf(it as PollutedClue))
+//            }
+//            latestCombinedExc.forEach {
+//                func.invoke(it as List<PollutedClue>)
+//            }
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3