From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt | 19 +++++++++++++++++++
1 files changed, 19 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..c778d45 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,27 @@
@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)
+
+ @ApiOperation(value = "浼佷笟鐢ㄧ數閲忔棩鍒嗘瀽")
+ @GetMapping("/analysis/daily")
+ fun dailyStatistics(
+ @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?,
+ ) = electricityService.dailyAnalysis(cId, startTime, endTime)
}
\ No newline at end of file
--
Gitblit v1.9.3