From e8f935a01d75c89ac591a80b9318eac2480e2dcd Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 27 六月 2024 17:40:01 +0800
Subject: [PATCH] 1. 新增走航轨迹融合功能
---
src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt b/src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt
index 2170aa9..1530fc2 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt
@@ -1,5 +1,6 @@
package com.flightfeather.uav.common.chart
+import com.flightfeather.uav.biz.FactorFilter
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
import com.flightfeather.uav.socket.eunm.FactorType
@@ -11,13 +12,13 @@
*/
object DataToChartUtil {
- fun lineToByteArray(type: FactorType?, data: List<BaseRealTimeData>): ByteArray {
- val title = type?.des ?: "鏈煡鐩戞祴鍥犲瓙"
- val seriesName = type?.des ?: "鏈煡绯诲垪"
+ fun lineToByteArray(type: FactorFilter.SelectedFactor?, data: List<BaseRealTimeData>): ByteArray {
+ val title = type?.main?.des ?: "鏈煡鐩戞祴鍥犲瓙"
+ val seriesName = type?.main?.des ?: "鏈煡绯诲垪"
val dataList = data.map { d ->
ChartUtil.ChartValue(
DateUtil.instance.dateToString(d.dataTime, DateUtil.DateStyle.HH_MM_SS),
- d.getByFactorType(type) ?: 0f
+ d.getByFactorType(type?.main) ?: 0f
)
}
val dataset = ChartUtil.newDataset(dataList, seriesName)
--
Gitblit v1.9.3