From 72b4263800a376a998455d4ef11ed2321282a1e9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 22 十二月 2023 17:21:30 +0800 Subject: [PATCH] 海康接口对接开发 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java index 6e24bd8..a0f5433 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java @@ -179,7 +179,7 @@ model.setManufature(device.getManufacturer()); model.setType(Constants.ZERO); // model.setNo(device.getDevSerialNum()); - model.setChannelNo(getChannelNo(device.getIndexCode(),hkDoorList)); + model.setChannelNo(getChannelNo(device.getIndexCode(),hkDoorList,model)); model.setResourceType(device.getResourceType()); model.setDevTypeCode(device.getDevTypeCode()); model.setManufature(device.getManufacturer()); @@ -188,8 +188,9 @@ return model; } - private String getChannelNo(String indexCode, List<DoorsInfoResponse> hkDoorList) { + private String getChannelNo(String indexCode, List<DoorsInfoResponse> hkDoorList,Device model ) { String str = ""; + String names = ""; if(hkDoorList!=null && hkDoorList.size()>0){ for(DoorsInfoResponse info : hkDoorList){ if(StringUtils.equals(indexCode,info.getParentIndexCode())){ @@ -198,11 +199,15 @@ } if(StringUtils.isNotBlank(str)){ str += ","; + names += ","; } str+=info.getChannelNo(); + names+=info.getName(); } } } + model.setChannelNo(str); + model.setChannelInfo(names); return str; } -- Gitblit v1.9.3