From e6cc379fbef57277568ee667ec07a508b3dcc479 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 29 八月 2024 17:35:35 +0800
Subject: [PATCH] 1. 新增NO监测因子 2. 新增第三方数据接口数据获取相关模块
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 8c8034c..cc717f7 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
@@ -16,6 +16,7 @@
@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?,
@@ -23,7 +24,7 @@
required = false) type: Int?,
@RequestParam(value = "page", required = false) page: Int?,
@RequestParam(value = "perPage", required = false) perPage: Int?,
- ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, type, page, perPage)
+ ) = realTimeDataService.getSecondData(deviceType, deviceCode, startTime, endTime, type, page, perPage)
@GetMapping("/sec/next")
fun getNextData(
@@ -38,7 +39,7 @@
@RequestPart("excel") file: MultipartFile,
) = realTimeDataService.importData(file)
- @ApiOperation(value = "瀵煎叆闈欏畨鍖虹敓鎬佺幆澧冪洃娴嬬珯鐨勮蛋琛屾暟鎹�")
+ @ApiOperation(value = "瀵煎叆闈欏畨鍖虹敓鎬佺幆澧冪洃娴嬬珯鐨勮蛋鑸暟鎹�")
@PostMapping("/import/jinan")
fun importJinanData(
@ApiParam("璁惧id") @RequestParam("code") code: String,
@@ -48,4 +49,10 @@
@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