From 38d72198bfcced01ed9513b978163e5cd1d84625 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 21 七月 2025 15:31:41 +0800
Subject: [PATCH] 2025.7.21 1. 修改动态溯源异常判断逻辑

---
 src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt
index 0d140d9..2e382b4 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt
@@ -1,7 +1,10 @@
 package com.flightfeather.uav.biz.dataanalysis.exceptiontype
 
+import com.flightfeather.uav.biz.FactorFilter
 import com.flightfeather.uav.biz.dataanalysis.BaseExceptionContinuousSingle
 import com.flightfeather.uav.biz.dataanalysis.model.DataAnalysisConfig
+import com.flightfeather.uav.biz.dataanalysis.model.ExceptionResult
+import com.flightfeather.uav.biz.dataanalysis.model.ExceptionTag
 import com.flightfeather.uav.biz.dataanalysis.model.ExceptionType
 import com.flightfeather.uav.domain.entity.BaseRealTimeData
 import com.flightfeather.uav.socket.eunm.FactorType
@@ -9,7 +12,11 @@
 /**
  * 鏁版嵁瓒呮爣寮傚父鍒嗘瀽
  */
-class ExceptionDataExceed(config: DataAnalysisConfig) : BaseExceptionContinuousSingle(config) {
+@Deprecated("鍘熻秴鏍囧垽瀹氶�昏緫璁惧畾鐨勮秴鏍囧�兼湁婕忔礊锛�")
+class ExceptionDataExceed(config: DataAnalysisConfig) :
+    BaseExceptionContinuousSingle<ExceptionTag, DataAnalysisConfig, ExceptionResult>(config, ExceptionTag::class.java) {
+
+    override var judgeMethod: JudgeMethod = JudgeMethod.M2
 
     override fun getExceptionType(): ExceptionType = ExceptionType.TYPE2
 
@@ -25,20 +32,20 @@
             }
             res[f] = bool
         }
-//        repeat(config.factorCount) { i ->
-//            val data = n.getByFactorIndex(i)
-//            val limit = config.exceptionSetting.getByFactorIndex(i)
-//            val bool = if (data != null && limit != null) {
-//                data >= limit
-//            } else {
-//                false
-//            }
-//            res.add(bool)
-//        }
         return res
     }
 
-    override fun judgeDuration(sIndex: Int, eIndex: Int): Boolean {
+    override fun judgeExceptionCount(tag: ExceptionTag, factorType: FactorType?): Boolean {
         return true
     }
+
+    override fun newResult(tag: ExceptionTag, factor: FactorFilter.SelectedFactor): ExceptionResult {
+        val eType = getExceptionType()
+        return ExceptionResult(tag.startData!!, tag.endData, factor, tag.exceptionData, config.mission.missionCode,
+            eType)
+    }
+
+    override fun newResult(exceptions: List<Pair<FactorFilter.SelectedFactor, ExceptionTag>>): ExceptionResult {
+        return ExceptionResult()
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3