From 29383149f7040d89ae00ad48dc48bbcf46587946 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 01 九月 2025 17:32:53 +0800
Subject: [PATCH] 2025.9.1 1. 新增走航任务统计功能（待完成）
---
src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt b/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
index 3589b05..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
}
@@ -35,12 +40,59 @@
companion object{
fun builder() = FactorFilter().Builder()
- fun default() = builder().create()
+ fun default() = builder()
+ .withMain(FactorType.VOC)
+ .withSubs(listOf(
+// FactorType.H2S,
+ FactorType.O3,
+ FactorType.PM25,
+ FactorType.PM10,
+ ))
+// .withMain(FactorType.H2S)
+// .withSubs(listOf(
+// FactorType.VOC,
+// FactorType.O3,
+// FactorType.PM25,
+// ))
+ .withMain(FactorType.O3)
+ .withSubs(listOf(
+ FactorType.VOC,
+// FactorType.H2S,
+ FactorType.PM25,
+ FactorType.PM10,
+ ))
+ .withMain(FactorType.PM25)
+ .withSubs(listOf(
+ FactorType.VOC,
+// FactorType.H2S,
+ FactorType.O3,
+ FactorType.PM10,
+ ))
+ .withMain(FactorType.PM10)
+ .withSubs(listOf(
+ FactorType.VOC,
+// FactorType.H2S,
+ FactorType.O3,
+ FactorType.PM25,
+ ))
+// .withSubs(listOf(
+// FactorType.NO2,
+// FactorType.CO,
+// FactorType.SO2,
+// FactorType.O3,
+// FactorType.PM25,
+// FactorType.PM10,
+// FactorType.VOC
+// ))
+ .create()
}
// 鎵�閫夊洜瀛愰泦鍚�
val selectedList = mutableListOf<SelectedFactor>()
+ // 鍥犲瓙鐨勫叧鑱斿叧绯�
+ val combination = mutableListOf<List<FactorType>>()
+
fun mainList(): List<FactorType> {
return selectedList.map { it.main }
}
--
Gitblit v1.9.3