Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

xu-bin-bin

2023-08-31 e46f1ae9150028b794a9519dda7d66bf77a486c2

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java

old mode 100644
new mode 100755
@@ -403,8 +403,12 @@
        if (platform == null) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "平台未找到");
        }
        if (platformId.equals(parentId)) {
            parentId = platform.getDeviceGBId();
//        if (platformId.equals(parentId)) {
//            parentId = platform.getDeviceGBId();
//        }

        if (platformId.equals(platform.getDeviceGBId())) {
            parentId = null;
        }

        return storager.getChildrenCatalogByPlatform(platformId, parentId);
@@ -424,7 +428,7 @@
        if (logger.isDebugEnabled()) {
            logger.debug("添加目录,{}", JSON.toJSONString(platformCatalog));
        }
        PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
        PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());

        if (platformCatalogInStore != null) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " already exists");
@@ -449,7 +453,7 @@
        if (logger.isDebugEnabled()) {
            logger.debug("编辑目录,{}", JSON.toJSONString(platformCatalog));
        }
        PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
        PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());

        if (platformCatalogInStore == null) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " not exists");
@@ -482,7 +486,7 @@
            throw new ControllerException(ErrorCode.ERROR400);
        }

        int delResult = storager.delCatalog(id);
        int delResult = storager.delCatalog(platformId, id);
        // 如果删除的是默认目录则根目录设置为默认目录
        PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);