From 2de612e9b260df2e76d4dd620ca739aa3b6e8c57 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 25 八月 2025 16:07:16 +0800 Subject: [PATCH] 2025.8.25 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