From ef9692dd7a43e0620632e48ef295da738da50f90 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 27 十月 2021 16:10:15 +0800
Subject: [PATCH] 1. 监测数据根据设备类型不同分别存储不同数据表 2. 车载数据部分监测因子进行量级调整 3. 无人机监测数据部分监测因子由于偏差较大采用车载数据填充 4. 监测数据存储之前先进行平滑预处理，矫正异常值
---
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