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/AirDataPackage.kt | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/bean/AirDataPackage.kt b/src/main/kotlin/com/flightfeather/uav/socket/bean/AirDataPackage.kt
index 08b425f..5aaf563 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/bean/AirDataPackage.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/bean/AirDataPackage.kt
@@ -1,6 +1,10 @@
package com.flightfeather.uav.socket.bean
+import com.flightfeather.uav.common.utils.DateUtil
+import com.flightfeather.uav.lightshare.bean.DataVo
import com.flightfeather.uav.socket.eunm.AirCommandUnit
+import com.flightfeather.uav.socket.eunm.FactorType
+import java.text.SimpleDateFormat
import java.util.*
/**
@@ -33,12 +37,34 @@
//鏁版嵁涓殑淇濈暀瀛楄妭鏁�
const val RESERVED_DATA_COUNT = 12
- //涓�涓姩鎬佺洃娴嬪洜瀛愮殑灞炴�ф墍鍗犲瓧鑺傛暟
+ //鍔ㄦ�佺洃娴嬪洜瀛愭墍鍗犲瓧鑺傛暟,涓嶅悓浣嶆暟瀵瑰簲涓嶅悓鐨勭粍鍚堢瓥鐣�
const val FACTOR_BIT_LENGTH_1 = 6
-
- //涓�涓繚鐣欑洃娴嬪洜瀛愮殑灞炴�ф墍鍗犲瓧鑺傛暟
const val FACTOR_BIT_LENGTH_2 = 3
-
const val FACTOR_BIT_LENGTH_3 = 2
}
+
+ fun toDataVo()= DataVo().apply {
+ this.time = DateUtil.instance.dateToString(dataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS)
+ this.deviceCode = this@AirDataPackage.deviceCode
+ val tempList = mutableListOf<AirData>()
+ this@AirDataPackage.dataUnit.forEach {
+ if (it is AirData) {
+ when (it.factorId?.toInt()) {
+ FactorType.LAT.value -> {
+ this.lat = it.factorData
+ }
+ FactorType.LNG.value -> {
+ this.lng = it.factorData
+ }
+ FactorType.TIME.value -> {
+ it.statusList?.takeIf {l-> l.isNotEmpty() }?.get(0)?.let {d ->
+ this.time = d
+ }
+ }
+ }
+ tempList.add(it)
+ }
+ }
+ this.values = tempList
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3