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/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 c431269..20c487e 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/SatelliteTelemetryController.kt
@@ -24,7 +24,7 @@
@RequestMapping("air/satellite")
class SatelliteTelemetryController(
private val satelliteTelemetryService: SatelliteTelemetryService,
- private val satelliteDataCalculateService: SatelliteDataCalculateService
+ private val satelliteDataCalculateService: SatelliteDataCalculateService,
) {
@ApiOperation(value = "鑾峰彇缃戞牸缁勪俊鎭�")
@@ -33,7 +33,7 @@
@RequestBody areaVo: AreaVo,
@RequestParam(required = false) type: String?,
@RequestParam("page", required = false) page: Int?,
- @RequestParam("per_page", required = false) perPage: Int?
+ @RequestParam("per_page", required = false) perPage: Int?,
) = resPack { satelliteTelemetryService.fetchGridGroup(areaVo, type, page, perPage) }
@ApiOperation(value = "鑾峰彇缃戞牸缁勫唴鍏蜂綋缃戞牸淇℃伅")
@@ -48,7 +48,10 @@
@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 = "鑾峰彇缃戞牸缁勪笅鐨勫崼鏄熼仴娴嬪叿浣撴暟鎹�")
@@ -65,7 +68,7 @@
@ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
@ApiParam("閬ユ祴鏁版嵁鏃堕棿")
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") dateTime: LocalDateTime,
- @RequestBody gridDataDetail: List<GridDataDetail>
+ @RequestBody gridDataDetail: List<GridDataDetail>,
) = resPack {
satelliteTelemetryService.createGridDataAndDataDetail(groupId, dateTime, gridDataDetail)
}
@@ -74,7 +77,7 @@
@ApiOperation(value = "澶氭璧拌埅鏁版嵁杩涜铻嶅悎璁＄畻")
@PostMapping("/grid/data/mix")
fun mixGridData(
- @ApiParam("鍘熷鏁版嵁id鏁扮粍") @RequestBody dataIdList: List<Int>
+ @ApiParam("鍘熷鏁版嵁id鏁扮粍") @RequestBody dataIdList: List<Int>,
) = resPack { satelliteTelemetryService.mixGridData(dataIdList) }
@@ -92,7 +95,8 @@
@ApiOperation(value = "涓嬭浇鍗槦閬ユ祴PM2.5缁撴灉鏁版嵁瀵煎叆妯℃澘")
@GetMapping("/import/grid/data/download/template")
- fun downloadTemplate(@ApiIgnore response: HttpServletResponse) = satelliteTelemetryService.downloadTemplate(response)
+ fun downloadTemplate(@ApiIgnore response: HttpServletResponse) =
+ satelliteTelemetryService.downloadTemplate(response)
@ApiOperation(value = "瀵煎叆鍗槦閬ユ祴Aod缁撴灉鏁版嵁")
@PostMapping("/import/grid/aod")
@@ -108,7 +112,8 @@
@ApiOperation(value = "涓嬭浇鍗槦閬ユ祴Aod缁撴灉鏁版嵁瀵煎叆妯℃澘")
@GetMapping("/import/grid/aod/download/template")
- fun downloadAODTemplate(@ApiIgnore response: HttpServletResponse) = satelliteTelemetryService.downloadAODTemplate(response)
+ fun downloadAODTemplate(@ApiIgnore response: HttpServletResponse) =
+ satelliteTelemetryService.downloadAODTemplate(response)
/**AOD鏁版嵁鐩稿叧**************************************************************/
@@ -145,11 +150,18 @@
@ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
) = resPack { satelliteDataCalculateService.dataFusion(missionCode, groupId) }
+ @ApiOperation(value = "杩涜璧拌埅铻嶅悎浜у搧鐨勮瀺鍚堝垎鏋�")
+ @PostMapping("/product/underway/mix")
+ fun mixGridData(
+ @ApiParam("缃戞牸缁刬d") @RequestParam groupId: Int,
+ @ApiParam("闇�瑕佽瀺鍚堢殑鏁版嵁id") @RequestBody dataIdList: List<Int>,
+ ) = resPack { satelliteDataCalculateService.mixGridData(groupId, dataIdList) }
+
@ApiOperation(value = "鐢熸垚璧拌埅鐑姏鍥�")
@PostMapping("/product/underway/heatmap/build")
fun buildUnderwayHeatmap(
@ApiParam("浣跨敤鐨勭綉鏍肩粍id") @RequestParam groupId: Int,
- @ApiParam("鎼滅储缃戞牸璺濈") @RequestParam searchLength:Int,
- @ApiParam("浣跨敤鐨勮蛋鑸綉鏍兼暟鎹�") @RequestBody gridDataDetailList: List<GridDataDetail>
+ @ApiParam("鎼滅储缃戞牸璺濈") @RequestParam searchLength: Int,
+ @ApiParam("浣跨敤鐨勮蛋鑸綉鏍兼暟鎹�") @RequestBody gridDataDetailList: List<GridDataDetail>,
) = resPack { satelliteDataCalculateService.buildHeatmap(groupId, gridDataDetailList, searchLength) }
}
\ No newline at end of file
--
Gitblit v1.9.3