From 0631137a90901f2e09a971fbf422ef476edb1c4e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 09:58:21 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 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 50f1434..37a5584 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
@@ -116,7 +116,7 @@
//鍚屾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)){
//鍚屾骞挎挱
@@ -320,49 +320,28 @@
@PostMapping("/regionList")
public ApiResponse<List<PageRegionInfoResponse> > getRegionList(HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ){
CarmeraListVO param =new CarmeraListVO();
- param.setWithCameras(1);
+ param.setWithCameras(0);
List<PageRegionInfoResponse> result = new ArrayList<>();
try {
- result = boardService.getRegionTree( param);
-
- }catch (Exception e){
-
- }
- if(result.size()==0){
+// result = boardService.getRegionTree( param);
//------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);
}
@@ -377,12 +356,7 @@
}
@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) {
+ public ApiResponse<List<Map<String,Object>>> setBroadcaseBobao(@RequestBody Device body , HttpServletResponse response) {
deviceService.setBroadcaseBobao(body);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3