From d042b8ec4197c6f2f1052138dddea37adc2c9bfb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 14:56:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 5d1cdd4..7be6fdf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -11,6 +11,7 @@
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.base.EventBaseRequest;
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;
@@ -19,6 +20,7 @@
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.dao.web.response.platformReport.CarmeraListVO;
+import com.doumee.service.business.impl.JkCabinetGridServiceImpl;
import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
@@ -79,6 +81,8 @@
private DeviceService deviceService;
@Autowired
+ private JkCabinetGridServiceImpl impl;
+ @Autowired
private RedisTemplate<String,Object> redisTemplate;
@Autowired
@@ -112,8 +116,11 @@
//鍚屾LED
result = hkSyncDeviceService.syncHkLed(param);
}else if(Constants.equalsInteger(param.getType(),Constants.THREE)){
- //鍚屾骞挎挱
+ //鍚屾骞挎挱鐐�
result = hkSyncDeviceService.syncHkBroadcast(param);
+ }else if(Constants.equalsInteger(param.getType(),Constants.FOUR)){
+ //鍚屾骞挎挱
+ result = hkSyncDeviceService.syncHkBroadcastDevice(param);
}
return ApiResponse.success(result);
}
@@ -172,14 +179,16 @@
String result = hkSyncPushService.dealVisitEvent(param,response);
return ApiResponse.success(result);
}
+
@ApiOperation("銆愭捣搴枫�戝叾浠栬闃呬簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/notice")
@LoginNoRequired
- public ApiResponse pushNotice(@RequestBody EventVisitRequest param, HttpServletResponse response){
- String result = hkSyncPushService.dealVisitEvent(param,response);
+ public ApiResponse pushNotice(@RequestBody EventBaseRequest param, HttpServletResponse response){
+ String result = hkSyncPushService.dealSecurityEvent(param,response,impl);
return ApiResponse.success(result);
}
+
@ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/visitIccm")
@LoginNoRequired
@@ -311,29 +320,50 @@
@PostMapping("/regionList")
public ApiResponse<List<PageRegionInfoResponse> > getRegionList(HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ){
CarmeraListVO param =new CarmeraListVO();
- param.setWithCameras(0);
+ param.setWithCameras(1);
List<PageRegionInfoResponse> result = new ArrayList<>();
try {
-// result = boardService.getRegionTree( param);
+ result = boardService.getRegionTree( param);
+
+ }catch (Exception e){
+
+ }
+ /*if(result.size()==0){
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
for (int i = 0; i < 5; i++) {
PageRegionInfoResponse t = new PageRegionInfoResponse();
t.setName("鎬诲尯鍩焈"+i);
t.setIndexCode(i+"_code");
t.setChildList(new ArrayList<>());
+ t.setCarmeraList(new ArrayList<>());
+ CarmeraListVO c= new CarmeraListVO();
+ c.setName("鐩戞帶鐐�11"+i);
+ c.setIndexCode("jkd11"+i);
+ t.getCarmeraList().add(c);
+ c= new CarmeraListVO();
+ c.setName("鐩戞帶鐐�12"+i);
+ c.setIndexCode("jkd12"+i);
+ t.getCarmeraList().add(c);
for (int j = 0; j < 5; j++) {
PageRegionInfoResponse t1 = new PageRegionInfoResponse();
t1.setName("瀛愬尯鍩焈"+i+"_"+j);
t1.setIndexCode(i+"_"+j+"_ChildCode");
t1.setParentIndexCode(t.getIndexCode());
+ t1.setCarmeraList(new ArrayList<>());
+ CarmeraListVO c1= new CarmeraListVO();
+ c1.setName(i+"鐩戞帶鐐�111"+j);
+ c1.setIndexCode(i+"jkd111"+j);
+ t1.getCarmeraList().add(c1);
+ c1= new CarmeraListVO();
+ c1.setName(i+"鐩戞帶鐐�112"+j);
+ c1.setIndexCode(i+"jkd112"+j);
+ t1.getCarmeraList().add(c1);
t.getChildList().add(t1);
}
result.add(t);
}
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
- }catch (Exception e){
-
- }
+ }*/
return ApiResponse.success(result);
}
@@ -345,5 +375,16 @@
deviceService.setLedContent(body);
return ApiResponse.success(null);
}
+ @ApiOperation("銆愭捣搴枫�戝箍鎾挱鎶�")
+ @PostMapping("/sendBobao")
+ public ApiResponse<String> setBroadcaseBobao(@RequestBody Device body , HttpServletResponse response) {
+ return ApiResponse.success( deviceService.setBroadcaseBobaoHttp(body));
+ }
+ @ApiOperation("銆愭捣搴枫�戝箍鎾挱鎶�")
+ @PostMapping("/sendBobaoOpenApi")
+ public ApiResponse<List<Map<String,Object>>> sendBobaoOpenapi(@RequestBody Device body , HttpServletResponse response) {
+ deviceService.setBroadcaseBobao(body);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3