From 8eb584869b4fd4de0f51c93f2616f12e51df9193 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 17:48:29 +0800
Subject: [PATCH] 2025.12.18 1. 动态溯源相关分析逻辑调整； 2. 走航报告接口参数调整；
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt | 265 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 199 insertions(+), 66 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 577b38b..0483664 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
@@ -1,10 +1,12 @@
package com.flightfeather.uav.biz.sourcetrace.model
import com.flightfeather.uav.biz.FactorFilter
+import com.flightfeather.uav.biz.dataanalysis.model.ExceptionTag
import com.flightfeather.uav.biz.dataanalysis.model.ExceptionType
import com.flightfeather.uav.biz.sourcetrace.config.RTExcWindLevelConfig
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
+import com.flightfeather.uav.domain.entity.avg
import com.flightfeather.uav.lightshare.bean.DataVo
import com.flightfeather.uav.socket.eunm.FactorType
import java.util.Date
@@ -16,13 +18,78 @@
* @author feiyu02
*/
class PollutedData() {
+
+ companion object {
+ // 榛樿鏁版嵁閲囨牱鏃堕棿闂撮殧锛屽崟浣嶏細绉�
+ const val DEFAULT_PERIOD = 4
+ }
+ /**
+ * 寮傚父鏁版嵁鍒嗙粍鎯呭喌缁熻
+ */
+ inner class ExcGroup{
+ constructor(dataIndexList: List<Int>, factorType: FactorType){
+ this.dataIndexList = dataIndexList
+ this.factorType = factorType
+ val first = getFirstDataValue()?.toDouble()
+ val last = getLastDataValue()?.toDouble()
+ if (first != null && last != null) {
+ per = round((last - first) / first * 100) / 100
+ rate = round((last - first) / DEFAULT_PERIOD * 100) / 100
+ }
+ }
+ var factorType: FactorType? = null
+ /**
+ * 寮傚父鏁版嵁瀵瑰簲鍘嗗彶鏁版嵁[historyDataList]涓殑绱㈠紩鍊�
+ */
+ var dataIndexList: List<Int>? = null
+ // 鍙樺寲骞呭害
+ var per: Double? = null
+ // 鍙樺寲閫熺巼
+ var rate: Double? = null
+
+ /**
+ * 鑾峰彇寮傚父鏁版嵁鐨勭涓�涓暟鎹�
+ * !!!!绗竴涓暟鎹叾瀹炴槸棣栦釜寮傚父鏁版嵁鐨勫墠涓�涓暟鎹��!!!!
+ */
+ fun getFirstData(): BaseRealTimeData? {
+ return dataIndexList?.firstOrNull()?.let {
+ val i = if (it > 0) it - 1 else it
+ historyDataList[i].toBaseRealTimeData(BaseRealTimeData::class.java)
+ }
+ }
+ fun getFirstDataValue(): Float? {
+ return getFirstData()?.getByFactorType(factorType)
+ }
+
+ /**
+ * 鑾峰彇寮傚父鏁版嵁鐨勬渶鍚庝竴涓暟鎹�
+ */
+ fun getLastData(): BaseRealTimeData? {
+ return dataIndexList?.lastOrNull()?.let {
+ historyDataList[it].toBaseRealTimeData(BaseRealTimeData::class.java)
+ }
+ }
+ fun getLastDataValue(): Float? {
+ return getLastData()?.getByFactorType(factorType)
+ }
+ }
+
+
+ /**
+ * 鍚勭洃娴嬪洜瀛愬紓甯哥粺璁′俊鎭�
+ */
inner class Statistic(){
var factorId: Int? = null
var factorName: String? = null
var subFactorId: List<Int>? = null
var subFactorName: List<String>? = null
var selectedFactor: FactorFilter.SelectedFactor? = null
+
+ /**
+ * 寮傚父鏁版嵁瀵瑰簲鍘嗗彶鏁版嵁[historyDataList]涓殑绱㈠紩鍊�
+ */
+ var dataIndexList: List<Int>? = null
// 鍥犲瓙閲忕骇骞冲潎鍙樺寲骞呭害
var avgPer: Double? = null
@@ -32,110 +99,176 @@
var avg: Double? = null
var min: Double? = null
var max: Double? = null
+
+ var excGroup: List<ExcGroup>? = null
+
+ /**
+ * 鑾峰彇寮傚父鏁版嵁
+ */
+ fun getExceptionData(): List<BaseRealTimeData>? {
+ return dataIndexList?.map { historyDataList[it].toBaseRealTimeData(BaseRealTimeData::class.java) }
+ }
+
+ /**
+ * 鑾峰彇寮傚父鏁版嵁鍒嗘鎯呭喌
+ * 灏嗚繛缁殑寮傚父鏁版嵁鍒嗕负涓�缁�
+ */
+ fun getExceptionDataGroup(): List<List<Int>> {
+ val res = mutableListOf<MutableList<Int>>()
+ var curGroup = mutableListOf<Int>()
+ var lastIndex = -2
+ dataIndexList?.forEach {
+ if (curGroup.isEmpty()) {
+ curGroup.add(it)
+ } else if (it - lastIndex == 1) {
+ curGroup.add(it)
+ } else {
+ res.add(curGroup)
+ curGroup = mutableListOf(it)
+ }
+ lastIndex = it
+ }
+ if (curGroup.isNotEmpty()) {
+ res.add(curGroup)
+ }
+ return res
+ }
}
- constructor(
- start: BaseRealTimeData,
- end: BaseRealTimeData?,
- factorList: List<FactorFilter.SelectedFactor>,
- exceptionData: List<BaseRealTimeData>,
- historyData: List<BaseRealTimeData>,
- eType: ExceptionType,
- windLevelCondition: RTExcWindLevelConfig.WindLevelCondition?,
- ) : this() {
+ constructor(exceptions: List<Pair<FactorFilter.SelectedFactor, ExceptionTag>>, eType: ExceptionType,) : this() {
+ // 閬嶅巻鎵�鏈夌殑鍥犲瓙鐨勫紓甯革紝鏁村悎缁熶竴鐨勫紓甯哥粨鏋滐紝鍏蜂綋濡備笅
+ var startData: BaseRealTimeData? = null
+ var endData: BaseRealTimeData? = null
+ var historyData = mutableListOf<BaseRealTimeData>()
+ var _times = 0
+ exceptions.forEach { e ->
+ // 灏嗛噰鏍锋椂闂存渶鏃╃殑鏁版嵁浣滀负寮�濮嬫暟鎹�
+ if (startData == null) {
+ startData = e.second.startData
+ } else {
+ if (e.second.startData?.dataTime!! < startData!!.dataTime) {
+ startData = e.second.startData
+ }
+ }
+
+ // 灏嗛噰鏍锋椂闂存渶鏅氱殑浣滀负缁撴潫鏁版嵁
+ if (endData == null) {
+ endData = e.second.endData
+ } else {
+ if (e.second.endData?.dataTime!! > endData!!.dataTime) {
+ endData = e.second.endData
+ }
+ }
+ // 灏嗘墍鏈夊巻鍙叉暟鎹幓閲嶅悎骞�
+ if (historyData.isEmpty()) {
+ historyData = e.second.historyData
+ } else {
+ e.second.historyData.forEach {
+ if (historyData.find { d -> d.dataTime == it.dataTime } == null) {
+ historyData.add(it)
+ }
+ }
+ }
+
+ _times += e.second.exceptionData.size
+ }
+ // 鎸夌収閲囨牱鏃堕棿鍗囧簭鎺掑垪
+ historyData.sortBy { it.dataTime }
+
exception = eType.des
exceptionType = eType.value
-
- startTime = start.dataTime
- endTime = end?.dataTime
-// startData = start.getByFactorType(factor.main)
-// endData = end?.getByFactorType(factor.main) ?: startData
-// startData = start
-// endData = end
-
- windSpeed = exceptionData.first().windSpeed?.toDouble()
- times = windLevelCondition?.countLimit
-
- dataList.add(start)
- exceptionData.forEach {
- dataList.add(it)
- }
- dataVoList.addAll(dataList.map { it.toDataVo() })
+ startTime = startData?.dataTime
+ endTime = endData?.dataTime
+ windSpeed = historyData.avg().windSpeed?.toDouble()
+ times = _times
historyDataList.addAll(historyData.map { it.toDataVo() })
+ // 鍐嶆鏁村悎寮傚父鏁版嵁锛屽垎鍒绠楀悇鍥犲瓙鐨勫紓甯哥粨鏋滅粺璁�
+ exceptions.forEach {e ->
+ statisticMap[e.first.main] = Statistic().apply {
+ factorId = e.first.main.value
+ factorName = e.first.main.des
+ subFactorId = e.first.subs.map { it.value }
+ subFactorName = e.first.subs.map { it.des }
+ selectedFactor = e.first
+ dataIndexList = e.second.exceptionData.map {
+ historyDataList.indexOfFirst { d ->
+ d.time == DateUtil.instance.dateToString(it.dataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
+ }
+ }
- factorList.forEach { f->
- statisticMap[f.main] = Statistic().apply {
- factorId = f.main.value
- factorName = f.main.des
- subFactorId = f.subs.map { it.value }
- subFactorName = f.subs.map { it.des }
- selectedFactor = f
-
- avgPer = calPer(f.main)
- avgRate = calRate(f.main)
-
- val s = dataSummary(dataList, f.main)
+ val s = dataSummary(e.second.exceptionData, e.first.main)
avg = s.first
min = s.second
max = s.third
+
+ excGroup = getExceptionDataGroup().map { ExcGroup(it, e.first.main) }
+ avgPer = excGroup?.mapNotNull { it.per }?.average()
+ avgRate = excGroup?.mapNotNull { it.rate }?.average()
}
}
}
var deviceCode: String? = null
-
var exception: String? = null
var exceptionType: Int? = null
-
var startTime: Date? = null
var endTime: Date? = null
-
-// var startData: BaseRealTimeData? = null
-// var endData: BaseRealTimeData? = null
-
// 椋庨��
var windSpeed: Double? = null
-
// 鍙戠敓娆℃暟
var times: Int? = null
-
var historyDataList = mutableListOf<DataVo>()
// 寮傚父鐩戞祴鏁版嵁锛屽寘鍚崟娆″紓甯镐腑鎵�鏈夊彂鐢熶簡寮傚父鐨勬暟鎹�硷紙鍙兘涓嶆槸鏃堕棿杩炵画鐨勬暟鎹級
- var dataList: MutableList<BaseRealTimeData> = mutableListOf()
- var dataVoList: MutableList<DataVo> = mutableListOf()
-
+// var dataList: MutableList<BaseRealTimeData> = mutableListOf()
+// var dataVoList: MutableList<DataVo> = mutableListOf()
var statisticMap = mutableMapOf<FactorType, Statistic>()
+ /**
+ * 鑾峰彇鎵�鏈夊紓甯稿洜瀛愬悕绉�
+ */
fun toFactorNames(): String {
val factors = statisticMap.entries.map { it.key }.sortedBy { it.value }.joinToString(";") { it.des }
return factors
}
- private fun calPer(factorType: FactorType): Double? {
- val list = dataList
- if (list.size < 2) return null
-
- var total = .0
- for (i in 0 until list.size - 1) {
- val p = list[i].getByFactorType(factorType) ?: .0f
- val n = list[i + 1].getByFactorType(factorType) ?: .0f
- total += (n - p) / p
- }
- return total / (list.size - 1)
+ fun getExceptionAvgData(): BaseRealTimeData {
+ val exceptionDataList = statisticMap.flatMap { it.value.getExceptionData() ?: emptyList() }
+ val avgData = exceptionDataList.avg()
+ return avgData
+ }
+ /**
+ * 鑾峰彇寮傚父鏁版嵁涓績鍧愭爣锛堝紓甯告暟鎹腑缁忓害绾害鐨勫钩鍧囧�硷級
+ */
+ fun getExceptionCenter(): Pair<Double, Double>? {
+ val avgData = getExceptionAvgData()
+ val wgs84Lng = avgData.longitude?.toDouble()
+ val wgs84Lat = avgData.latitude?.toDouble()
+ return if (wgs84Lng == null || wgs84Lat == null) null else Pair(wgs84Lng, wgs84Lat)
}
- private fun calRate(factorType: FactorType): Double? {
- val list = dataList
- if (list.size < 2) return null
+ private fun calPer(exceptionData: List<BaseRealTimeData?>, factorType: FactorType): Double? {
+ if (exceptionData.size < 2) return null
var total = .0
- for (i in 0 until list.size - 1) {
- val p = list[i].getByFactorType(factorType) ?: .0f
- val n = list[i + 1].getByFactorType(factorType) ?: .0f
+ for (i in 0 until exceptionData.size - 1) {
+ val p = exceptionData[i]?.getByFactorType(factorType) ?: .0f
+ val n = exceptionData[i + 1]?.getByFactorType(factorType) ?: .0f
+ total += (n - p) / p
+ }
+ return total / (exceptionData.size - 1)
+ }
+
+ private fun calRate(exceptionData: List<BaseRealTimeData?>, factorType: FactorType): Double? {
+ if (exceptionData.size < 2) return null
+
+ var total = .0
+ for (i in 0 until exceptionData.size - 1) {
+ val p = exceptionData[i]?.getByFactorType(factorType) ?: .0f
+ val n = exceptionData[i + 1]?.getByFactorType(factorType) ?: .0f
total += (n - p) / 4
}
- return total / (list.size - 1)
+ return total / (exceptionData.size - 1)
}
private fun dataSummary(exceptionData: List<BaseRealTimeData?>, factorType: FactorType): Triple<Double, Double,
--
Gitblit v1.9.3