From 94fee0b511279679b43e210878d3d36e5a14384b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 30 九月 2025 09:14:10 +0800
Subject: [PATCH] 2025.9.30 1. 新增走航任务统计功能
---
src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt b/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
index 080d087..b227bc4 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
@@ -28,6 +28,11 @@
return this
}
+ fun withCombination(com: List<List<FactorType>>):Builder{
+ combination.addAll(com)
+ return this
+ }
+
fun create(): FactorFilter {
return this@FactorFilter
}
@@ -38,27 +43,37 @@
fun default() = builder()
.withMain(FactorType.VOC)
.withSubs(listOf(
- FactorType.H2S,
+// FactorType.H2S,
FactorType.O3,
FactorType.PM25,
+ FactorType.PM10,
))
- .withMain(FactorType.H2S)
- .withSubs(listOf(
- FactorType.VOC,
- FactorType.O3,
- FactorType.PM25,
- ))
+// .withMain(FactorType.H2S)
+// .withSubs(listOf(
+// FactorType.VOC,
+// FactorType.O3,
+// FactorType.PM25,
+// ))
.withMain(FactorType.O3)
.withSubs(listOf(
FactorType.VOC,
- FactorType.H2S,
+// FactorType.H2S,
FactorType.PM25,
+ FactorType.PM10,
))
.withMain(FactorType.PM25)
.withSubs(listOf(
FactorType.VOC,
- FactorType.H2S,
+// FactorType.H2S,
FactorType.O3,
+ FactorType.PM10,
+ ))
+ .withMain(FactorType.PM10)
+ .withSubs(listOf(
+ FactorType.VOC,
+// FactorType.H2S,
+ FactorType.O3,
+ FactorType.PM25,
))
// .withSubs(listOf(
// FactorType.NO2,
@@ -75,6 +90,9 @@
// 鎵�閫夊洜瀛愰泦鍚�
val selectedList = mutableListOf<SelectedFactor>()
+ // 鍥犲瓙鐨勫叧鑱斿叧绯�
+ val combination = mutableListOf<List<FactorType>>()
+
fun mainList(): List<FactorType> {
return selectedList.map { it.main }
}
--
Gitblit v1.9.3