From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 17 一月 2025 16:15:43 +0800
Subject: [PATCH] 1. 修改融合数据逻辑中，融合数据id数组为先排序后转换为字符串，修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题；
---
src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt b/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
index 46d5633..eb613f4 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/ExpandFun.kt
@@ -2,6 +2,7 @@
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.common.utils.GsonUtils
+import com.flightfeather.uav.lightshare.bean.DataVo
import com.flightfeather.uav.socket.bean.AirData
import com.flightfeather.uav.socket.eunm.FactorType
@@ -49,6 +50,13 @@
return row.toTypedArray()
}
+fun RealTimeData.toDataVo() = DataVo(
+ DateUtil.instance.dateToString(dataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS),
+ deviceCode,
+ GsonUtils.parserJsonToArrayBeans(factors, AirData::class.java),
+ longitude?.toDouble(), latitude?.toDouble()
+)
+
fun ElectricMinuteValue.toAirData(): List<AirData> {
return listOf(
AirData().apply {
--
Gitblit v1.9.3