From a6f9e7d4faf7c1c536111e0db7f3317cbda9ddb1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 30 十二月 2024 18:24:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 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 19b4846..9ce05c9 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
@@ -31,6 +31,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -100,6 +101,18 @@
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
@@ -163,4 +176,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