From a5d3f60ae4aa27744b47fcc3107be8005c3da910 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 02 十二月 2021 14:23:50 +0800
Subject: [PATCH] 1. 新增用电量日分析功能
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 365c0ef..def38ec 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
@@ -1,11 +1,12 @@
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 io.swagger.annotations.ApiParam
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
+@Api(tags = ["璧拌埅鐩戞祴鏁版嵁API鎺ュ彛"])
@RestController
@RequestMapping("air/realtime")
class RealTimeDataController(val realTimeDataService: RealTimeDataService) {
@@ -15,9 +16,10 @@
@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)
+ ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, type, page, perPage)
@GetMapping("/sec/next")
fun getNextData(
@@ -26,4 +28,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