From 9c797fa0d704ef8ffb65cd1716b8eb694b4c46c3 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 04 七月 2025 17:28:00 +0800
Subject: [PATCH] 2025.7.4 1. 新增动态污染溯源新的判定逻辑

---
 src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt
index d858605..de35772 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt
@@ -1,6 +1,7 @@
 package com.flightfeather.uav.lightshare.service
 
 import com.flightfeather.uav.domain.entity.GridCell
+import com.flightfeather.uav.domain.entity.GridData
 import com.flightfeather.uav.domain.entity.GridDataDetail
 import com.flightfeather.uav.lightshare.bean.GridDataDetailMixVo
 
@@ -33,10 +34,9 @@
 
     /**
      * 灏嗚蛋鑸洃娴嬫暟鎹拰鍗槦缃戞牸杩涜铻嶅悎璁$畻
-     * @param missionCode
-     * @param groupId
+     * @param gridData
      */
-    fun dataFusion(missionCode: String, groupId: Int): List<GridDataDetail?>
+    fun dataFusion(gridData: GridData): List<GridDataDetail?>
 
     /**
      * 璧拌埅鏁版嵁铻嶅悎
@@ -44,7 +44,7 @@
      * @param dataIdList 铻嶅悎鐨勬暟鎹甶d绱㈠紩鏁扮粍
      */
     // Fixme 2025.3.28: 闇�瑕佸拰[SatelliteTelemetryService.mixGridData]鍑芥暟鍚堝苟
-    fun mixGridData(groupId: Int, dataIdList: List<Int>): List<GridDataDetailMixVo>
+    fun mixUnderwayGridData(groupId: Int, dataIdList: List<Int>): List<GridDataDetailMixVo>
 
     /**
      * 灏嗚蛋鑸綉鏍兼暟鎹敓鎴愬搴旂殑鐑姏缃戞牸鍥�

--
Gitblit v1.9.3