From 63d16d75a6f12e783bb36cfe526d9cb518b48823 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 30 六月 2021 17:58:52 +0800
Subject: [PATCH] 1. 新增用电量数据查询接口 2. 新增swagger2库
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt | 23 ++++++++++++++---------
1 files changed, 14 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 e97b121..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,22 +1,22 @@
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")
@@ -26,4 +26,9 @@
@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