From 892049fc5d370bea7157910ad4259fd5a4aba627 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 01 三月 2021 14:28:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'obdserver2/master'
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt | 4 +++-
1 files changed, 3 insertions(+), 1 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 f72e1e0..e491030 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/RealTimeDataController.kt
@@ -13,7 +13,9 @@
@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?
- ) = realTimeDataService.getSecondData(deviceCode,page, perPage)
+ ) = realTimeDataService.getSecondData(deviceCode, startTime, endTime, page, perPage)
}
\ No newline at end of file
--
Gitblit v1.9.3