From 9d4ca2e7bdfc0d634b0cc27c7fbe23740f4bb398 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 15:43:30 +0800
Subject: [PATCH] 1. 新增aod数据索引，aod详细数据实体类，mapper，service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入，模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法
---
src/main/kotlin/com/flightfeather/uav/common/chart/DataToChartUtil.kt | 8 +++++---
1 files changed, 5 insertions(+), 3 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..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,5 +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
@@ -17,10 +19,10 @@
val dataList = data.map { d ->
ChartUtil.ChartValue(
DateUtil.instance.dateToString(d.dataTime, DateUtil.DateStyle.HH_MM_SS),
- d.getByFactorType(type) ?: 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