From 0412a0125f484282c28d76905ca1f6397014b982 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期一, 30 十二月 2024 14:32:48 +0800 Subject: [PATCH] 1. 测试部分新增数据后期调整代码(一次性) 2. 优化走航路径自动归集路段功能 --- 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