From db447bb757b51f8d03e62d6ae4f183b4608723ef Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 07 三月 2025 17:10:43 +0800
Subject: [PATCH] 卫星遥测系统相关接口新增及调整
---
src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteGridManage.kt | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteGridManage.kt b/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteGridManage.kt
index 36c85c7..bea89eb 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteGridManage.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteGridManage.kt
@@ -229,7 +229,7 @@
*/
fun dataFusion(
realTimeDataList: List<BaseRealTimeData>,
- gridData: GridData,
+ gridData: GridData?,
gridCellList: List<GridCell?>,
): List<GridDataDetail> {
// 閬嶅巻璧拌埅鐩戞祴鏁版嵁锛岃绠楁瘡涓偣鎵�鍦ㄧ綉鏍�
@@ -251,7 +251,7 @@
dataMap.forEach { (k, v) ->
val avgData = v.avg()
val dataDetail = GridDataDetail().apply {
- dataId = gridData.id
+ dataId = gridData?.id
groupId = k.groupId
cellId = k.cellIndex
pm25 = avgData.pm25
@@ -260,6 +260,12 @@
gridDataDetailList.add(dataDetail)
}
+ gridDataDetailList.sortBy { it.pm25 }
+ gridDataDetailList.forEachIndexed { index, d ->
+ d.rank = index + 1
+ }
+ gridDataDetailList.sortBy { it.cellId }
+
return gridDataDetailList
}
--
Gitblit v1.9.3