From e661ea6782bf6e7283689224506eef0869a27e6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十二月 2024 14:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 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 d76042c..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
@@ -100,6 +100,24 @@
     public ApiResponse<BaseResponse> testBroadcast(@RequestBody CustomBroadcastRequest request, HttpServletResponse response) {
         return ApiResponse.success(  HKService.customBroadcast(request));
     }
+    @ApiOperation("銆愭捣搴枫�戞祴璇曡溅杈嗛绾�")
+    @PostMapping("/testParkReservation")
+    @LoginNoRequired
+    public ApiResponse<BaseResponse> testParkReservation(@RequestBody ParkReservationAddRequest param, HttpServletResponse response) {
+        return ApiResponse.success(  HKService.parkReservationAddition(param));
+    }
+    @ApiOperation("銆愭捣搴枫�戞祴璇曡溅杈嗛绾﹀彇娑�")
+    @PostMapping("/testParkReservationDeletion")
+    @LoginNoRequired
+    public ApiResponse<BaseResponse> testParkReservationDeletion(@RequestBody ParkReservationDelRequest param, HttpServletResponse response) {
+        return ApiResponse.success(  HKService.parkReservationDeletion(param));
+    }
+    @ApiOperation("銆愭捣搴枫�戣幏鍙栦唬鍔炲垪琛�")
+    @PostMapping("/getTodoListPage")
+    @LoginNoRequired
+    public ApiResponse<BaseResponse> getTodoListPage(@RequestBody GetTodoListRequest request, HttpServletResponse response) {
+        return ApiResponse.success(  HKService.getTodoListPage(request));
+    }
     @ApiOperation("銆愭捣搴枫�戞祴璇曚汉鑴稿浘鐗囦笅杞�")
     @PostMapping("/testDonwLoadMemberImg")
     @LoginNoRequired
@@ -126,7 +144,6 @@
     public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
         return ApiResponse.success(  HKService.nhEventPageList(param));
     }
-
     @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵��")
     @PostMapping("/sensorStatusSearch")
     @LoginNoRequired
@@ -158,4 +175,28 @@
         return ApiResponse.success(  HKService.findDeviceAlarmPage(param));
     }
 
+    @ApiOperation("銆愭捣搴枫�戞俯婀垮害缁熻")
+    @PostMapping("/getTemperatureHumidityDataPage")
+    @LoginNoRequired
+    public ApiResponse<BaseResponse> getTemperatureHumidityDataPage(@RequestBody TemperatureHumidityDataRequest request, HttpServletResponse response) {
+        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