From cde7f6460a563a4e9b2624b395d9bdfe6f90e14c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 01 九月 2023 09:21:05 +0800 Subject: [PATCH] Merge pull request #999 from a24211317/wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java old mode 100644 new mode 100755 index 1d4c355..1f6bb62 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java @@ -813,7 +813,7 @@ if (platformCatalog.getParentId().length() <= 8) { platformCatalog.setCivilCode(platformCatalog.getParentId()); }else { - PlatformCatalog catalog = catalogMapper.select(platformCatalog.getParentId()); + PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platformCatalog.getPlatformId(), platformCatalog.getParentId()); if (catalog != null) { platformCatalog.setCivilCode(catalog.getCivilCode()); } @@ -823,7 +823,7 @@ if (platformCatalog.getParentId().length() <= 8) { platformCatalog.setCivilCode(platformCatalog.getParentId()); }else { - PlatformCatalog catalog = catalogMapper.select(platformCatalog.getParentId()); + PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platformCatalog.getPlatformId(),platformCatalog.getParentId()); if (catalog == null) { logger.warn("[娣诲姞鐩綍] 鏃犳硶鑾峰彇鐩綍{}鐨凜ivilCode鍜孊usinessGroupId", platformCatalog.getPlatformId()); break; @@ -852,7 +852,7 @@ } private PlatformCatalog getTopCatalog(String id, String platformId) { - PlatformCatalog catalog = catalogMapper.selectParentCatalog(id); + PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platformId, id); if (catalog.getParentId().equals(platformId)) { return catalog; }else { @@ -861,27 +861,16 @@ } @Override - public PlatformCatalog getCatalog(String id) { - return catalogMapper.select(id); + public PlatformCatalog getCatalog(String platformId, String id) { + return catalogMapper.selectByPlatFormAndCatalogId(platformId, id); } @Override - public int delCatalog(String id) { - PlatformCatalog platformCatalog = catalogMapper.select(id); - if (platformCatalog.getChildrenCount() > 0) { - List<PlatformCatalog> platformCatalogList = catalogMapper.selectByParentId(platformCatalog.getPlatformId(), platformCatalog.getId()); - for (PlatformCatalog catalog : platformCatalogList) { - if (catalog.getChildrenCount() == 0) { - delCatalogExecute(catalog.getId(), catalog.getPlatformId()); - }else { - delCatalog(catalog.getId()); - } - } - } - return delCatalogExecute(id, platformCatalog.getPlatformId()); + public int delCatalog(String platformId, String id) { + return delCatalogExecute(id, platformId); } private int delCatalogExecute(String id, String platformId) { - int delresult = catalogMapper.del(id); + int delresult = catalogMapper.del(platformId, id); DeviceChannel deviceChannelForCatalog = new DeviceChannel(); if (delresult > 0){ deviceChannelForCatalog.setChannelId(id); @@ -898,7 +887,7 @@ } eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL); } - int delStreamresult = platformGbStreamMapper.delByCatalogId(id); + int delStreamresult = platformGbStreamMapper.delByPlatformAndCatalogId(platformId,id); List<PlatformCatalog> platformCatalogs = platformChannelMapper.queryChannelInParentPlatformAndCatalog(platformId, id); if (platformCatalogs.size() > 0){ List<DeviceChannel> deviceChannelList = new ArrayList<>(); @@ -909,7 +898,7 @@ } eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL); } - int delChannelresult = platformChannelMapper.delByCatalogId(id); + int delChannelresult = platformChannelMapper.delByCatalogId(platformId, id); return delresult + delChannelresult + delStreamresult; } -- Gitblit v1.8.0