From 61871594dfa0a5ac2c4d895d9ec4034feba57094 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 12 九月 2025 17:20:53 +0800
Subject: [PATCH] 2025.9.5 1. 新增走航任务统计功能

---
 src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt
index 4bebc3f..a274fae 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt
@@ -23,7 +23,7 @@
     class GridFusionByAQI {
         var pollutionDegree: String? = null
         var gridLen:Int? = null
-        var missionList: MutableList<MissionInventory.MissionDetail> = mutableListOf()
+        var missionList: MutableList<MissionInventory.MissionInfo> = mutableListOf()
         var gridFusionList: MutableList<FusionGrid> = mutableListOf()
         var highRiskGridList: MutableList<HighRiskGridByFactor> = mutableListOf()
     }
@@ -70,7 +70,7 @@
         factorTypes: List<FactorType>,
         gridLen: Int,
         gridCells: List<GridCell>,
-        dataList: List<Triple<PollutionDegree, List<MissionInventory.MissionDetail>, List<GridDataDetailMixVo>>>,
+        dataList: List<Triple<PollutionDegree, List<MissionInventory.MissionInfo>, List<GridDataDetailMixVo>>>,
     ): List<GridFusionByAQI> {
         return dataList.map {
             GridFusionByAQI().apply {
@@ -85,7 +85,7 @@
                 highRiskGridList.addAll(factorTypes.map { f->
                     HighRiskGridByFactor().apply {
                         factorType = f
-                        highRiskGrid = gridFusionList.sortedBy { gf->gf.data.rank }.firstOrNull()
+                        highRiskGrid = gridFusionList.maxByOrNull { gf->gf.data.getByFactorType(f) ?: 0f }
                         if (highRiskGrid != null) {
                             factorValue = highRiskGrid!!.data.getByFactorType(f)
                             if (highRiskGrid!!.cell.longitude != null && highRiskGrid!!.cell.latitude != null) {

--
Gitblit v1.9.3