From 4b8fda000f9f600ba5187e738278b340b55ebd7c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 十二月 2024 18:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index 260731b..8bc1987 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -182,4 +182,21 @@
         return ApiResponse.success(  HKService.temperatureHumidityDataStatistic(request));
     }
 
+    @ApiOperation("銆愭捣搴枫�戞牴鎹椂闂村拰鏃堕棿缁村害鑾峰彇鍥尯鑳借�楁暟鎹�")
+    @PostMapping("/energyTotal")
+    @LoginNoRequired
+    public ApiResponse<BaseResponse<EnergyTotalDataResponse>> energyTotalData(@RequestBody EnergyTotalDataRequest request, HttpServletResponse response) {
+        return ApiResponse.success(  HKService.energyTotal(request));
+    }
+
+
+    @ApiOperation("銆愭捣搴枫�戣幏鍙栧尯鍩熺敤閲忔帓鍚�-鑳借�楃湅鏉�")
+    @PostMapping("/regionDataRanking")
+    @LoginNoRequired
+    public ApiResponse<BaseResponse<List<RegionDataRankingDataResponse>>> regionDataRankingData(@RequestBody RegionDataRankingDataRequest request, HttpServletResponse response) {
+        return ApiResponse.success(  HKService.regionDataRanking(request));
+    }
+
+
+
 }

--
Gitblit v1.9.3