From 3bb4fb15c664d29d179083698fdad35a661b1d7f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 28 八月 2025 14:57:40 +0800
Subject: [PATCH] 2025.8.28 1. 添加走航季度报告相关统计功能(待完成)

---
 src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 98bfe6e..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,7 +1,9 @@
 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
 
 /**
  *
@@ -32,8 +34,22 @@
 
     /**
      * 灏嗚蛋鑸洃娴嬫暟鎹拰鍗槦缃戞牸杩涜铻嶅悎璁$畻
-     * @param missionCode
-     * @param groupId
+     * @param gridData
      */
-    fun dataFusion(missionCode: String, groupId: Int): List<GridDataDetail?>
+    fun dataFusion(gridData: GridData): List<GridDataDetail?>
+
+    /**
+     * 璧拌埅鏁版嵁铻嶅悎
+     * @param groupId 浣跨敤鐨勭綉鏍肩粍id
+     * @param dataIdList 铻嶅悎鐨勬暟鎹甶d绱㈠紩鏁扮粍
+     */
+    // Fixme 2025.3.28: 闇�瑕佸拰[SatelliteTelemetryService.mixGridData]鍑芥暟鍚堝苟
+    fun mixUnderwayGridData(groupId: Int, dataIdList: List<Int>): List<GridDataDetailMixVo>
+
+    /**
+     * 灏嗚蛋鑸綉鏍兼暟鎹敓鎴愬搴旂殑鐑姏缃戞牸鍥�
+     * @param groupId 浣跨敤鐨勭綉鏍肩粍id
+     * @param gridDataDetailList 浣跨敤鐨勮蛋鑸綉鏍兼暟鎹�
+     */
+    fun buildHeatmap(groupId: Int, gridDataDetailList: List<GridDataDetail>, searchLength:Int): List<GridDataDetail>
 }
\ No newline at end of file

--
Gitblit v1.9.3