From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt | 111 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 99 insertions(+), 12 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt
index b56fb48..b51ab61 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt
@@ -49,7 +49,7 @@
.0 to 1.5,
0.2 to 0.5,
DistanceType.TYPE2,
- 1
+ 2
)
// 2 - 4绾ч
@@ -57,7 +57,7 @@
1.6 to 7.9,
0.2 to Double.MAX_VALUE,
DistanceType.TYPE3,
- 3
+ 2
// 1
)
@@ -66,7 +66,7 @@
8.0 to 13.8,
0.1 to Double.MAX_VALUE,
DistanceType.TYPE4,
- 3
+ 2
)
/****鏁版嵁蹇�熶笂鍗�*****************************************************************************/
@@ -95,6 +95,24 @@
DistanceType.TYPE1,
1
),
+ FactorType.NO to WindLevelCondition(
+ .0 to 1.5,
+ 8.0 to Double.MAX_VALUE,
+ DistanceType.TYPE1,
+ 4
+ ),
+ FactorType.NO2 to WindLevelCondition(
+ .0 to 1.5,
+ 4.0 to Double.MAX_VALUE,
+ DistanceType.TYPE1,
+ 4
+ ),
+ FactorType.CO to WindLevelCondition(
+ .0 to 1.5,
+ 10.0 to Double.MAX_VALUE,
+ DistanceType.TYPE1,
+ 5
+ ),
)
// 鍦ㄩ閫熷浜�1.6 - 7.9 m/s 涔嬮棿鏃�
var changeRateUp2 = mutableMapOf(
@@ -103,14 +121,14 @@
1.6 to 7.9,
4.0 to Double.MAX_VALUE,
DistanceType.TYPE3,
- 3
+ 2
),
// PM10鍦ㄤ竴涓洃娴嬪懆鏈燂紙4绉掞級涓婂崌閲忕骇澶т簬绛変簬4渭g/m鲁锛岃繛缁彂鐢�3娆�
FactorType.PM10 to WindLevelCondition(
1.6 to 7.9,
4.0 to Double.MAX_VALUE,
DistanceType.TYPE3,
- 3
+ 2
),
// VOC鍦ㄤ竴涓洃娴嬪懆鏈燂紙4绉掞級涓婂崌閲忕骇澶т簬绛変簬6渭g/m鲁锛岃繛缁彂鐢�1娆�
FactorType.VOC to WindLevelCondition(
@@ -118,6 +136,24 @@
6.0 to Double.MAX_VALUE,
DistanceType.TYPE3,
1
+ ),
+ FactorType.NO to WindLevelCondition(
+ 1.6 to 7.9,
+ 8.0 to Double.MAX_VALUE,
+ DistanceType.TYPE3,
+ 4
+ ),
+ FactorType.NO2 to WindLevelCondition(
+ 1.6 to 7.9,
+ 4.0 to Double.MAX_VALUE,
+ DistanceType.TYPE3,
+ 4
+ ),
+ FactorType.CO to WindLevelCondition(
+ 1.6 to 7.9,
+ 10.0 to Double.MAX_VALUE,
+ DistanceType.TYPE3,
+ 5
),
)
// 鍦ㄩ閫熷浜�8.0 - 13.8 m/s 涔嬮棿鏃�
@@ -127,14 +163,14 @@
8.0 to 13.8,
4.0 to Double.MAX_VALUE,
DistanceType.TYPE4,
- 3
+ 2
),
// PM10鍦ㄤ竴涓洃娴嬪懆鏈燂紙4绉掞級涓婂崌閲忕骇澶т簬绛変簬4渭g/m鲁锛岃繛缁彂鐢�3娆�
FactorType.PM10 to WindLevelCondition(
8.0 to 13.8,
4.0 to Double.MAX_VALUE,
DistanceType.TYPE4,
- 3
+ 2
),
// VOC鍦ㄤ竴涓洃娴嬪懆鏈燂紙4绉掞級涓婂崌閲忕骇澶т簬绛変簬6渭g/m鲁锛岃繛缁彂鐢�1娆�
FactorType.VOC to WindLevelCondition(
@@ -142,6 +178,24 @@
6.0 to Double.MAX_VALUE,
DistanceType.TYPE4,
1
+ ),
+ FactorType.NO to WindLevelCondition(
+ 8.0 to 13.8,
+ 8.0 to Double.MAX_VALUE,
+ DistanceType.TYPE4,
+ 4
+ ),
+ FactorType.NO2 to WindLevelCondition(
+ 8.0 to 13.8,
+ 4.0 to Double.MAX_VALUE,
+ DistanceType.TYPE4,
+ 4
+ ),
+ FactorType.CO to WindLevelCondition(
+ 8.0 to 13.8,
+ 10.0 to Double.MAX_VALUE,
+ DistanceType.TYPE4,
+ 5
),
)
@@ -168,6 +222,24 @@
DistanceType.TYPE1,
3
),
+ FactorType.NO to WindLevelCondition(
+ .0 to Double.MAX_VALUE,
+ -Double.MAX_VALUE to -6.0,
+ DistanceType.TYPE1,
+ 4
+ ),
+ FactorType.NO2 to WindLevelCondition(
+ .0 to Double.MAX_VALUE,
+ -Double.MAX_VALUE to -2.0,
+ DistanceType.TYPE1,
+ 4
+ ),
+ FactorType.CO to WindLevelCondition(
+ .0 to Double.MAX_VALUE,
+ -Double.MAX_VALUE to -10.0,
+ DistanceType.TYPE1,
+ 5
+ ),
)
/****鏁版嵁鏈変笂鍗囪秼鍔挎彁閱�*****************************************************************************/
@@ -177,21 +249,36 @@
.0 to Double.MAX_VALUE,
2.0 to 4.0,
DistanceType.TYPE1,
- 3
+ 2
),
// PM10鍦ㄤ竴涓洃娴嬪懆鏈燂紙4绉掞級涓婂崌閲忕骇鍦�2 - 4渭g/m鲁涔嬮棿锛岃繛缁彂鐢�3娆�
FactorType.PM10 to WindLevelCondition(
.0 to Double.MAX_VALUE,
- 2.0 to 4.0,
+ 4.0 to 8.0,
DistanceType.TYPE1,
- 3
+ 4
),
// VOC鍦ㄤ竴涓洃娴嬪懆鏈燂紙4绉掞級涓婂崌閲忕骇鍦�3 - 6渭g/m鲁涔嬮棿锛岃繛缁彂鐢�2娆�
FactorType.VOC to WindLevelCondition(
.0 to Double.MAX_VALUE,
- 3.0 to 6.0,
+ 2.0 to 4.0,
DistanceType.TYPE1,
- 2
+ 4
+ ),
+ FactorType.CO to WindLevelCondition(
+ .0 to Double.MAX_VALUE,
+ 5.0 to 10.0,
+ DistanceType.TYPE1,
+ 5
),
)
+
+ /****婊戝姩骞冲潎鍊煎紓甯�*****************************************************************************/
+ // 姹傛粦鍔ㄥ钩鍧囧�肩殑鏁版嵁缁勪釜鏁�
+ var changeTrendGroup = 12
+ // 婊戝姩骞冲潎鍊艰繛缁�
+ var changeTrendInterval = 12
+ var changeTrendRate = .2
+ // 婊戝姩骞冲潎鍊煎彉鍖栫巼寮傚父杩炵画娆℃暟
+ var changeTrendTimes = 3
}
\ No newline at end of file
--
Gitblit v1.9.3