From d3b43d50df28c4fe27c104dcd146d35b2bad4d20 Mon Sep 17 00:00:00 2001 From: Riku <risaku@163.com> Date: 星期三, 11 六月 2025 22:48:01 +0800 Subject: [PATCH] 1. 新增动态污染溯源新的判定逻辑(待完成) --- src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt index 6ac4ab8..21bede2 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/exceptiontype/ExceptionSlideAverage.kt @@ -44,7 +44,7 @@ var exceptionData = mutableListOf<BaseRealTimeData>() // 鏄惁瀛樺湪寮傚父 - var existException = false + var exceptionExisted = false fun refreshAfterCheckResult(data: BaseRealTimeData) { // 鍒ゆ柇骞舵洿鏂拌捣濮嬬偣浣嶇疆 @@ -100,7 +100,7 @@ if (tempDataList.size == config.changeTrendGroup) { calAvg(f, tempDataList) if (checkSlideAvg(f)) { - it.existException = true + it.exceptionExisted = true it.exceptionData.add(data) } else { checkResult(s) @@ -181,26 +181,28 @@ private fun checkResult(factor: FactorFilter.SelectedFactor? = null) { val tag = tagMap[factor?.main] if (factor != null && tag != null) { - if (tag.existException) { + if (tag.exceptionExisted) { tag.startData?.let { - resultList.add(newResult(it, lastData, factor, tag.exceptionData)) + resultList.add(newResult(it, tag.endData, factor, tag.exceptionData)) } - tag.existException = false + tag.exceptionExisted = false } } else { config.factorFilter.selectedList.forEach { f -> val tag1 = tagMap[f.main] ?: return@forEach - if (tag1.existException) { + if (tag1.exceptionExisted) { tag1.startData?.let { - resultList.add(newResult(it, lastData, f, tag1.exceptionData)) + resultList.add(newResult(it, tag1.endData, f, tag1.exceptionData)) } - tag1.existException = false + tag1.exceptionExisted = false } } } } + + fun newResult( start: BaseRealTimeData, end: BaseRealTimeData?, -- Gitblit v1.9.3