Commit 6c919937bd02d4289cbaf1fe7f4619c5e79358fa
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
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 { |
| 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的 | ... | ... |