From 3bb4fb15c664d29d179083698fdad35a661b1d7f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 28 八月 2025 14:57:40 +0800
Subject: [PATCH] 2025.8.28 1. 添加走航季度报告相关统计功能（待完成）
---
src/main/kotlin/com/flightfeather/uav/model/epw/EPWDataPrep.kt | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/model/epw/EPWDataPrep.kt b/src/main/kotlin/com/flightfeather/uav/model/epw/EPWDataPrep.kt
index c17296d..45f9b80 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/epw/EPWDataPrep.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/epw/EPWDataPrep.kt
@@ -29,10 +29,7 @@
// 鍧囧�煎�嶆暟鍙傛暟
private val xratio = 3
- // 杩炵画鏁版嵁鐨勫悎鐞嗘渶澶у闀垮�嶇巼
- private val multiplier = 20
-
- // 闇�瑕佸鐞嗙殑鍥犲瓙绫诲瀷
+ // 闇�瑕佸钩婊戝鐞嗙殑鍥犲瓙绫诲瀷
private var calTypes = when (deviceType) {
UWDeviceType.VEHICLE,
UWDeviceType.UAV,
@@ -41,6 +38,25 @@
UWDeviceType.GRID -> WeightType.prepFixed
else -> WeightType.prepFixed
}
+
+ // 鍙渶瑕佹鏌ヨ寖鍥村拰鍙樺寲骞呭害鐨勫洜瀛愮被鍨�
+ private var rangeTypes = listOf(
+ FactorType.PM25.des,
+ FactorType.PM10.des,
+ FactorType.VOC.des
+ )
+
+ // 鏃犻渶淇鐨勫洜瀛愮被鍨�
+ private var noCalTypes = listOf(
+ FactorType.TEMPERATURE.des,
+ FactorType.HUMIDITY.des,
+ FactorType.LNG.des,
+ FactorType.LAT.des,
+ FactorType.VELOCITY.des,
+ FactorType.TIME.des,
+ FactorType.WIND_DIRECTION.des,
+ FactorType.HEIGHT.des
+ )
private val lastData = mutableListOf<DataVo>()
@@ -66,7 +82,7 @@
val it = mDataList[i].values?.get(y) ?: continue
if (!calTypes.contains(it.factorName)) continue
- val vMax = FactorType.getVMax(it.factorName) ?: continue
+ val vMax = FactorType.getVMin(it.factorName) ?: continue
it.factorData ?: continue
if (it.factorData!! > vMax) {
@@ -134,7 +150,7 @@
while (i < mDataList.size) {
for (y in mDataList[i].values?.indices ?: 0..0) {
val it = mDataList[i].values?.get(y) ?: continue
- val vMax = FactorType.getVMax(it.factorName) ?: continue
+ val vMax = FactorType.getVMin(it.factorName) ?: continue
it.factorData ?: continue
if (it.factorData!! > vMax) {
@@ -151,26 +167,27 @@
// 鍘婚櫎鏃犳晥鍊肩殑鏍囧噯宸�
val std = standardDeviation(avg.first, list, it.factorName)
// 鍚堢悊鏈�澶у��
- val max = max(avg.first + std * nstd, avg.first + avg.first * xratio)
+ var maxValue = max(avg.first + std * nstd, avg.first + avg.first * xratio)
+ maxValue = max(maxValue, FactorType.getRange(it.factorName)?.second ?: .0)
// 鍚堢悊鏈�灏忓��
- val min = min(avg.first - std * nstd, avg.first / (1 + xratio))
+ val minValue = min(avg.first - std * nstd, avg.first / (1 + xratio))
// 鍒ゆ柇鐩戞祴鍥犲瓙鏄惁闇�瑕佽繘琛屽钩婊戝鐞嗭紝
- // 鑻ヤ笉闇�瑕侊紝鍒欏垽鏂噺绾ф槸鍚﹀湪鍚堢悊鑼冨洿鍐呬互鍙婂彉鍖栧�嶇巼鏄惁鍦ㄥ悎鐞嗚寖鍥村唴
- if (!calTypes.contains(it.factorName)) {
- if (isInRange(it) != true || excessiveChange(it) == true) {
- // 閲囩敤璁＄畻鎵�寰楀潎鍊间唬鏇垮師濮嬪��
- it.factorData = avg.first
- }
- } else {
+ if (calTypes.contains(it.factorName)) {
// 鏁版嵁涓嶅浜庡悎鐞嗚寖鍥村苟涓旀湁鏁堜釜鏁拌揪鏍囨椂锛岄噰鐢ㄨ绠楁墍寰楀潎鍊间唬鏇垮師濮嬪��
if (avg.second > max(ncal / 5, 2)
- && (it.factorData!! < min || it.factorData!! > max)
+ && (it.factorData!! < minValue || it.factorData!! > maxValue)
) {
it.factorData = avg.first
}
}
-
+ // 鍒ゆ柇閲忕骇鏄惁鍦ㄥ悎鐞嗚寖鍥村唴浠ュ強鍙樺寲鍊嶇巼鏄惁鍦ㄥ悎鐞嗚寖鍥村唴
+ else if (rangeTypes.contains(it.factorName)) {
+ if (isInRange(it) != true || excessiveChange(it) == true) {
+ // 閲囩敤璁＄畻鎵�寰楀潎鍊间唬鏇垮師濮嬪��
+ it.factorData = avg.first
+ }
+ }
}
}
}
@@ -289,6 +306,6 @@
break
}
}
- return m > multiplier
+ return m > FactorType.getMultiplier(airData.factorName)
}
}
\ No newline at end of file
--
Gitblit v1.9.3