From 37d47c6a7ab0f454b948b68c987146b261117993 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期日, 13 七月 2025 22:47:21 +0800
Subject: [PATCH] 2025.7.13 动态溯源逻辑调整
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt
index 5661859..e38d254 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt
@@ -6,6 +6,9 @@
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
import com.flightfeather.uav.lightshare.bean.DataVo
+import com.flightfeather.uav.socket.eunm.FactorType
+import java.util.Date
+import kotlin.math.round
/**
* 姹℃煋鏁版嵁
@@ -40,8 +43,8 @@
subFactorName = factor.subs.map { it.des }
selectedFactor = factor
- startTime = DateUtil.instance.dateToString(start.dataTime, DateUtil.DateStyle.HH_MM_SS)
- endTime = DateUtil.instance.dateToString(end?.dataTime, DateUtil.DateStyle.HH_MM_SS) ?: startTime
+ startTime = start.dataTime
+ endTime = end?.dataTime
// startData = start.getByFactorType(factor.main)
// endData = end?.getByFactorType(factor.main) ?: startData
startData = start
@@ -60,6 +63,11 @@
calPer()
calRate()
+
+ val s = dataSummary(exceptionData, factor.main)
+ avg = s.first
+ min = s.second
+ max = s.third
}
var deviceCode: String? = null
@@ -73,8 +81,8 @@
var subFactorName: List<String>? = null
var selectedFactor: FactorFilter.SelectedFactor? = null
- var startTime: String? = null
- var endTime: String? = null
+ var startTime: Date? = null
+ var endTime: Date? = null
var startData: BaseRealTimeData? = null
var endData: BaseRealTimeData? = null
@@ -88,6 +96,10 @@
var avgPer: Double? = null
// 鍥犲瓙閲忕骇骞冲潎鍙樺寲閫熺巼
var avgRate: Double? = null
+
+ var avg: Double? = null
+ var min: Double? = null
+ var max: Double? = null
// 鍙戠敓娆℃暟
var times: Int? = null
@@ -126,4 +138,25 @@
}
avgRate = total / (list.size - 1)
}
+
+ private fun dataSummary(exceptionData: List<BaseRealTimeData?>, factorType: FactorType): Triple<Double, Double,
+ Double> {
+ var min = -1.0
+ var max = -1.0
+ var total = .0
+ var count = 0
+ exceptionData.forEach {
+ val value = it?.getByFactorType(factorType)?.toDouble() ?: return@forEach
+ if (min == -1.0 || min > value) {
+ min = round(value * 1000) / 1000
+ }
+ if (max == -1.0 || max < value) {
+ max = round(value * 1000) / 1000
+ }
+ total += value
+ count++
+ }
+ val avg = if (count == 0) .0 else round(total / count * 1000) / 1000
+ return Triple(avg, min, max)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3