修复国标设备/设备列表中业务分组的子节点查看

This commit is contained in:
648540858
2024-10-22 17:21:08 +08:00
parent 4c497ef411
commit 53f2f36f37
7 changed files with 23 additions and 26 deletions

View File

@@ -222,7 +222,7 @@ public class SIPCommanderForPlatform implements ISIPCommanderForPlatform {
}
private void sendCatalogResponse(List<CommonGBChannel> channels, Platform parentPlatform, String sn, String fromTag, int index, boolean sendAfterResponse) throws SipException, InvalidArgumentException, ParseException {
if (index >= channels.size()) {
if (index > channels.size()) {
return;
}
List<CommonGBChannel> deviceChannels;
@@ -231,6 +231,9 @@ public class SIPCommanderForPlatform implements ISIPCommanderForPlatform {
}else {
deviceChannels = channels.subList(index, channels.size());
}
if(deviceChannels.isEmpty()) {
return;
}
String catalogXml = getCatalogXml(deviceChannels, sn, parentPlatform, channels.size());
// callid
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
@@ -280,7 +283,7 @@ public class SIPCommanderForPlatform implements ISIPCommanderForPlatform {
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 国标级联 目录查询回复: {}", e.getMessage());
}
}, 30);
}, 100);
}
}

View File

@@ -140,6 +140,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
// 业务分组/虚拟组织
Group group = Group.getInstance(channel);
if (group != null) {
channel.setParental(1);
channel.setChannelType(2);
groupList.add(group);
}