From 61871594dfa0a5ac2c4d895d9ec4034feba57094 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 12 九月 2025 17:20:53 +0800
Subject: [PATCH] 2025.9.5 1. 新增走航任务统计功能

---
 src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcChangeRate.kt |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcChangeRate.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcChangeRate.kt
index c3ad456..81cb8a6 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcChangeRate.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcChangeRate.kt
@@ -30,6 +30,8 @@
 
     abstract var changeRate: MutableMap<FactorType, RTExcWindLevelConfig.WindLevelCondition>
 
+    override var judgeMethod: JudgeMethod = JudgeMethod.M2
+
     override fun getExceptionType(): ExceptionType {
         return ExceptionType.TYPE9
     }
@@ -110,31 +112,29 @@
     }
 
     override fun newResult(tag: ExceptionTag, factor: FactorFilter.SelectedFactor): PollutedClue {
-        return PollutedClue(tag, factor, getExceptionType(), config, changeRate[factor.main])
+        return PollutedClue()
     }
 
-    override fun onNewException(
-        tag: ExceptionTag,
-        factor: FactorFilter.SelectedFactor,
-        exceptionStatus: ExceptionStatusType,
-    ) {
-        super.onNewException(tag, factor, exceptionStatus)
+    override fun newResult(exceptions: List<Pair<FactorFilter.SelectedFactor, ExceptionTag>>): PollutedClue {
+        return if (exceptions.isEmpty())
+            PollutedClue()
+        else
+            PollutedClue(exceptions, getExceptionType(), config, changeRate[exceptions[0].first.main])
+    }
+
+//    override fun mergeExceptionResult() {
+//        super.mergeExceptionResult()
 //        callback?.let { func ->
-//            val exc = tag.exceptionResult.last()
-//            func.invoke(exc as PollutedClue)
+//            result.forEach {
+//                func.invoke(it)
+//            }
 //        }
-    }
+//    }
 
-    override fun mergeExceptionResult() {
-        super.mergeExceptionResult()
-        latestExceptionResult
-        latestCombinedResult
+    override fun onNewResult(result: List<PollutedClue>) {
         callback?.let { func ->
-            latestExceptionResult.forEach {
-                func.invoke(listOf(it as PollutedClue))
-            }
-            latestCombinedResult.forEach {
-                func.invoke(it as List<PollutedClue>)
+            result.forEach {
+                func.invoke(it)
             }
         }
     }

--
Gitblit v1.9.3