From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 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..37db0f2 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
@@ -2,36 +2,23 @@
 
 import com.doumee.api.BaseController;
 import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.config.annotation.CloudRequiredPermission;
 import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.haikang.model.param.BaseListPageResponse;
 import com.doumee.core.haikang.model.param.BaseResponse;
 import com.doumee.core.haikang.model.param.request.*;
-import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
 import com.doumee.core.haikang.model.param.respose.*;
 import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.MemberService;
+import com.doumee.service.business.third.model.ApiResponse;
 import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
 import com.doumee.dao.business.model.Device;
 import com.doumee.service.business.DeviceService;
 import com.doumee.service.business.impl.hksync.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -49,6 +36,8 @@
 
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
+    @Autowired
+    private MemberService memberService;
     @Autowired
     private HkSyncImgServiceImpl hkSyncImgService;
     @Autowired
@@ -84,6 +73,13 @@
         }
         return ApiResponse.success(dList);
     }
+    @ApiOperation("銆愮郴缁熴�戦噸鏂板垵濮嬪寲鎵�鏈塩ompany銆乵ember鍜宻ystemuser鏁版嵁鐨刾inyin瀛楁")
+    @GetMapping("/initPinyinTool")
+    @LoginNoRequired
+    public ApiResponse<List<Map<String,Object>> > initPinyinTool( HttpServletResponse response) {
+        memberService.initPinyinTool();
+        return ApiResponse.success(null);
+    }
     @ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
     @PostMapping("/testLed")
     @LoginNoRequired
@@ -99,6 +95,18 @@
     @LoginNoRequired
     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")
@@ -163,4 +171,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