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 | 158 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 140 insertions(+), 18 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 2b09d07..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,48 +2,84 @@
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;
+import java.util.List;
+import java.util.Map;
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
-@Api(tags = "娴峰悍鏁版嵁鍚屾鎺ュ彛")
+@Api(tags = "娴峰悍鎺ュ彛娴嬭瘯宸ュ叿鎺ュ彛")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hktest")
public class HkInterfaceTestCloudController extends BaseController {
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private MemberService memberService;
+ @Autowired
+ private HkSyncImgServiceImpl hkSyncImgService;
+ @Autowired
+ private DeviceService deviceService;
+ @ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
+ @PostMapping("/testLedAll")
+ @LoginNoRequired
+ public ApiResponse<List<Map<String,Object>> > testLedAll(@RequestBody TransparentChannelBodyRequest request, HttpServletResponse response) {
+ TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+ head.setAbility("cld");//鍥哄畾鍊�
+ head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
+ head.setDeviceIndexCode("6a5498e9df924befbb9530e467e5e809");
+ Device p = new Device();
+ p.setType(Constants.TWO);
+ p.setIsdeleted(Constants.ZERO);
+ List<Device> list = deviceService.findList(p);
+ List<Map<String,Object>> dList = new ArrayList<>();
+ String content = request.getParams().getRegions().get(0).getContent();
+ if(list!=null){
+ for(Device d : list){
+ head.setDeviceIndexCode(d.getNo());
+ request.getParams().setIndexCode(d.getNo());
+ request.getParams().getRegions().get(0).setContent( content+"["+d.getName()+"]");
+ BaseResponse res= HKService.transparentchannel(head,request);
+ Map<String,Object> dn = new HashMap<>();
+ dn.put("name",d.getName());
+ dn.put("id",d.getNo());
+ dn.put("content",request.getParams().getRegions().get(0).getContent());
+ dn.put("result",res);
+ dList.add(dn);
+ }
+ }
+ 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
@@ -60,6 +96,38 @@
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
+ public ApiResponse<BaseResponse> testDonwLoadMemberImg() {
+ hkSyncImgService.startDealMemberImg();
+ return ApiResponse.success( null);
+ }
+ @ApiOperation("銆愭捣搴枫�戞祴璇曟湀鍙颁簨浠跺浘鐗囦笅杞�")
+ @PostMapping("/testDonwLoadPlatformImg")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testDonwLoadPlatformImg() {
+ hkSyncImgService.startDealPlatformEventImg();
+ return ApiResponse.success( null);
+ }
@ApiOperation("銆愭捣搴枫�戞祴璇曡幏鍙栧井淇″叕浼楀彿")
@GetMapping("/testWxToken")
@LoginNoRequired
@@ -67,10 +135,64 @@
return ApiResponse.success( HKService.wxAccessToken(configId,tageId));
}
@ApiOperation("銆愭捣搴枫�戞祴璇曞垎椤佃幏鍙栧憡璀︿簨浠�")
- @GetMapping("/testWxToken")
+ @PostMapping("/nhEventPageList")
@LoginNoRequired
public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.nhEventPageList(param));
}
+ @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵��")
+ @PostMapping("/sensorStatusSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.sensorStatusSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戞煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃")
+ @PostMapping("/fireChannelSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse<BaseListPageResponse<FireChannelListResponse>>> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.fireChannelSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戞捣搴疯娑堥槻璁惧鍒楄〃")
+ @PostMapping("/fireDeviceSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse<BaseListPageResponse<FireDeviceListResponse>> > fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.fireDeviceSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃茶澶囬儴浠剁姸鎬�")
+ @PostMapping("/fireDeviceStatusSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.fireDeviceStatusSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈣澶囦笅鐨勬墍鏈夋姤璀﹁褰�")
+ @PostMapping("/findDeviceAlarmPage")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>> > findDeviceAlarmPage(@RequestBody FindDeviceAlarmListRequest param, HttpServletResponse response) {
+ 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