From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/SatelliteTelemetryService.kt | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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..e1e16c9 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)
@@ -28,11 +29,19 @@
fun fetchGridData(groupId: Int, dataTime: LocalDateTime?, type: Int?): List<GridData?>
+ fun fetchGridData(gridData: GridData): List<GridData?>
+
+ fun deleteGridData(dataId: Int): Boolean
+
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.mixUnderwayGridData]鍑芥暟鍚堝苟
fun mixGridData(dataIdList: List<Int>): List<GridData?>
@Throws(BizException::class)
@@ -40,16 +49,14 @@
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?
fun downloadAODTemplate(response: HttpServletResponse): Boolean
- /**
- * 鏍规嵁鍗槦閬ユ祴缃戞牸鐨勪腑蹇冨潗鏍囩偣锛岃绠楃綉鏍�4涓《鐐瑰潗鏍�
- * @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