From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt | 307 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 245 insertions(+), 62 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 733641e..0388a35 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionContinuous.kt
@@ -2,10 +2,10 @@
import com.flightfeather.uav.biz.FactorFilter
import com.flightfeather.uav.biz.dataanalysis.model.ExceptionTag
+import com.flightfeather.uav.biz.sourcetrace.model.RemainException
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
/**
@@ -14,6 +14,11 @@
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 {
// 璁板綍寮傚父鏁版嵁娈垫椂锛屽垎鍒悜璧峰鍓嶅拰鏈熬鍚庨澶栬褰曠殑鏁版嵁涓暟鍋忕Щ閲�
@@ -29,17 +34,27 @@
protected var lastData: BaseRealTimeData? = null
// 鏈�鏂扮殑涓�缁勫紓甯革紝璁板綍鍗曞洜瀛愬紓甯�
- protected val latestExceptions = mutableListOf<Pair<FactorFilter.SelectedFactor, T>>()
+ val latestExceptions = mutableListOf<Pair<FactorFilter.SelectedFactor, T>>()
/**
* 鏈�鏂扮殑涓�缁勫悎骞跺紓甯革紝鏍规嵁閰嶇疆鍙傛暟浠嶽latestExceptions]鍗曞洜瀛愬紓甯镐腑锛屽悎骞跺紓甯�
*/
protected val latestCombinedExc = mutableListOf<List<Pair<FactorFilter.SelectedFactor, T>>>()
+ // 璁板綍闇�瑕佸欢杩熸暟鎹懆鏈熻繘琛屽悎骞剁殑寮傚父
+ val remainingExceptions = mutableListOf<RemainException<T>>()
+
/**
* 寮傚父缁撴灉
*/
- protected val result = mutableListOf<Y>()
+ val result = mutableListOf<Y>()
+
+ /**
+ * 涓嶉�傜敤浜庢寮傚父绫诲瀷鐨勭洃娴嬪洜瀛�
+ */
+ open var excludedFactor: List<FactorType> = emptyList()
+
+ abstract var judgeMethod: JudgeMethod
/**
* 绔嬪嵆鍒ゆ柇锛氬綋鍑虹幇寮傚父鏃讹紝缂撳瓨寮傚父鏁版嵁鐨勫悓鏃讹紝绔嬪嵆瀵瑰凡鏈夊紓甯歌繘琛屽垽鏂槸鍚︽弧瓒冲紓甯哥粨鏋滆姹�
@@ -98,7 +113,7 @@
* @return
*/
open fun needCut(tag: T, hasException: Boolean?, data: BaseRealTimeData): Boolean {
- // 榛樿鍒ゆ柇鏉′欢涓� 褰撳紓甯镐笉鍐嶉噸澶嶅嚭鐜版椂锛屽舰鎴愬紓甯哥粨鏋�
+ // 榛樿鍒ゆ柇鏉′欢涓� 褰撳紓甯镐笉鍐嶉噸澶嶅嚭鐜版椂
return tag.exceptionExisted && hasException == false
}
@@ -116,9 +131,10 @@
val hasException = judge(lastData, data)
config.factorFilter.selectedList.forEach { s ->
val f = s.main
- tagMap[f]?.let {
- it.addHistoryData(data)
+ // 鎺掗櫎姝ゅ紓甯哥被鍨嬩笉閫傜敤鐨勭洃娴嬪洜瀛�
+ if (excludedFactor.contains(f)) return@forEach
+ tagMap[f]?.let {
it.eIndex++
// 璧峰鏁版嵁
it.endData = data
@@ -126,41 +142,87 @@
it.refreshWithNextException(data)
}
- // 瀵逛簬寮傚父鐨勭敓鎴愬垎鍒墽琛屽悗缃垽鏂�佸拰绔嬪嵆鍒ゆ柇
- // 1. 鍚庣疆鍒ゆ柇锛氬綋鐩搁偦鏁版嵁鏃堕棿涓嶈繛缁椂锛屾垨鑰呮弧瓒宠嚜瀹氫箟鏉′欢鏃讹紝瀵逛箣鍓嶅凡鏈夌殑寮傚父杩涜璁板綍锛屽舰鎴愬紓甯哥粨鏋�
-// if (afterExcCheck(isContinue, it, hasException[f])) {
-// // 鏁版嵁涓嶈繛缁椂鎴栬�呮弧瓒充富鍔ㄦ埅鏂潯浠舵椂锛岃褰曞紓甯告儏鍐�
-// recordException(s, it, data)
-// }
- // 2. 绔嬪嵆鍒ゆ柇锛氬綋鍑虹幇寮傚父鏃讹紝缂撳瓨寮傚父鏁版嵁鐨勫悓鏃讹紝绔嬪嵆瀵瑰凡鏈夊紓甯歌繘琛屽垽鏂槸鍚︽弧瓒冲紓甯哥粨鏋滆姹�
- if (hasException[f] == true) {
-
-// afterExcCheck(isContinue, it, hasException[f])
- if (needCut(it, hasException[f], data)) {
- it.refreshWithNextException(data)
- }
- // 鏈夊紓甯稿嚭鐜版椂锛岃褰曞紓甯告暟鎹�
- it.addExceptionData(data)
- // 褰撶珛鍗冲垽鏂�氳繃鏃讹紝褰㈡垚寮傚父缁撴灉
- if (immeExcCheck(it, f)) {
- recordException(s, it, data)
- }
+ // 鎸夌収涓嶅悓鐨勬柟寮忚繘琛屽紓甯稿垽鏂�
+ when (judgeMethod) {
+ JudgeMethod.M1 -> judgeMethod1(hasException, f, it, data, s)
+ JudgeMethod.M2 -> judgeMethod2(isContinue, hasException, f, it, data, s)
}
- // 3. 鏁版嵁姝ｅ父锛屾棤浠讳綍寮傚父鏃禿
- // TODO("2025.6.3锛氬叾浠栧瓙绫荤殑姝ゅ鍒锋柊閫昏緫寰呭畬鎴愨��)
-// else {
-// it.refreshWithNextException(data)
-// }
+
+ it.addHistoryData(data)
}
}
lastData = data
- mergeExceptionResult()
+ removeSingleFactor(data)
+ val fittedComb = checkDelayedExceptions(data)
+ mergeExceptionResult(data, fittedComb)
+ onNewResult(result)
clearExceptions(data)
}
override fun onDone() {
checkResult(exceptionStatus = ExceptionStatusType.Ended)
+ }
+
+ /**
+ * 鏁版嵁寮傚父鍒ゆ柇鏂瑰紡涓�
+ * 鍦ㄤ竴瀹氱殑绌洪棿鍜屾椂闂磋寖鍥村唴锛屾暟鎹疮璁″嚭鐜癗娆″紓甯稿悗锛岃涓鸿寮傚父鎴愮珛
+ */
+ 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)
+ }
}
/**
@@ -221,54 +283,175 @@
}
/**
- * 鍚堝苟寮傚父
+ * 灏嗕笉鍦ㄥ叧鑱斿叧绯讳腑鐨勭洃娴嬪洜瀛愬紓甯稿瓨鍌紝骞跺墧闄�
*/
- open fun mergeExceptionResult() {
+ fun removeSingleFactor(data: BaseRealTimeData) {
+ if (latestExceptions.isEmpty()) return
+
+ // 鏌ユ壘涓嶅湪鍥犲瓙鍏宠仈缁勫悎涓殑寮傚父鍥犲瓙
+ val sfList = latestExceptions.filter {
+ config.factorFilter.combination.find { c -> c.find { f -> f == it.first.main } != null } == null
+ }
+ // 鐢熸垚瀵瑰簲鐨勫紓甯哥粨鏋滐紝骞跺垵濮嬪寲璇ュ紓甯�
+ sfList.forEach {
+ result.add(newResult(listOf(it)))
+ it.second.refreshWithNextException(data)
+ }
+ // 鍓旈櫎
+ latestExceptions.removeAll(sfList)
+ }
+
+ /**
+ * 妫�鏌ュ欢杩熺殑寰呭悎骞跺紓甯镐笌褰撳墠寮傚父鏄惁鑳藉尮閰�
+ * 1. 灏嗛仐鐣欑殑瓒呰繃绛夊緟鏁版嵁鍛ㄦ湡鐨勫紓甯稿瓨鍌�
+ * 2. 灏嗗尮閰嶆垚鍔熺殑鍚堝苟寮傚父瀛樺偍锛屽悓鏃跺皢鍏宠仈鍏崇郴鏍囪涓哄凡鍖归厤
+ * 3. 淇濈暀渚濇棫鏈悎骞舵垚鍔熷苟涓斿彲缁х画绛夊緟鐨勫紓甯�
+ * @return 琚尮閰嶆垚鍔熺殑鍏宠仈鍏崇郴
+ */
+ fun checkDelayedExceptions(data: BaseRealTimeData): List<List<FactorType>> {
+ if (latestExceptions.isEmpty()) return emptyList()
+
+ // 琚尮閰嶆垚鍔熺殑鐩戞祴鍥犲瓙鍏宠仈鍏崇郴
+ val fittedComb = mutableListOf<List<FactorType>>()
+ // 閬楃暀鐨勮繘鍏ヤ笅涓�涓暟鎹懆鏈熷仛鍒ゆ柇鐨勫緟鍚堝苟寮傚父闆嗗悎
+ val leftExc = mutableListOf<RemainException<T>>()
+ // 鎴愬姛鍖归厤鐨勫悎骞跺紓甯搁泦鍚�
+ val combinedExc = mutableListOf<List<Pair<FactorFilter.SelectedFactor, T>>>()
+ // 鏈鏁版嵁鍛ㄦ湡涓紝琚尮閰嶆垚鍔熺殑寮傚父闆嗗悎
+ val exceps = mutableListOf<Pair<FactorFilter.SelectedFactor, T>>()
+ remainingExceptions.forEach {
+ // 妫�鏌ユ湰娆℃暟鎹懆鏈熺殑寮傚父涓紝鏄惁鍖呭惈鍥犲瓙鍏宠仈鍏崇郴涓殑寮傚父
+ val combRes = matchCombFactor(it.combination, latestExceptions)
+ val res = combRes.second
+ // 鍒ゆ柇鏈鏁版嵁鍛ㄦ湡涓壘鍒扮殑鍥犲瓙鍜屽凡鏈夌殑鍥犲瓙鏄惁婊¤冻鍏宠仈鍏崇郴
+ val findFactors = mutableListOf<FactorType>()
+ res.forEach {r -> findFactors.add(r.first.main) }
+ it.exceptions.forEach {r -> findFactors.add(r.first.main) }
+ val isFitAll = findFactors.distinct() == it.combination
+ // 濡傛灉宸茬粡娌℃湁缂哄け鐨勫紓甯稿洜瀛愶紝鍒欏彲鍚堝苟涓虹粍鍚堝紓甯�
+ if (isFitAll) {
+ fittedComb.add(it.combination)
+ // 灏嗘煡鎵剧粨鏋滄坊鍔犺嚦宸叉湁寮傚父闆嗗悎涓�
+ it.addExceptions(res)
+// // 璁板綍琚尮閰嶆垚鍔熺殑寮傚父
+// res.forEach { r->
+// if (exceps.find { e -> e.second == r.second } == null) {
+// exceps.add(r)
+// }
+// }
+ // 灏嗗悎骞跺紓甯稿瓨鍌�
+ combinedExc.add(it.exceptions)
+
+ }
+ // 鍚﹀垯鐣欎綔涓嬫鏁版嵁鍛ㄦ湡鍐嶅垽瀹氬瓨鍏ュ緟鍚堝苟寮傚父闆嗗悎
+ else {
+ it.period++
+ // 褰撳緟鍚堝苟鐨勫紓甯哥瓑寰呮暟鎹懆鏈熷ぇ浜庤瀹氬�兼椂锛屼笉鍐嶇瓑寰咃紝鐩存帴杈撳嚭寮傚父
+ if (it.period > config.maxDelayPeriod) {
+ result.add(newResult(it.exceptions))
+ return@forEach
+ } else {
+ fittedComb.add(it.combination)
+ // 灏嗘煡鎵剧粨鏋滄坊鍔犺嚦宸叉湁寮傚父闆嗗悎涓�
+ it.addExceptions(res)
+// // 璁板綍琚尮閰嶆垚鍔熺殑寮傚父
+// res.forEach { r->
+// if (exceps.find { e -> e.second == r.second } == null) {
+// exceps.add(r)
+// }
+// }
+ leftExc.add(it)
+ }
+ }
+ }
+ // 瀛樺偍鍚堝苟寮傚父
+ combinedExc.forEach {
+ result.add(newResult(it))
+ }
+// // 灏嗚鍖归厤鎴愬姛鐨勫紓甯稿埛鏂帮紝骞朵粠鏈鏁版嵁鍛ㄦ湡鐨勫紓甯搁泦鍚堜腑绉婚櫎
+// exceps.forEach { r-> r.second.refreshWithNextException(data) }
+// latestExceptions.removeAll(exceps)
+ // 淇濈暀鏈尮閰嶇殑缁勫悎
+ remainingExceptions.clear()
+ remainingExceptions.addAll(leftExc)
+
+ return fittedComb
+ }
+
+ /**
+ * 鍚堝苟寮傚父
+ * @param data 褰撳墠鐩戞祴鏁版嵁
+ * @param fittedComb 鍦ㄩ仐鐣欑殑寮傚父[remainingExceptions]鍒ゆ柇涓紝宸茬粡杩涜鍖归厤鍒ゆ柇鐨勫叧鑱斿叧绯伙紝灏嗕笉鍐嶈繘琛屽尮閰�
+ */
+ open fun mergeExceptionResult(data: BaseRealTimeData, fittedComb: List<List<FactorType>>) {
+ if (latestExceptions.isEmpty()) return
+
+ val combinedExc = mutableListOf<List<Pair<FactorFilter.SelectedFactor, T>>>()
// 閬嶅巻鎵�鏈夌殑鍥犲瓙缁勫悎
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
- }
- }
+ /**
+ * 璺宠繃宸茬粡鍦╗checkDelayedExceptions]涓垽鏂繃鐨勫叧鑱斿叧绯�
+ */
+ if (fittedComb.indexOf(c) >= 0) return@forEach
+
+ val combRes = matchCombFactor(c, latestExceptions)
+ val res = combRes.second
+ val exist = combRes.first
// 濡傛灉缁勫悎鍐呯殑鎵�鏈夊洜瀛愰兘瀛樺湪寮傚父锛屽垯瀛樺偍涓哄悎骞跺紓甯�
if (exist) {
- // 灏嗗悎骞跺紓甯镐粠鍗曚釜寮傚父闆嗗悎涓幓闄�
- res.forEach { r ->
- latestExceptions.removeIf { e -> e.first.main == r.first.main }
- }
// 灏嗗悎骞跺紓甯稿瓨鍌�
- latestCombinedExc.add(res)
+ combinedExc.add(res)
+ }
+ // 鍚﹀垯灏嗗紓甯哥殑娣辨嫹璐濈増鏈瓨鍏ュ緟鍚堝苟寮傚父闆嗗悎
+ // TODO 2025.8.4: 鍚庣画娣诲姞褰撳叧鑱旂殑鐩戞祴鍥犲瓙绱寮傚父璁℃暟鎺ヨ繎闃堝�兼椂锛屾墠瀛樺叆闆嗗悎鐨勯�昏緫
+ else if (res.isNotEmpty()) {
+ remainingExceptions.add(RemainException(res, c))
}
}
- // 瀛樺偍寮傚父缁撴灉
- latestExceptions.forEach {
- result.add(newResult(listOf(it)))
- }
- latestCombinedExc.forEach {
+
+ // 瀛樺偍鍚堝苟寮傚父
+ combinedExc.forEach {
result.add(newResult(it))
}
}
+ /**
+ * 鍖归厤鍏宠仈寮傚父鍥犲瓙
+ * @param comb 鍏宠仈鍥犲瓙鍏崇郴
+ * @param exceptions 鍚勭洃娴嬪洜瀛愬紓甯搁泦鍚�
+ * @return exist琛ㄧず鏄惁鎵惧埌鍏宠仈鍏崇郴[comb]涓墍鏈夌殑鍥犲瓙锛宺es琛ㄧず鎵惧埌鐨勭粨鏋�
+ */
+ private fun matchCombFactor(
+ comb: List<FactorType>,
+ exceptions: List<Pair<FactorFilter.SelectedFactor, T>>,
+ ): Pair<Boolean, MutableList<Pair<FactorFilter.SelectedFactor, T>>> {
+ val res = mutableListOf<Pair<FactorFilter.SelectedFactor, T>>()
+ var exist = true
+ // 鏌ョ湅缁勫悎鍐呯殑鎵�鏈夊洜瀛愭槸鍚﹂兘鍚屾椂鍑虹幇寮傚父
+ comb.forEach { f ->
+ val r = exceptions.find { e ->
+ e.first.main == f
+ }
+ if (r != null) {
+ res.add(r)
+ } else {
+ exist = false
+ }
+ }
+ return exist to res
+ }
+
+ abstract fun onNewResult(result: List<Y>)
+
+ /**
+ * 鍦ㄥ紓甯哥敓鎴愮粨鏋滃悗锛岃繘琛屽垵濮嬪寲
+ */
private fun clearExceptions(data: BaseRealTimeData) {
+ // 姝ゆ椂latestExceptions涓簲璇ュ寘鍚殑渚濇棫鏄湰娆℃暟鎹懆鏈熷唴鐨勬墍鏈夊紓甯�
latestExceptions.forEach {
it.second.refreshWithNextException(data)
}
latestExceptions.clear()
- latestCombinedExc.forEach {
- it.forEach { e ->
- e.second.refreshWithNextException(data)
- }
- }
- latestCombinedExc.clear()
result.clear()
}
--
Gitblit v1.9.3