From 3f5e885e82953d55cb808624800f302886a11777 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 21 一月 2022 14:10:49 +0800
Subject: [PATCH] 目录默认节点被删除时，重置默认节点为根节点
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 11 +++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 4 ++--
web_src/src/components/dialog/chooseChannelForCatalog.vue | 3 +++
src/main/resources/application-dev.yml | 5 +++++
src/main/resources/application-docker.yml | 5 +++++
5 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index e15853d..b83e70b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -415,7 +415,7 @@
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 @@
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;
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index 4929dad..c486b42 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -407,6 +407,17 @@
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);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 0246161..d0c039c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,4 +1,9 @@
spring:
+ # 涓婁紶鏂囦欢澶у皬闄愬埗
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ max-request-size: 100MB
# REDIS鏁版嵁搴撻厤缃�
redis:
# [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
index 9e48bc5..56efb46 100644
--- a/src/main/resources/application-docker.yml
+++ b/src/main/resources/application-docker.yml
@@ -1,4 +1,9 @@
spring:
+ # 涓婁紶鏂囦欢澶у皬闄愬埗
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ max-request-size: 100MB
# REDIS鏁版嵁搴撻厤缃�
redis:
# [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
index 8446c2a..4e4339f 100644
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -161,6 +161,9 @@
console.log("绉婚櫎鎴愬姛")
node.parent.loaded = false
node.parent.expand();
+ if(this.defaultCatalogId === id) {
+ this.defaultCatalogId = this.platformId;
+ }
}
})
.catch(function (error) {
--
Gitblit v1.8.0