From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 17 一月 2025 16:15:43 +0800
Subject: [PATCH] 1. 修改融合数据逻辑中，融合数据id数组为先排序后转换为字符串，修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题；
---
src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt | 28 +++++++++++++++++++---------
1 files changed, 19 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..6a34992 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
@@ -38,27 +38,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,
--
Gitblit v1.9.3