From d978297ae85b2d7453054e616bbbe87bfabe9cbe Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 12 七月 2021 17:38:09 +0800
Subject: [PATCH] 1. 新增用电量数据查询接口 2. 调整污染权重算法
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt | 15 +++++++++++++++
1 files changed, 15 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..2bccb1c 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,19 @@
@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.getMinuteData(deviceCode, startTime, endTime, page, perPage)
+
+ @GetMapping("/company")
+ fun getByCompany(
+ @ApiParam("浼佷笟id") @RequestParam(value = "cId") cId: String,
+ ) = electricityService.getByCompany(cId)
}
\ No newline at end of file
--
Gitblit v1.9.3