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/SatelliteTelemetryService.kt |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteTelemetryService.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteTelemetryService.kt
index 0799ea9..d75f91b 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteTelemetryService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteTelemetryService.kt
@@ -2,6 +2,7 @@
 
 import com.flightfeather.uav.common.exception.BizException
 import com.flightfeather.uav.domain.entity.GridAod
+import com.flightfeather.uav.domain.entity.GridAodDetail
 import com.flightfeather.uav.domain.entity.GridCell
 import com.flightfeather.uav.domain.entity.GridData
 import com.flightfeather.uav.domain.entity.GridDataDetail
@@ -20,7 +21,7 @@
  */
 interface SatelliteTelemetryService {
 
-    fun fetchGridGroup(areaVo: AreaVo, page: Int?, perPage: Int?): Pair<DataHead, List<GridGroup?>>
+    fun fetchGridGroup(areaVo: AreaVo, type: String?, page: Int?, perPage: Int?): Pair<DataHead, List<GridGroup?>>
 
     fun deleteGridGroup(groupId: Int)
 
@@ -30,17 +31,22 @@
 
     fun fetchGridDataDetail(dataId: Int, groupId: Int?, cellId: Int?): List<GridDataDetail?>
 
+    fun createGridDataAndDataDetail(
+        groupId: Int,
+        dataTime: LocalDateTime?,
+        gridDataDetail: List<GridDataDetail>,
+    ): Boolean
+
     /**
      * 鏁版嵁铻嶅悎
      */
+    // Fixme 2025.3.28: 闇�瑕佸拰[SatelliteDataCalculateService.mixGridData]鍑芥暟鍚堝苟
     fun mixGridData(dataIdList: List<Int>): List<GridData?>
 
     @Throws(BizException::class)
     fun importGridData(groupId: Int, dataTime: LocalDateTime?, update: Boolean, file: MultipartFile): GridDataImportResult?
 
     fun downloadTemplate(response: HttpServletResponse): Boolean
-
-    fun fetchGridAod(groupId: Int, dataTime: LocalDateTime?): List<GridAod?>
 
     @Throws(BizException::class)
     fun importGridAOD(groupId: Int, dataTime: LocalDateTime?, update: Boolean, file: MultipartFile): GridDataImportResult?
@@ -52,4 +58,10 @@
      * @param groupId 缃戞牸缁勭储寮昳d
      */
     fun calGridVertex(groupId: Int): List<GridCell?>
+
+
+    /**AOD鏁版嵁鐩稿叧**************************************************************/
+    fun fetchGridAod(groupId: Int, dataTime: LocalDateTime?): List<GridAod?>
+
+    fun fetchGridAODDetail(aodId: Int, groupId: Int?, cellId: Int?): List<GridAodDetail?>
 }
\ No newline at end of file

--
Gitblit v1.9.3