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/RealTimeDataController.kt | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
index cc05b83..cc717f7 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
@@ -2,8 +2,12 @@
import com.flightfeather.uav.lightshare.service.RealTimeDataService
import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import io.swagger.annotations.ApiParam
import org.springframework.web.bind.annotation.*
import org.springframework.web.multipart.MultipartFile
+import springfox.documentation.annotations.ApiIgnore
+import javax.servlet.http.HttpServletResponse
@Api(tags = ["璧拌埅鐩戞祴鏁版嵁API鎺ュ彛"])
@RestController
@@ -12,23 +16,43 @@
@GetMapping("/sec")
fun getSecondData(
+ @RequestParam(value = "deviceType", required = false) deviceType: String?,
@RequestParam(value = "deviceCode", required = false) deviceCode: String?,
@RequestParam(value = "startTime", required = false) startTime: String?,
@RequestParam(value = "endTime", required = false) endTime: String?,
+ @ApiParam(value = "0: 绉掔骇鍊�; 1:鍒嗛挓鍊�", defaultValue = "0") @RequestParam(value = "type",
+ required = false) type: Int?,
@RequestParam(value = "page", required = false) page: Int?,
- @RequestParam(value = "perPage", required = false) perPage: Int?
- ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, page, perPage)
+ @RequestParam(value = "perPage", required = false) perPage: Int?,
+ ) = realTimeDataService.getSecondData(deviceType, deviceCode, startTime, endTime, type, page, perPage)
@GetMapping("/sec/next")
fun getNextData(
@RequestParam(value = "deviceCode") deviceCode: String,
@RequestParam(value = "updateTime") updateTime: String,
@RequestParam(value = "page", required = false) page: Int?,
- @RequestParam(value = "perPage", required = false) perPage: Int?
+ @RequestParam(value = "perPage", required = false) perPage: Int?,
) = realTimeDataService.getNextData(deviceCode, updateTime, page, perPage)
@PostMapping("/import")
fun importData(
- @RequestPart("excel") file: MultipartFile
+ @RequestPart("excel") file: MultipartFile,
) = realTimeDataService.importData(file)
+
+ @ApiOperation(value = "瀵煎叆闈欏畨鍖虹敓鎬佺幆澧冪洃娴嬬珯鐨勮蛋鑸暟鎹�")
+ @PostMapping("/import/jinan")
+ fun importJinanData(
+ @ApiParam("璁惧id") @RequestParam("code") code: String,
+ @RequestPart("excel") file: MultipartFile,
+ ) = resPack { realTimeDataService.importJinanData(code, file) }
+
+ @ApiOperation(value = "涓嬭浇闈欏畨鍖虹敓鎬佺幆澧冪洃娴嬬珯璧拌鏁版嵁瀵煎叆妯℃澘")
+ @PostMapping("/import/jinan/download/template")
+ fun downloadTemplate(@ApiIgnore response: HttpServletResponse) = realTimeDataService.downloadTemplate(response)
+
+ @ApiOperation(value = "鑾峰彇鎸夌収璺鍒嗗壊鐨勮蛋鑸暟鎹�")
+ @GetMapping("/sec/segment")
+ fun getSegmentData(
+ @ApiParam("浠诲姟id") @RequestParam("missionCode") missionCode: String,
+ ) = resPack { realTimeDataService.getSegmentData(missionCode) }
}
\ No newline at end of file
--
Gitblit v1.9.3