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/BaseExceptionContinuous.kt | 404 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 274 insertions(+), 130 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt
index 2ea3314..36fdfa1 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt
@@ -1,194 +1,338 @@
package com.flightfeather.uav.biz.dataanalysis
import com.flightfeather.uav.biz.FactorFilter
-import com.flightfeather.uav.biz.dataanalysis.model.DataAnalysisConfig
+import com.flightfeather.uav.biz.dataanalysis.model.ExceptionTag
import com.flightfeather.uav.domain.entity.BaseRealTimeData
+import com.flightfeather.uav.lightshare.eunm.ExceptionStatusType
import com.flightfeather.uav.socket.eunm.FactorType
+import org.springframework.beans.BeanUtils
+import java.time.Duration
/**
* 杩炵画绫诲瀷鐨勫紓甯稿垎鏋愬熀绫�,閫傜敤浜庡綋鍓嶆暟鎹笌鐩搁偦鏁版嵁涔嬮棿鏈夊叧鑱斿叧绯荤殑鎯呭喌
*/
-abstract class BaseExceptionContinuous(config: DataAnalysisConfig) : BaseExceptionAnalysis(config) {
+abstract class BaseExceptionContinuous<T : ExceptionTag, V : BaseAnalysisConfig, Y : BaseExceptionResult>(
+ config: V, private val tagClz: Class<T>,
+) : BaseExceptionAnalysis<V, Y>(config) {
+
+ enum class JudgeMethod(val des: String) {
+ M1("鍦ㄤ竴瀹氱殑绌洪棿鍜屾椂闂磋寖鍥村唴锛屾暟鎹疮璁″嚭鐜癗娆″紓甯稿悗锛岃涓鸿寮傚父鎴愮珛"),
+ M2("瑕佹眰鏁版嵁涓嶉棿鏂繛缁嚭鐜癗娆″紓甯稿悗锛岃涓鸿寮傚父鎴愮珛"),
+ }
companion object {
// 璁板綍寮傚父鏁版嵁娈垫椂锛屽垎鍒悜璧峰鍓嶅拰鏈熬鍚庨澶栬褰曠殑鏁版嵁涓暟鍋忕Щ閲�
private const val OFFSET = 10
}
- inner class Tag {
- // 璧峰鏁版嵁涓嬫爣
- var sIndex = 0
-
- // 璧峰鏁版嵁瀵硅薄
- var startData :BaseRealTimeData? = null
-
- // 鏈熬鏁版嵁涓嬫爣
- var eIndex = -1
-
- // 鏈熬鏁版嵁瀵硅薄
- var endData: BaseRealTimeData? = null
-
- // 寮傚父鏁版嵁娈�
- var exceptionData = mutableListOf<BaseRealTimeData>()
-
- // 鏄惁瀛樺湪寮傚父
- var existException = false
-
- fun refreshAfterCheckResult(data: BaseRealTimeData) {
- sIndex = eIndex
- startData = data
- exceptionData.clear()
- exceptionData.add(data)
- }
- }
-
- protected val tagMap = mutableMapOf<FactorType, Tag>()
-
-// // 璧峰鏁版嵁涓嬫爣
-// protected var sIndex = mutableListOf<Int>()
-//
-// // 璧峰鏁版嵁瀵硅薄
-// protected var startData = mutableListOf<BaseRealTimeData?>()
-//
-// // 鏈熬鏁版嵁涓嬫爣
-// protected var eIndex = mutableListOf<Int>()
-//
-// // 寮傚父鏁版嵁娈�
-// protected var exceptionData = mutableListOf<MutableList<BaseRealTimeData>>()
-
-// protected var existException = mutableListOf<Boolean>()
+ protected val tagMap = mutableMapOf<FactorType, T>()
// 璧峰鏁版嵁涓庢湯灏炬暟鎹棿闅�
open var durationCount = 1
+
// 鏈熬鏁版嵁瀵硅薄
protected var lastData: BaseRealTimeData? = null
+ // 鏈�鏂扮殑涓�缁勫紓甯革紝璁板綍鍗曞洜瀛愬紓甯�
+ protected val latestExceptions = mutableListOf<Pair<FactorFilter.SelectedFactor, T>>()
+
/**
- * 鍒ゆ柇鏄惁婊¤冻寮傚父鏉′欢
+ * 鏈�鏂扮殑涓�缁勫悎骞跺紓甯革紝鏍规嵁閰嶇疆鍙傛暟浠嶽latestExceptions]鍗曞洜瀛愬紓甯镐腑锛屽悎骞跺紓甯�
+ */
+ protected val latestCombinedExc = mutableListOf<List<Pair<FactorFilter.SelectedFactor, T>>>()
+
+ /**
+ * 寮傚父缁撴灉
+ */
+ protected val result = mutableListOf<Y>()
+
+ /**
+ * 涓嶉�傜敤浜庢寮傚父绫诲瀷鐨勭洃娴嬪洜瀛�
+ */
+ open var excludedFactor: List<FactorType> = emptyList()
+
+ abstract var judgeMethod: JudgeMethod
+
+ /**
+ * 绔嬪嵆鍒ゆ柇锛氬綋鍑虹幇寮傚父鏃讹紝缂撳瓨寮傚父鏁版嵁鐨勫悓鏃讹紝绔嬪嵆瀵瑰凡鏈夊紓甯歌繘琛屽垽鏂槸鍚︽弧瓒冲紓甯哥粨鏋滆姹�
+ */
+ open fun immeExcCheck(tag: T, factorType: FactorType): Boolean {
+ return false
+ }
+
+ /**
+ * 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画
+ */
+ open fun isContinuous(d1: BaseRealTimeData?, d2: BaseRealTimeData?): Boolean {
+ if (d1 == null || d2 == null) return true
+
+ val t1 = d1.dataTime
+ val t2 = d2.dataTime
+ return Duration.between(t1?.toInstant(), t2?.toInstant()).toMillis() <= (20 * 1000)
+ }
+
+ /**
+ * 鍒ゆ柇鏁版嵁閲忕骇鍦ㄥ紓甯稿垽鏂殑鑼冨洿鍐�
+ * 榛樿鎵�鏈夐噺绾ч兘鍦ㄥ紓甯稿垽鏂殑鑼冨洿鍐�
+ */
+ open fun judgeDataScale(p: BaseRealTimeData?, n: BaseRealTimeData): MutableMap<FactorType, Boolean> {
+ val res = mutableMapOf<FactorType, Boolean>()
+ config.factorFilter.mainList().forEach { f -> res[f] = true }
+ return res
+ }
+
+ /**
+ * 鍒ゆ柇鍓嶅悗鏁版嵁鏄惁婊¤冻寮傚父鏉′欢
*/
abstract fun judgeException(p: BaseRealTimeData?, n: BaseRealTimeData): MutableMap<FactorType, Boolean>
/**
- * 鍒ゆ柇寮傚父鍑虹幇鐨勮繛缁椂闀挎槸鍚︽弧瓒虫潯浠�
+ * 鍒ゆ柇寮傚父鍑虹幇鐨勮繛缁釜鏁版槸鍚︽弧瓒虫潯浠�
+ * @param tag 寮傚父鏁版嵁瀵硅薄
*/
- abstract fun judgeDuration(sIndex: Int, eIndex: Int): Boolean
+ abstract fun judgeExceptionCount(tag: T, factorType: FactorType?): Boolean
+
+ /**
+ * 鍒ゆ柇鐩戞祴鍥犲瓙鏄惁鍑虹幇寮傚父
+ */
+ open fun judge(p: BaseRealTimeData?, n: BaseRealTimeData): MutableMap<FactorType, Boolean> {
+ val jds = judgeDataScale(p, n)
+ val jex = judgeException(p, n)
+ val res = mutableMapOf<FactorType, Boolean>()
+ jds.forEach { (t, u) ->
+ res[t] = u && jex[t] ?: false
+ }
+ return res
+ }
+
+ /**
+ * 寮傚父鏁版嵁鐨勬埅鍙栧垽鏂�
+ * @return
+ */
+ open fun needCut(tag: T, hasException: Boolean?, data: BaseRealTimeData): Boolean {
+ // 榛樿鍒ゆ柇鏉′欢涓� 褰撳紓甯镐笉鍐嶉噸澶嶅嚭鐜版椂
+ return tag.exceptionExisted && hasException == false
+ }
override fun init() {
super.init()
lastData = null
-// repeat(config.factorCount) {
-// startData.add(null)
-// sIndex.add(0)
-// eIndex.add(-1)
-// existException.add(false)
-// exceptionData.add(mutableListOf())
-// }
- config.factorFilter.mainList().forEach {f->
- tagMap[f] = Tag()
+ tagMap.clear()
+ config.factorFilter.mainList().forEach { f ->
+ tagMap[f] = tagClz.newInstance()
}
}
override fun onNextData(data: BaseRealTimeData) {
val isContinue = isContinuous(lastData, data)
- val hasException = judgeException(lastData, data)
- config.factorFilter.mainList().forEach {f->
+ val hasException = judge(lastData, data)
+ config.factorFilter.selectedList.forEach { s ->
+ val f = s.main
+ // 鎺掗櫎姝ゅ紓甯哥被鍨嬩笉閫傜敤鐨勭洃娴嬪洜瀛�
+ if (excludedFactor.contains(f)) return@forEach
+
tagMap[f]?.let {
it.eIndex++
// 璧峰鏁版嵁
- if (it.endData == null) {
- it.refreshAfterCheckResult(data)
+ it.endData = data
+ if (it.startData == null) {
+ it.refreshWithNextException(data)
}
- // 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画骞朵笖鏄惁婊¤冻寮傚父鍒ゆ柇
- if (!isContinue) {
- checkResult()
- // 鏁版嵁涓嶈繛缁椂锛岃褰曞紓甯告儏鍐�
- if (it.eIndex - it.sIndex >= durationCount) {
- it.refreshAfterCheckResult(data)
- }
- } else {
- if (hasException[f] == true) {
- it.existException = true
- it.exceptionData.add(data)
- } else {
- // 寮傚父涓嶅啀閲嶅鍑虹幇鏃讹紝璁板綍寮傚父鎯呭喌
- checkResult()
- if (it.eIndex - it.sIndex >= durationCount) {
- it.refreshAfterCheckResult(data)
- }
- }
+
+ // 鎸夌収涓嶅悓鐨勬柟寮忚繘琛屽紓甯稿垽鏂�
+ when (judgeMethod) {
+ JudgeMethod.M1 -> judgeMethod1(hasException, f, it, data, s)
+ JudgeMethod.M2 -> judgeMethod2(isContinue, hasException, f, it, data, s)
}
+
+ it.addHistoryData(data)
}
}
-// repeat(config.factorCount) { i ->
-// eIndex[i]++
-// // 璧峰鏁版嵁
-// if (lastData == null) {
-// refreshAfterCheckResult(i, data)
-// }
-// // 鍒ゆ柇鐩搁偦鏁版嵁鏄惁杩炵画骞朵笖鏄惁婊¤冻寮傚父鍒ゆ柇
-// if (!isContinue) {
-// checkResult()
-// // 鏁版嵁涓嶈繛缁椂锛岃褰曞紓甯告儏鍐�
-// if (eIndex[i] - sIndex[i] >= durationCount) {
-// refreshAfterCheckResult(i, data)
-// }
-// } else {
-// if (hasException[i]) {
-// existException[i] = true
-// exceptionData[i].add(data)
-// } else {
-// // 寮傚父涓嶅啀閲嶅鍑虹幇鏃讹紝璁板綍寮傚父鎯呭喌
-// checkResult()
-// if (eIndex[i] - sIndex[i] >= durationCount) {
-// refreshAfterCheckResult(i, data)
-// }
-// }
-// }
-// }
lastData = data
+
+ mergeExceptionResult()
+ clearExceptions(data)
}
override fun onDone() {
- checkResult()
+ checkResult(exceptionStatus = ExceptionStatusType.Ended)
}
-// fun refreshAfterCheckResult(i:Int, data: BaseRealTimeData) {
-// sIndex[i] = eIndex[i]
-// startData[i] = data
-// exceptionData[i].clear()
-// exceptionData[i].add(data)
-// }
+ /**
+ * 鏁版嵁寮傚父鍒ゆ柇鏂瑰紡涓�
+ * 鍦ㄤ竴瀹氱殑绌洪棿鍜屾椂闂磋寖鍥村唴锛屾暟鎹疮璁″嚭鐜癗娆″紓甯稿悗锛岃涓鸿寮傚父鎴愮珛
+ */
+ private fun judgeMethod1(
+ hasException: MutableMap<FactorType, Boolean>,
+ f: FactorType,
+ tag: T,
+ data: BaseRealTimeData,
+ s: FactorFilter.SelectedFactor,
+ ) {
+ // 鍑虹幇寮傚父
+ if (hasException[f] == true) {
+ // 鍒ゆ柇鏁版嵁鍦ㄧ┖闂村拰鏃堕棿鍙樺寲涓婃槸鍚﹁秴鍑洪檺瀹氳寖鍥达紝鑻ヨ秴鍑哄垯鍒犻櫎閬楃暀鐨勫紓甯歌褰曪紝鍒锋柊璧峰鐐规暟鎹�
+ if (needCut(tag, hasException[f], data)) {
+ tag.refreshWithNextException(data)
+ }
+ // 璁板綍寮傚父鏁版嵁
+ tag.addExceptionData(data)
+ // 褰撶珛鍗冲垽鏂�氳繃鏃讹紝褰㈡垚寮傚父缁撴灉
+ if (immeExcCheck(tag, f)) {
+ recordException(s, tag, data)
+ }
+ }
+ // 鏁版嵁姝ｅ父锛屽苟涓旀病鏈夊巻鍙插紓甯告暟鎹椂锛屽埛鏂拌捣濮嬬偣鏁版嵁
+ else if (!tag.exceptionExisted) {
+ tag.refreshWithNextException(data)
+ }
+ }
+
+ /**
+ * 鏁版嵁寮傚父鍒ゆ柇鏂瑰紡浜�
+ * 瑕佹眰鏁版嵁涓嶉棿鏂繛缁嚭鐜癗娆″紓甯稿悗锛岃涓鸿寮傚父鎴愮珛
+ */
+ private fun judgeMethod2(
+ isContinue: Boolean,
+ hasException: MutableMap<FactorType, Boolean>,
+ f: FactorType,
+ tag: T,
+ data: BaseRealTimeData,
+ s: FactorFilter.SelectedFactor,
+ ) {
+ // 褰撶浉閭绘暟鎹椂闂翠笉杩炵画鏃讹紝鍒锋柊璧峰鐐规暟鎹紝绉婚櫎鍘嗗彶寮傚父璁板綍
+ if (!isContinue) {
+ tag.refreshWithNextException(data)
+ }
+ // 鍑虹幇寮傚父
+ else if (hasException[f] == true) {
+ // 鏈夊紓甯稿嚭鐜版椂锛岃褰曞紓甯告暟鎹�
+ tag.addExceptionData(data)
+ // 褰撶珛鍗冲垽鏂�氳繃鏃讹紝褰㈡垚寮傚父缁撴灉
+ if (immeExcCheck(tag, f)) {
+ recordException(s, tag, data)
+ }
+ }
+ // 鏁版嵁姝ｅ父锛屽埛鏂拌捣濮嬬偣鏁版嵁锛岀Щ闄ゅ巻鍙插紓甯歌褰�
+ else {
+ tag.refreshWithNextException(data)
+ }
+ }
+
+ /**
+ * 寮傚父缁撴潫锛岃褰曞紓甯�
+ * 鍒ゆ柇宸叉湁鐨勫紓甯告暟鎹槸鍚︽弧瓒冲紓甯告潯浠讹紝婊¤冻鍒欒褰曪紝涓嶆弧瓒冲垯鐣ヨ繃
+ */
+ fun recordException(factor: FactorFilter.SelectedFactor, tag: T, data: BaseRealTimeData) {
+ checkResult(factor, ExceptionStatusType.Ended)
+// tag.refreshWithNextException(data)
+ }
/**
* 妫�鏌ヨ繛缁紓甯哥粨鏉熸椂锛屾槸鍚︾鍚堝紓甯稿瓨鍌ㄦ潯浠�
*/
- open fun checkResult(factor: FactorFilter.SelectedFactor? = null) {
+ open fun checkResult(
+ factor: FactorFilter.SelectedFactor? = null,
+ exceptionStatus: ExceptionStatusType = ExceptionStatusType.InProgress,
+ ) {
val tag = tagMap[factor?.main]
if (factor != null && tag != null) {
- if (tag.existException && judgeDuration(tag.sIndex, tag.eIndex)) {
- tag.startData?.let {
- resultList.add(newResult(it, lastData, factor, tag.exceptionData))
- }
- tag.existException = false
+ if (tag.exceptionExisted && judgeExceptionCount(tag, factor.main)) {
+ onNewException(tag, factor, exceptionStatus)
}
} else {
config.factorFilter.selectedList.forEach { f ->
val tag1 = tagMap[f.main] ?: return@forEach
- if (tag1.existException && judgeDuration(tag1.sIndex, tag1.eIndex)) {
- tag1.startData?.let {
- resultList.add(newResult(it, lastData, f, tag1.exceptionData))
- }
- tag1.existException = false
+ if (tag1.exceptionExisted && judgeExceptionCount(tag1, f.main)) {
+ onNewException(tag1, f, exceptionStatus)
}
}
-// repeat(config.factorCount) { i ->
-// if (existException[i] && judgeDuration(sIndex[i], eIndex[i])) {
-// startData[i]?.let {
-// resultList.add(newResult(it, lastData, i, exceptionData[i]))
-// }
-// existException[i] = false
-// }
-// }
}
}
+
+ /**
+ * 鏂板鎴栨洿鏂颁竴鏉″紓甯�
+ */
+ open fun onNewException(tag: T, factor: FactorFilter.SelectedFactor, exceptionStatus: ExceptionStatusType) {
+ if (tag.startData == null) return
+// val ex = newResult(tag.startData!!, tag.endData, factor, tag.exceptionData)
+// val ex = newResult(tag, factor)
+// .apply { status = exceptionStatus.value }
+// // 寮傚父宸插垱寤烘椂锛屾洿鏂板紓甯镐俊鎭�
+// if (tag.exceptionCreated) {
+// // 灏嗘渶鏂扮殑寮傚父鐨刧uid璧嬪�肩粰ex
+// val lastEx = tag.exceptionResult.last()
+// ex.guid = lastEx.guid
+// tag.exceptionResult.removeLast()
+// tag.exceptionResult.add(ex)
+// }
+// // 寮傚父鏈垱寤烘椂锛屾柊寤哄紓甯镐俊鎭�
+// else {
+// tag.exceptionResult.add(ex)
+// tag.exceptionCreated = true
+// }
+// val tagClone = tagClz.newInstance()
+// BeanUtils.copyProperties(tag, tagClone)
+ latestExceptions.add(factor to tag)
+ }
+
+ /**
+ * 鍚堝苟寮傚父
+ */
+ open fun mergeExceptionResult() {
+ // 閬嶅巻鎵�鏈夌殑鍥犲瓙缁勫悎
+ config.factorFilter.combination.forEach { c ->
+ val res = mutableListOf<Pair<FactorFilter.SelectedFactor, T>>()
+ var exist = true
+ // 鏌ョ湅缁勫悎鍐呯殑鎵�鏈夊洜瀛愭槸鍚﹂兘鍚屾椂鍑虹幇寮傚父
+ c.forEach { f ->
+ val r = latestExceptions.find { e ->
+ e.first.main == f
+ }
+ if (r != null) {
+ res.add(r)
+ } else {
+ exist = false
+ }
+ }
+ // 濡傛灉缁勫悎鍐呯殑鎵�鏈夊洜瀛愰兘瀛樺湪寮傚父锛屽垯瀛樺偍涓哄悎骞跺紓甯�
+ if (exist) {
+ // 灏嗗悎骞跺紓甯镐粠鍗曚釜寮傚父闆嗗悎涓幓闄�
+ res.forEach { r ->
+ latestExceptions.removeIf { e -> e.first.main == r.first.main }
+ }
+ // 灏嗗悎骞跺紓甯稿瓨鍌�
+ latestCombinedExc.add(res)
+ }
+ }
+ // 瀛樺偍寮傚父缁撴灉
+ latestExceptions.forEach {
+ result.add(newResult(listOf(it)))
+ }
+ latestCombinedExc.forEach {
+ result.add(newResult(it))
+ }
+ }
+
+ private fun clearExceptions(data: BaseRealTimeData) {
+ latestExceptions.forEach {
+ it.second.refreshWithNextException(data)
+ }
+ latestExceptions.clear()
+ latestCombinedExc.forEach {
+ it.forEach { e ->
+ e.second.refreshWithNextException(data)
+ }
+ }
+ latestCombinedExc.clear()
+ result.clear()
+ }
+
+ /**
+ * 鐢熸垚涓�鏉″紓甯稿垎鏋愮粨鏋�
+ */
+ abstract fun newResult(tag: T, factor: FactorFilter.SelectedFactor): Y
+
+ abstract fun newResult(exceptions: List<Pair<FactorFilter.SelectedFactor, ExceptionTag>>): Y
+
}
\ No newline at end of file
--
Gitblit v1.9.3