From 0f7b47105d80fb9a260486270cf925a232e74791 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期一, 22 十二月 2025 21:20:13 +0800
Subject: [PATCH] 2025.12.22 1. 修改日任务统计接口，新增当天内整改问题数和48小时内整改问题数统计
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/dataanalysis/AopDataAnalysis.kt | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 2e3e308..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
@@ -74,8 +74,14 @@
var tempAvg = TempResult()
var tempMax = TempResult()
var tempMin = TempResult()
+ var deviceCode: String? = null
dataList.forEach {
- // 鐩戞祴鐐规湁澶氬彴璁惧鏃讹紝姣忓彴璁惧鍗曠嫭缁熻锛屽彇鍧囧�兼渶楂樼殑涓虹粺璁＄粨鏋�
+ // 鐩戞祴鐐规湁澶氬彴璁惧鏃讹紝姣忓彴璁惧鍗曠嫭璁板綍
+ deviceCode = if (it.isNotEmpty()) {
+ getDeviceCode(it[0])
+ } else {
+ null
+ }
val _tempExceedTimes = TempResult()
val _tempAvg = TempResult()
val _tempMax = TempResult()
@@ -99,6 +105,7 @@
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
@@ -106,6 +113,8 @@
drMin = tempMin.total
drOverAvgPer = overAvgRate(drAvg, dAvg)
drDataNum = count(dataList)
+ // 褰撴暟鎹噺涓�0鏃讹紝瓒呮湀搴﹀尯鍧囧�肩櫨鍒嗘瘮鍙樹负0
+ if (drDataNum == 0) drOverAvgPer = .0
drEffectiveRate = effectiveRate(dataList, evaluationScene)
}
//鏇存柊鍏ュ簱
@@ -120,6 +129,11 @@
abstract fun districtAvg(source: AopDataSource?): Double?
/**
+ * 鑾峰彇璁惧缂栧彿
+ */
+ abstract fun getDeviceCode(data: T?): String?
+
+ /**
* 鑾峰彇鍘熷鐩戞祴鏁版嵁
*/
abstract fun fetchDataResources(evaluationScene: AopDataSource.EvaluationScene): List<List<T?>>
--
Gitblit v1.9.3