XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

目录默认节点被删除时，重置默认节点为根节点

Browse Source
This commit is contained in:
648540858
2022-01-21 14:10:49 +08:00
parent 7d88827415
commit 3f5e885e82
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
View File

@@ -415,7 +415,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
Request request = headerProviderPlarformProvider.createNotifyRequest(parentPlatform, catalogXml.toString(), subscribeInfo.getToTag(), subscribeInfo.getFromTag(), callIdHeader);
transmitRequest(parentPlatform, request);
Thread.sleep(100);
Thread.sleep(10);
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
return false;
@@ -459,7 +459,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
Request request = headerProviderPlarformProvider.createNotifyRequest(parentPlatform, catalogXml.toString(), subscribeInfo.getToTag(), subscribeInfo.getFromTag(), callIdHeader);
transmitRequest(parentPlatform, request);
Thread.sleep(100);
Thread.sleep(200);
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
return false;

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

@@ -407,6 +407,17 @@ public class PlatformController {
if (logger.isDebugEnabled()) {
logger.debug("删除目录,{}", id);
}
// 如果删除的是默认目录则根目录设置为默认目录
PlatformCatalog catalog = storager.getCatalog(id);
if (catalog != null) {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(catalog.getPlatformId());
if (parentPlatform != null) {
if (id.equals(parentPlatform.getCatalogId())) {
storager.setDefaultCatalog(parentPlatform.getServerGBId(), parentPlatform.getServerGBId());
}
}
}
int delResult = storager.delCatalog(id);
WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
result.setCode(0);