Commit 74365144aa5f8ea941ba8d4d0c4185ef584eff46

Authored by 648540858
Committed by GitHub
2 parents ddfe4a7b 072e84db

Merge pull request #527 from BradyXs/wvp-28181-2.0

fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
... ... @@ -255,6 +255,8 @@ public class XmlUtil {
255 255 }else if (deviceChannel.getChannelId().length() == 20) {
256 256 if (Integer.parseInt(deviceChannel.getChannelId().substring(10, 13)) == 216) { // 虚拟组织
257 257 deviceChannel.setParentId(businessGroupID);
  258 + }else if (Integer.parseInt(device.getDeviceId().substring(10, 13) )== 118) {//NVR 如果上级设备编号是NVR则直接将NVR的编号设置给通道的上级编号
  259 + deviceChannel.setParentId(device.getDeviceId());
258 260 }else if (deviceChannel.getCivilCode() != null) {
259 261 // 设备, 无parentId的20位是使用CivilCode表示上级的设备,
260 262 // 注:215 业务分组是需要有parentId的
... ...