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

648540858

2022-07-03 e78c402a248ff252ee93e724396c62d806087fab

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java

@@ -312,7 +312,7 @@
               }else {
                  event = eventElement.getText().toUpperCase();
               }
               DeviceChannel channel = XmlUtil.channelContentHander(itemDevice);
               DeviceChannel channel = XmlUtil.channelContentHander(itemDevice, device);
               channel.setDeviceId(device.getDeviceId());
               logger.info("[收到 目录订阅]：{}/{}", device.getDeviceId(), channel.getChannelId());
               switch (event) {