From 20b8d870efbbb89564b599561fc69202ba41223f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 10 四月 2026 13:36:42 +0800
Subject: [PATCH] 2026.4.10 1. 修复采样时间超过当前时间的数据依旧能存入数据库的bug

---
 src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/exceptiontype/BaseRTExcChangeRate.kt |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 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 91f783a..24a584d 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
     }
@@ -64,7 +66,7 @@
                 // 璁$畻鍚庝竴涓暟鎹浉姣斾簬鍓嶄竴涓暟鎹殑鍙樺寲閫熺巼
                 val v = (nValue - pValue)
                 val b1 = v in rate.mutationRate.first..rate.mutationRate.second
-                println("鍥犲瓙锛�${f.des}锛岄�熺巼锛�${v}锛�${b1}")
+//                println("鍥犲瓙锛�${f.des}锛岄�熺巼锛�${v}锛�${b1}")
                 res[f] = b1
             } else {
                 res[f] = false
@@ -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(it as PollutedClue)
-            }
-            latestCombinedResult.forEach {
-                func.invoke(it as PollutedClue)
+            result.forEach {
+                func.invoke(it)
             }
         }
     }

--
Gitblit v1.9.3