From 4a976d3763be8a7bed743faf24abf2718ae18e31 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 15 十月 2025 17:34:14 +0800
Subject: [PATCH] 2025.10.15 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt | 8 ++++----
1 files changed, 4 insertions(+), 4 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..5b928c4 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,11 +85,11 @@
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) {
- Thread.sleep(50)
+ Thread.sleep(100)
val address = AMapService.reGeo(MapUtil.wgs84ToGcj02(
highRiskGrid!!.cell.longitude.toDouble()
to highRiskGrid!!.cell.latitude.toDouble()
--
Gitblit v1.9.3