From 538ba7a3bbc682f4537f1dd34f93feb2cf56b08e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 14 十月 2025 17:32:04 +0800
Subject: [PATCH] 2025.10.14 1. 新增数据统计颗粒度选项，可选秒级数据、分钟数据进行数据统计 2. 典型隐患区域统计新增按照污染溯源区域进行分类统计的功能
---
src/main/kotlin/com/flightfeather/uav/socket/bean/AirDataPackage.kt | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 e45b25e..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.*
/**
@@ -38,4 +42,29 @@
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