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/socket/bean/AirData.kt | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt b/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt
index c51473c..0fffb10 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt
@@ -1,15 +1,35 @@
package com.flightfeather.uav.socket.bean
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.flightfeather.uav.socket.eunm.FactorType
+import kotlin.math.round
+
/**
* @author riku
* Date: 2020/6/10
*/
-class AirData:DataUnit(){
+@JsonInclude(JsonInclude.Include.NON_NULL)
+class AirData : DataUnit() {
var factorId: String? = null
var factorName: String? = null
var sensorId: String? = null
+
//鐩戞祴鍥犲瓙瀹為檯鍊�
var factorData: Double? = null
+
//鐩戞祴鍥犲瓙鐗╃悊閲忥紙鐢靛帇锛�
var physicalQuantity: Double? = null
+
+ //鐘舵�佷綅
+ var statusList: List<String>? = null
+
+ fun setData(factorType: FactorType, value: Float?) {
+ setData(factorType, round(value?.toDouble()?.times(1000) ?: .0) / 1000)
+ }
+
+ fun setData(factorType: FactorType, value: Double?) {
+ factorId = factorType.value.toString()
+ factorName = factorType.des
+ factorData = value
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3