From f0abc5b4a6efc5aa3493a50817d3bc1aa2347322 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 12 二月 2025 17:03:00 +0800 Subject: [PATCH] 1. 新增坐标点是否在多边形内部的判定算法 --- src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 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 2bccb1c..c778d45 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/web/ElectricityController.kt @@ -32,10 +32,29 @@ @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) + ) = 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