From 8cf331411ea79c0d83e00657ed1374b29b09f4d7 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 三月 2025 17:46:30 +0800
Subject: [PATCH] 1. 新增走航卫星网格数据之间的融合功能
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 494fcaa..d858605 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteDataCalculateService.kt
@@ -2,6 +2,7 @@
import com.flightfeather.uav.domain.entity.GridCell
import com.flightfeather.uav.domain.entity.GridDataDetail
+import com.flightfeather.uav.lightshare.bean.GridDataDetailMixVo
/**
*
@@ -38,9 +39,17 @@
fun dataFusion(missionCode: String, groupId: Int): List<GridDataDetail?>
/**
+ * 璧拌埅鏁版嵁铻嶅悎
+ * @param groupId 浣跨敤鐨勭綉鏍肩粍id
+ * @param dataIdList 铻嶅悎鐨勬暟鎹甶d绱㈠紩鏁扮粍
+ */
+ // Fixme 2025.3.28: 闇�瑕佸拰[SatelliteTelemetryService.mixGridData]鍑芥暟鍚堝苟
+ fun mixGridData(groupId: Int, dataIdList: List<Int>): List<GridDataDetailMixVo>
+
+ /**
* 灏嗚蛋鑸綉鏍兼暟鎹敓鎴愬搴旂殑鐑姏缃戞牸鍥�
* @param groupId 浣跨敤鐨勭綉鏍肩粍id
- * @param gridDataDetail 浣跨敤鐨勮蛋鑸綉鏍兼暟鎹�
+ * @param gridDataDetailList 浣跨敤鐨勮蛋鑸綉鏍兼暟鎹�
*/
- fun buildHeatmap(groupId: Int, gridDataDetail: List<GridDataDetail>): List<GridDataDetail>
+ fun buildHeatmap(groupId: Int, gridDataDetailList: List<GridDataDetail>, searchLength:Int): List<GridDataDetail>
}
\ No newline at end of file
--
Gitblit v1.9.3