From 52e9ec827a905a7a2d9e8a4f05e7186c9fed336a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 九月 2024 10:14:50 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 9 +++++++--
admin/src/views/meeting/rooms.vue | 5 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 1779fdf..b701dc7 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/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>
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 6b9bda1..a9d2dde 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
@@ -143,7 +143,7 @@
String result = hkSyncPushService.dealVisitEventIccm(param,response);
return ApiResponse.success(result);
}
- @ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
+ @ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
@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")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 33ea271..20c3a9f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/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;
}
--
Gitblit v1.9.3