From 718aabb1db80e7efbb2e866ca3ae74bcd264e20a Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期一, 02 六月 2025 08:30:19 +0800 Subject: [PATCH] 1. 新增动态污染溯源新的判定逻辑(待完成) --- src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionDataExceed.kt | 29 +++++++++++++++++------------ 1 files changed, 17 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..96c4d5e 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,9 @@ /** * 鏁版嵁瓒呮爣寮傚父鍒嗘瀽 */ -class ExceptionDataExceed(config: DataAnalysisConfig) : BaseExceptionContinuousSingle(config) { +@Deprecated("鍘熻秴鏍囧垽瀹氶�昏緫璁惧畾鐨勮秴鏍囧�兼湁婕忔礊锛�") +class ExceptionDataExceed(config: DataAnalysisConfig) : + BaseExceptionContinuousSingle<ExceptionTag, DataAnalysisConfig, ExceptionResult>(config, ExceptionTag::class.java) { override fun getExceptionType(): ExceptionType = ExceptionType.TYPE2 @@ -25,20 +30,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): Boolean { return true } + + override fun newResult( + start: BaseRealTimeData, + end: BaseRealTimeData?, + factor: FactorFilter.SelectedFactor, + exceptionData: List<BaseRealTimeData>, + ): ExceptionResult { + val eType = getExceptionType() + return ExceptionResult(start, end, factor, exceptionData, config.mission.missionCode, eType) + } } \ No newline at end of file -- Gitblit v1.9.3