Merge pull request #1017 from AlphaWu/Zafu-Dev-20230820

648540858

2023-08-21 8fab1ed0e8d6535a1ec68ddb62c2999e0f5ab791

 src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java

old mode 100644
new mode 100755
@@ -114,7 +114,7 @@

        deviceChannel.setRegisterWay(1);

        PlatformCatalog catalog = catalogMapper.select(catalogId);
        PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId);
        if (catalog != null) {
            deviceChannel.setCivilCode(catalog.getCivilCode());
            deviceChannel.setParentId(catalog.getParentId());
@@ -216,7 +216,7 @@
        deviceChannel.setStatus(status != null && status);

        deviceChannel.setRegisterWay(1);
        PlatformCatalog catalog = catalogMapper.select(catalogId);
        PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId);
        if (catalog != null) {
            deviceChannel.setCivilCode(catalog.getCivilCode());
            deviceChannel.setParentId(catalog.getParentId());