From d2d71a6bc8e445ee60b7be2667676138e277d676 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 六月 2024 17:41:08 +0800
Subject: [PATCH] 1. 修改走航报告自动输出模块
---
src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 1530fc2..6222166 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt
@@ -1,6 +1,7 @@
package com.flightfeather.uav.common.chart
import com.flightfeather.uav.biz.FactorFilter
+import com.flightfeather.uav.common.exception.BizException
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
import com.flightfeather.uav.socket.eunm.FactorType
@@ -12,16 +13,16 @@
*/
object DataToChartUtil {
- fun lineToByteArray(type: FactorFilter.SelectedFactor?, data: List<BaseRealTimeData>): ByteArray {
- val title = type?.main?.des ?: "鏈煡鐩戞祴鍥犲瓙"
- val seriesName = type?.main?.des ?: "鏈煡绯诲垪"
+ fun lineToByteArray(type: FactorType?, data: List<BaseRealTimeData>): ByteArray {
+ val title = type?.des ?: "鏈煡鐩戞祴鍥犲瓙"
+ val seriesName = type?.des ?: "鏈煡绯诲垪"
val dataList = data.map { d ->
ChartUtil.ChartValue(
DateUtil.instance.dateToString(d.dataTime, DateUtil.DateStyle.HH_MM_SS),
- d.getByFactorType(type?.main) ?: 0f
+ d.getByFactorType(type)?.toDouble() ?: .0
)
}
- val dataset = ChartUtil.newDataset(dataList, seriesName)
- return ChartUtil.lineToByteArray(title, dataset)
+ val dataset = ChartUtil.newDataset(dataList, seriesName) ?: throw BizException("鎶樼嚎鍥炬暟鎹泦涓虹┖")
+ return ChartUtil.lineToByteArray(title, listOf(dataset))
}
}
\ No newline at end of file
--
Gitblit v1.9.3