From 707b00a0ca6604c249a110b376ac1e44e408e624 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 04 九月 2025 18:24:39 +0800 Subject: [PATCH] 2025.9.4 1. 新增走航任务统计功能(待完成) --- src/main/kotlin/com/flightfeather/uav/lightshare/web/DataAnalysisController.kt | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/web/DataAnalysisController.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/web/DataAnalysisController.kt index ea3ca27..d6057bb 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/DataAnalysisController.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/DataAnalysisController.kt @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonFormat import com.flightfeather.uav.lightshare.bean.AreaVo import com.flightfeather.uav.lightshare.service.DataAnalysisService +import com.flightfeather.uav.socket.eunm.FactorType import io.swagger.annotations.Api import io.swagger.annotations.ApiOperation import io.swagger.annotations.ApiParam @@ -115,4 +116,27 @@ areaVo ) } + + @ApiOperation(value = "鍙犲姞铻嶅悎鍒嗘瀽") + @PostMapping("/report/gridFusion") + fun generateGridFusion( + @ApiParam("寮�濮嬫椂闂�") @RequestParam + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + startTime: LocalDateTime, + @ApiParam("缁撴潫鏃堕棿") @RequestParam + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + endTime: LocalDateTime, + @ApiParam("闇�瑕佺粺璁$殑鐩戞祴鍥犲瓙", example = "NO2, CO") @RequestParam + factorTypes: String, + @ApiParam("鍖哄煙") @RequestBody areaVo: AreaVo, + ) = resPack { + dataAnalysisService.generateGridFusion( + factorTypes.split(",").map { FactorType.valueOf(it) }, + Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()), + Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()), + areaVo + ) + } } \ No newline at end of file -- Gitblit v1.9.3