From 15925907ba4b16d6fe3a5210186e0ce3cd19efa5 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 22 十一月 2021 13:30:17 +0800
Subject: [PATCH] 1. 新增临时网格化秒级值表,用于数据校准处理

---
 src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt |   11 +++++++++++
 1 files changed, 11 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 4d88c9d..cc74fc6 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt
@@ -34,8 +34,19 @@
         @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