From 94fee0b511279679b43e210878d3d36e5a14384b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 30 九月 2025 09:14:10 +0800
Subject: [PATCH] 2025.9.30 1. 新增走航任务统计功能
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt
index 20c487e..70ec683 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt
@@ -1,5 +1,6 @@
package com.flightfeather.uav.lightshare.web
+import com.flightfeather.uav.domain.entity.GridData
import com.flightfeather.uav.domain.entity.GridDataDetail
import com.flightfeather.uav.lightshare.bean.AreaVo
import com.flightfeather.uav.lightshare.service.SatelliteDataCalculateService
@@ -48,11 +49,21 @@
@ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
@ApiParam("閬ユ祴鏁版嵁鏃堕棿")
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") dataTime: LocalDateTime?,
- @ApiParam(
- "閬ユ祴鏁版嵁绫诲瀷",
- allowableValues = "0锛氬師濮嬪崼鏄熼仴娴嬫暟鎹紱1锛氳瀺鍚堟暟鎹�"
- ) @RequestParam(required = false) type: Int?,
+ @ApiParam("閬ユ祴鏁版嵁绫诲瀷", allowableValues = "0锛氬師濮嬪崼鏄熼仴娴嬫暟鎹紱1锛氳瀺鍚堟暟鎹�")
+ @RequestParam(required = false) type: Int?,
) = resPack { satelliteTelemetryService.fetchGridData(groupId, dataTime, type) }
+
+ @ApiOperation(value = "鑾峰彇缃戞牸缁勪笅鐨勫崼鏄熼仴娴嬫暟鎹�")
+ @PostMapping("/grid/data2")
+ fun fetchGridData2(
+ @ApiParam("缃戞牸鏁版嵁") @RequestBody gridData: GridData,
+ ) = resPack { satelliteTelemetryService.fetchGridData(gridData) }
+
+ @ApiOperation(value = "鍒犻櫎缃戞牸鏁版嵁")
+ @DeleteMapping("/grid/data/delete")
+ fun deleteGridData(
+ @ApiParam("鏁版嵁id") @RequestParam dataId: Int,
+ ) = resPack { satelliteTelemetryService.deleteGridData(dataId) }
@ApiOperation(value = "鑾峰彇缃戞牸缁勪笅鐨勫崼鏄熼仴娴嬪叿浣撴暟鎹�")
@GetMapping("/grid/data/detail")
@@ -144,18 +155,19 @@
/**閬ユ祴浜у搧鍒朵綔鐩稿叧**************************************************************/
@ApiOperation(value = "鐢熸垚璧拌埅铻嶅悎浜у搧")
- @GetMapping("/product/underway/build")
+ @PostMapping("/product/underway/build")
fun buildUnderwayProduct(
- @ApiParam("璧拌埅浠诲姟缂栧彿") @RequestParam missionCode: String,
- @ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
- ) = resPack { satelliteDataCalculateService.dataFusion(missionCode, groupId) }
+// @ApiParam("璧拌埅浠诲姟缂栧彿") @RequestParam missionCode: String,
+// @ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
+ @ApiParam("缃戞牸鏁版嵁") @RequestBody gridData: GridData,
+ ) = resPack { satelliteDataCalculateService.dataFusion(gridData) }
@ApiOperation(value = "杩涜璧拌埅铻嶅悎浜у搧鐨勮瀺鍚堝垎鏋�")
@PostMapping("/product/underway/mix")
fun mixGridData(
@ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
@ApiParam("闇�瑕佽瀺鍚堢殑鏁版嵁id") @RequestBody dataIdList: List<Int>,
- ) = resPack { satelliteDataCalculateService.mixGridData(groupId, dataIdList) }
+ ) = resPack { satelliteDataCalculateService.mixUnderwayGridData(groupId, dataIdList) }
@ApiOperation(value = "鐢熸垚璧拌埅鐑姏鍥�")
@PostMapping("/product/underway/heatmap/build")
--
Gitblit v1.9.3