From 810b07cd238377e7a18e523cfe2094d8a3272ab8 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期日, 24 十二月 2023 23:03:36 +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