From af2a56b525dd3b015b34446a2af3e3af3467cd75 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 13:48:20 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
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 5ee45e1..3ab1b89 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
@@ -557,8 +557,12 @@
model.setChannelNo(device.getChannelNo());
model.setChannelInfo(device.getChannelType());
model.setResourceType(device.getAudioChannelType());
+ model.setIp(device.getIp());
+ model.setPort(device.getPort());
+ model.setDoorId(device.getParentDevIndexCode());
model.setStatus(device.getState());
model.setRegionName(device.getRegionName());
+ model.setRemark(JSONObject.toJSONString(device));
return model;
}
private Device initBroadcastDeviceDataByHkData(Device model, FetchAudioDeviceInfoResponse device, Date date) {
@@ -567,13 +571,17 @@
model.setHkId(device.getDeviceIndexCode());
model.setName(device.getDeviceName());
model.setHkStatus(Constants.ONE);
- model.setType(Constants.THREE);
- model.setChannelNo(device.getDeviceCode());
- model.setChannelInfo(device.getDeviceType());
+ model.setType(Constants.FOUR);
+ model.setIp(device.getIp());
+ model.setPort(device.getPort());
+// model.setChannelInfo(device.getDeviceType());
model.setResourceType(device.getDeviceType());
model.setStatus(Constants.ZERO);
model.setRemark(device.getDesc());
model.setRegionName(device.getRegionIndexCode());
+ if(device.getChannels()!=null &&device.getChannels().size()>0){
+ model.setRegionPathName(device.getChannels().get(0).getRegionName());
+ }
return model;
}
private Device initDoorDataByHkData(Device model, DoorsInfoResponse door, Date date, List<AcsDeviceInfoResponse> allHkList) {
--
Gitblit v1.9.3