From 532e6ccc42a1958f8bfc9ffe93eb79382303458d Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 11:32:21 +0800
Subject: [PATCH] 1. 新增aod数据索引，aod详细数据实体类，mapper，service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入，模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法
---
src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionAnalysis.kt | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionAnalysis.kt b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionAnalysis.kt
index 139166f..4023fec 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionAnalysis.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/dataanalysis/BaseExceptionAnalysis.kt
@@ -6,6 +6,7 @@
import com.flightfeather.uav.biz.dataanalysis.model.ExceptionType
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
+import com.flightfeather.uav.domain.entity.avg
import com.flightfeather.uav.socket.eunm.FactorType
import java.time.Duration
@@ -49,11 +50,18 @@
subFactorId = factor.subs.map { it.value }
subFactorName = factor.subs.map { it.des }
selectedFactor = factor
+ startDate = start.dataTime
+ endDate = end?.dataTime
startTime = DateUtil.instance.dateToString(start.dataTime, DateUtil.DateStyle.HH_MM_SS)
endTime = DateUtil.instance.dateToString(end?.dataTime, DateUtil.DateStyle.HH_MM_SS) ?: startTime
startData = start.getByFactorType(factor.main)
endData = end?.getByFactorType(factor.main) ?: startData
+ val avgData = exceptionData.avg()
+ // 姹傚彇姹℃煋鏁版嵁鐨勪腑蹇冨潗鏍�
+ longitude = avgData.longitude
+ latitude = avgData.latitude
+ // 姹傚彇涓绘薄鏌撳洜瀛愮殑鍧囧�煎拰鑼冨洿
val s = dataSummary(exceptionData, factor.main)
avg = s.first
min = s.second
@@ -63,7 +71,7 @@
}
}
- fun dataSummary(exceptionData: List<BaseRealTimeData?>, factorType: FactorType): Triple<Float, Float, Float> {
+ private fun dataSummary(exceptionData: List<BaseRealTimeData?>, factorType: FactorType): Triple<Float, Float, Float> {
var min = -1f
var max = -1f
var total = 0f
--
Gitblit v1.9.3