From 532e6ccc42a1958f8bfc9ffe93eb79382303458d Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 11:32:21 +0800
Subject: [PATCH] 1. 新增aod数据索引,aod详细数据实体类,mapper,service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入,模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法

---
 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