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/dataanalysis/model/ExceptionSetting.kt | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/model/ExceptionSetting.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/model/ExceptionSetting.kt
index ab7193e..021ed20 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/model/ExceptionSetting.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/model/ExceptionSetting.kt
@@ -1,5 +1,7 @@
package com.flightfeather.uav.biz.dataanalysis.model
+import com.flightfeather.uav.socket.eunm.FactorType
+
/**
* 璧拌埅鏁版嵁寮傚父鏍囧噯
*/
@@ -28,4 +30,28 @@
else -> null
}
}
+
+ fun getByFactorType(factorType: FactorType): Float? {
+ return when (factorType) {
+ FactorType.NO2 -> no2
+ FactorType.CO -> co
+ FactorType.H2S -> h2s
+ FactorType.SO2 -> so2
+ FactorType.O3 -> o3
+ FactorType.PM25 -> pm25
+ FactorType.PM10 -> pm10
+// FactorType.TEMPERATURE -> temperature
+// FactorType.HUMIDITY -> humidity
+ FactorType.VOC -> voc
+// FactorType.NOI -> noi
+// FactorType.LNG -> longitude?.toFloat()
+// FactorType.LAT -> latitude?.toFloat()
+// FactorType.VELOCITY -> velocity
+// FactorType.TIME -> noi
+// FactorType.WIND_SPEED -> windSpeed
+// FactorType.WIND_DIRECTION -> windDirection
+// FactorType.HEIGHT -> height
+ else -> null
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3