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/ElectricityController.kt | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt
index bd69609..cc74fc6 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt
@@ -23,4 +23,30 @@
@RequestParam(value = "page", required = false) page: Int?,
@RequestParam(value = "perPage", required = false) perPage: Int?
) = electricityService.getMinuteData(deviceCode, startTime, endTime, page, perPage)
+
+ @ApiOperation(value = "鑾峰彇浼佷笟鐢ㄧ數閲忓垎閽熷潎鍊硷紝缁撴灉鏍煎紡涓鸿蛋鑸暟鎹牸寮�")
+ @GetMapping("/minute2")
+ fun getMinuteData2(
+ @ApiParam("璁惧缂栧彿") @RequestParam(value = "deviceCode") deviceCode: String,
+ @ApiParam(value = "寮�濮嬫椂闂�", example = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "startTime", required = false) startTime: String?,
+ @ApiParam(value = "缁撴潫鏃堕棿", example = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "endTime", required = false) endTime: String?,
+ @RequestParam(value = "page", required = false) page: Int?,
+ @RequestParam(value = "perPage", required = false) perPage: Int?
+ ) = electricityService.getMinuteData2(deviceCode, startTime, endTime, page, perPage)
+
+ @ApiOperation(value = "鑾峰彇浼佷笟鐢ㄧ數閲忔渶鏂颁竴鏉″垎閽熷潎鍊�")
+ @GetMapping("/company")
+ fun getByCompany(
+ @ApiParam("浼佷笟id") @RequestParam(value = "cId") cId: String,
+ ) = electricityService.getByCompany(cId)
+
+ @ApiOperation(value = "鑾峰彇浼佷笟鐢ㄧ數閲忔暣鍚堟暟鎹�")
+ @GetMapping("/info")
+ fun getElectricityInfo(
+ @ApiParam("浼佷笟id") @RequestParam(value = "cId") cId: String,
+ @ApiParam(value = "寮�濮嬫椂闂�", example = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "startTime", required = false) startTime: String?,
+ @ApiParam(value = "缁撴潫鏃堕棿", example = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "endTime", required = false) endTime: String?,
+ @RequestParam(value = "page", required = false) page: Int?,
+ @RequestParam(value = "perPage", required = false) perPage: Int?
+ ) = electricityService.getElectricityInfo(cId, startTime, endTime, page, perPage)
}
\ No newline at end of file
--
Gitblit v1.9.3