Commit 6dbc7a68bd09a2f8270d42a218d805b44e321117
1 parent
b25f3631
兼容设备通道信息中自己为自己父节点的情况
Showing
1 changed file
with
3 additions
and
0 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
| @@ -298,6 +298,9 @@ public class XmlUtil { | @@ -298,6 +298,9 @@ public class XmlUtil { | ||
| 298 | }else { | 298 | }else { |
| 299 | deviceChannel.setParentId(parentId); | 299 | deviceChannel.setParentId(parentId); |
| 300 | } | 300 | } |
| 301 | + if (deviceChannel.getParentId().equals(deviceChannel.getChannelId())) { | ||
| 302 | + deviceChannel.setParentId(null); | ||
| 303 | + } | ||
| 301 | } | 304 | } |
| 302 | deviceChannel.setBusinessGroupId(businessGroupID); | 305 | deviceChannel.setBusinessGroupId(businessGroupID); |
| 303 | if (channelType.equals(ChannelType.BusinessGroup) || channelType.equals(ChannelType.VirtualOrganization)) { | 306 | if (channelType.equals(ChannelType.BusinessGroup) || channelType.equals(ChannelType.VirtualOrganization)) { |