From 12d71ee7f050b981d584668f6ca70794d2c92a44 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 17:53:10 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 65d569e..024312b 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
@@ -7,9 +7,11 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.config.jwt.JwtProperties;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.HKConstants;
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;
@@ -18,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;
@@ -78,6 +81,8 @@
private DeviceService deviceService;
@Autowired
+ private JkCabinetGridServiceImpl impl;
+ @Autowired
private RedisTemplate<String,Object> redisTemplate;
@Autowired
@@ -111,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);
}
@@ -171,6 +179,16 @@
String result = hkSyncPushService.dealVisitEvent(param,response);
return ApiResponse.success(result);
}
+
+ @ApiOperation("銆愭捣搴枫�戝叾浠栬闃呬簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
+ @PostMapping("/push/notice")
+ @LoginNoRequired
+ 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
@@ -305,9 +323,9 @@
param.setWithCameras(0);
List<PageRegionInfoResponse> result = new ArrayList<>();
try {
-// result = boardService.getRegionTree( param);
+ result = boardService.getRegionTree( param);
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
- for (int i = 0; i < 5; i++) {
+ /* for (int i = 0; i < 5; i++) {
PageRegionInfoResponse t = new PageRegionInfoResponse();
t.setName("鎬诲尯鍩焈"+i);
t.setIndexCode(i+"_code");
@@ -320,7 +338,7 @@
t.getChildList().add(t1);
}
result.add(t);
- }
+ }*/
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
}catch (Exception e){
@@ -336,5 +354,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