From b7b520bfe8b35683112284861f0dca8e645cbd56 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:22:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hc-satellite-data-import-1227_2'
---
src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 f1528bc..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,20 +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
*/
+@JsonInclude(JsonInclude.Include.NON_NULL)
class AirData : DataUnit() {
var factorId: String? = null
var factorName: String? = null
var sensorId: String? = null
//鐩戞祴鍥犲瓙瀹為檯鍊�
- var factorData: Long? = null
+ var factorData: Double? = null
//鐩戞祴鍥犲瓙鐗╃悊閲忥紙鐢靛帇锛�
- var physicalQuantity: Long? = 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