Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

mk1990
2 parents 9bb61a70 1e105fb6
Showing 1 changed file with 2 additions and 0 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -255,6 +255,8 @@ public class XmlUtil {
             }else if (deviceChannel.getChannelId().length() == 20) {
                 if (Integer.parseInt(deviceChannel.getChannelId().substring(10, 13)) == 216) { // 虚拟组织
                     deviceChannel.setParentId(businessGroupID);
+                }else if (Integer.parseInt(device.getDeviceId().substring(10, 13) )== 118) {//NVR 如果上级设备编号是NVR则直接将NVR的编号设置给通道的上级编号
+                    deviceChannel.setParentId(device.getDeviceId());
                 }else if (deviceChannel.getCivilCode() != null) {
                     // 设备， 无parentId的20位是使用CivilCode表示上级的设备，
                     // 注：215 业务分组是需要有parentId的