admin/src/views/meeting/rooms.vue
@@ -45,6 +45,11 @@ @selection-change="handleSelectionChange" > <!-- <el-table-column type="selection" width="55"></el-table-column> --> <el-table-column prop="id" label="唯一标识" align="center" min-width="80px" show-overflow-tooltip> <template slot-scope="{row}"> <span class="long-title-style">{{ row.id }}</span> </template> </el-table-column> <el-table-column prop="name" label="会议室名称" align="center" min-width="120px" show-overflow-tooltip> <template slot-scope="{row}"> <span class="long-title-style">{{ row.name }}</span> server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -143,7 +143,7 @@ String result = hkSyncPushService.dealVisitEventIccm(param,response); return ApiResponse.success(result); } @ApiOperation("【海康】访客ICCM事件订阅推送对接处理接口") @ApiOperation("【海康】测试LED显示屏") @PostMapping("/testLed") @LoginNoRequired public ApiResponse<BaseResponse> testLed(@RequestBody TransparentChannelBodyRequest request, HttpServletResponse response) { @@ -151,9 +151,14 @@ head.setAbility("cld");//固定值 head.setTreatyType("haixuan_led_net");//固定值 head.setDeviceIndexCode("6a5498e9df924befbb9530e467e5e809"); HKService.transparentchannel(head,request); return ApiResponse.success(HKService.transparentchannel(head,request)); } @ApiOperation("【海康】测试广播播报") @PostMapping("/testBroadcast") @LoginNoRequired public ApiResponse<BaseResponse> testBroadcast(@RequestBody CustomBroadcastRequest request, HttpServletResponse response) { return ApiResponse.success( HKService.customBroadcast(request)); } // @PreventRepeat @ApiOperation("【海康】停车场事件订阅推送对接处理接口") @PostMapping("/push/parks") server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -692,7 +692,7 @@ private boolean isDeletedLedDevice(Device device, List<LedRecordsInfoResponse> allHkList) { if(allHkList.size()>0){ for(LedRecordsInfoResponse r : allHkList){ if(StringUtils.equals(device.getDoorId(), r.getModel_data_id())){ if(StringUtils.equals(device.getHkId(), r.getModel_data_id())){ //表示未删除 return false; } @@ -704,7 +704,7 @@ private boolean isDeletedBroadcastDevice(Device device, List<FetchAudioChannelInfoResponse> allHkList) { if(allHkList.size()>0){ for(FetchAudioChannelInfoResponse r : allHkList){ if(StringUtils.equals(device.getDoorId(), r.getAudioChannelIndexCode())){ if(StringUtils.equals(device.getHkId(), r.getAudioChannelIndexCode())){ //表示未删除 return false; }