From 7a99e45c445b48e599adfb948350d0c9d22f441f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 09 十一月 2021 11:59:25 +0800
Subject: [PATCH] 1. 添加车载走航动态校准功能 2. 添加网格化数据校准功能 3. 添加网格化数据分钟均值转换功能(待完成)

---
 src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 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 e491030..cc05b83 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
@@ -1,21 +1,34 @@
 package com.flightfeather.uav.lightshare.web
 
 import com.flightfeather.uav.lightshare.service.RealTimeDataService
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.RestController
+import io.swagger.annotations.Api
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
 
+@Api(tags = ["璧拌埅鐩戞祴鏁版嵁API鎺ュ彛"])
 @RestController
 @RequestMapping("air/realtime")
 class RealTimeDataController(val realTimeDataService: RealTimeDataService) {
 
     @GetMapping("/sec")
     fun getSecondData(
-            @RequestParam(value = "deviceCode", required = false) deviceCode: String?,
-            @RequestParam(value = "startTime", required = false) startTime: String?,
-            @RequestParam(value = "endTime", required = false) endTime: String?,
-            @RequestParam(value = "page", required = false) page: Int?,
-            @RequestParam(value = "perPage", required = false) perPage: Int?
+        @RequestParam(value = "deviceCode", required = false) deviceCode: String?,
+        @RequestParam(value = "startTime", required = false) startTime: String?,
+        @RequestParam(value = "endTime", required = false) endTime: String?,
+        @RequestParam(value = "page", required = false) page: Int?,
+        @RequestParam(value = "perPage", required = false) perPage: Int?
     ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, 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?
+    ) = realTimeDataService.getNextData(deviceCode, updateTime, page, perPage)
+
+    @PostMapping("/import")
+    fun importData(
+        @RequestPart("excel") file: MultipartFile
+    ) = realTimeDataService.importData(file)
 }
\ No newline at end of file

--
Gitblit v1.9.3