From 1a677d2b4a4bc615602f8c2a22bc07ec1356e5be Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 16 十月 2025 17:39:06 +0800
Subject: [PATCH] 2025.10.16 1. 根据全局响应增强器GlobalResponseAdvice，将原先的BaseResPack接口包装函数统一去除； 2. 新增三种类型的数据产品数据库实体 3. 新增典型问题场景清单中间数据产品接口
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt
index 8838bee..bf5e921 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt
@@ -70,58 +70,55 @@
//鑾峰彇鍘熷鐩戞祴鏁版嵁
val dataList = fetchDataResources(evaluationScene)
//璁＄畻缁熻缁撴灉
-// var tempExceedTimes = TempResult()
-// var tempAvg = TempResult()
-// var tempMax = TempResult()
-// var tempMin = TempResult()
+ var tempExceedTimes = TempResult()
+ var tempAvg = TempResult()
+ var tempMax = TempResult()
+ var tempMin = TempResult()
+ var deviceCode: String? = null
dataList.forEach {
// 鐩戞祴鐐规湁澶氬彴璁惧鏃讹紝姣忓彴璁惧鍗曠嫭璁板綍
- val deviceCode = if (it.isNotEmpty()) {
+ deviceCode = if (it.isNotEmpty()) {
getDeviceCode(it[0])
} else {
null
}
- val tempExceedTimes = TempResult()
- val tempAvg = TempResult()
- val tempMax = TempResult()
- val tempMin = TempResult()
-// val _tempExceedTimes = TempResult()
-// val _tempAvg = TempResult()
-// val _tempMax = TempResult()
-// val _tempMin = TempResult()
+ val _tempExceedTimes = TempResult()
+ val _tempAvg = TempResult()
+ val _tempMax = TempResult()
+ val _tempMin = TempResult()
it.forEach { t ->
t?.let {
- exceedTimes(t, tempExceedTimes)
- avg(t, tempAvg)
- max(t, tempMax)
- min(t, tempMin)
+ exceedTimes(t, _tempExceedTimes)
+ avg(t, _tempAvg)
+ max(t, _tempMax)
+ min(t, _tempMin)
}
}
// 淇濈暀鍧囧�兼渶楂樼殑涓�鍙拌澶�
-// if (_tempAvg.avg > tempAvg.avg) {
-// tempExceedTimes = _tempExceedTimes
-// tempAvg = _tempAvg
-// tempMax = _tempMax
-// tempMin = _tempMin
-// }
- val dustDataResult = DustDataResult().apply {
- drSceneId = evaluationScene.scene.value?.guid
- drSceneName = evaluationScene.scene.value?.name
- drDeviceCode = deviceCode
- drTime = source?.config?.startTime
- drExceedTimes = tempExceedTimes.count
- drAvg = tempAvg.avg
- drMax = tempMax.total
- drMin = tempMin.total
- drOverAvgPer = overAvgRate(drAvg, dAvg)
- drDataNum = count(dataList)
- // 褰撴暟鎹噺涓�0鏃讹紝瓒呮湀搴﹀尯鍧囧�肩櫨鍒嗘瘮鍙樹负0
- if (drDataNum == 0) drOverAvgPer = .0
- drEffectiveRate = effectiveRate(dataList, evaluationScene)
+ if (_tempAvg.avg > tempAvg.avg) {
+ tempExceedTimes = _tempExceedTimes
+ tempAvg = _tempAvg
+ tempMax = _tempMax
+ tempMin = _tempMin
}
- //鏇存柊鍏ュ簱
- aopOutput.toDbDataResult(dustDataResult)
}
+ val dustDataResult = DustDataResult().apply {
+ drSceneId = evaluationScene.scene.value?.guid
+ drSceneName = evaluationScene.scene.value?.name
+ drDeviceCode = deviceCode
+ drTime = source?.config?.startTime
+ drExceedTimes = tempExceedTimes.count
+ drAvg = tempAvg.avg
+ drMax = tempMax.total
+ drMin = tempMin.total
+ drOverAvgPer = overAvgRate(drAvg, dAvg)
+ drDataNum = count(dataList)
+ // 褰撴暟鎹噺涓�0鏃讹紝瓒呮湀搴﹀尯鍧囧�肩櫨鍒嗘瘮鍙樹负0
+ if (drDataNum == 0) drOverAvgPer = .0
+ drEffectiveRate = effectiveRate(dataList, evaluationScene)
+ }
+ //鏇存柊鍏ュ簱
+ aopOutput.toDbDataResult(dustDataResult)
}
}
--
Gitblit v1.9.3