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

648540858

2022-03-25 e9586687f735c4fbca5111e991f9074dc6642bf7

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java

@@ -89,7 +89,7 @@
                    deviceChannel.setParental(1);
                    deviceChannel.setParentId(catalog.getParentId());
                    deviceChannel.setRegisterWay(1);
                    deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2));
                    deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
                    deviceChannel.setModel("live");
                    deviceChannel.setOwner("wvp-pro");
                    deviceChannel.setSecrecy("0");
@@ -128,7 +128,7 @@
                    deviceChannel.setStatus(gbStream.isStatus()?1:0);
                    deviceChannel.setParentId(gbStream.getCatalogId());
                    deviceChannel.setRegisterWay(1);
                    deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2));
                    deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
                    deviceChannel.setModel("live");
                    deviceChannel.setOwner("wvp-pro");
                    deviceChannel.setParental(0);