From 070005ffba3ce5cb80e27448bca668aa25edee62 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 11 六月 2021 17:02:51 +0800
Subject: [PATCH] 1. 新增走航任务增删改查相关功能 2. 新增无人船数据excel导入功能 3. 优化多参数接收逻辑，解决单个数据头导致数据包结构判断错误问题
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt | 29 ++++++++++++++++++++---------
1 files changed, 20 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..a77dff3 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
@@ -1,10 +1,8 @@
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 org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
@RestController
@RequestMapping("air/realtime")
@@ -12,10 +10,23 @@
@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