From 698f8f0f22af4c66581ce284407e986ca036aec6 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 23 一月 2025 17:10:26 +0800
Subject: [PATCH] 1. 网格细分逻辑(编写中)

---
 src/main/kotlin/com/flightfeather/uav/socket/bean/AirData.kt |   25 +++++++++++++++++++++++--
 1 files changed, 23 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 879adc9..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,14 +1,35 @@
 package com.flightfeather.uav.socket.bean
 
-import java.util.*
+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