From 2c1dbe63de3d370d0b0f20fea474326e88b9ca23 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 10 三月 2021 14:39:40 +0800
Subject: [PATCH] 增加接收Bye请求后停止向上级推流功能
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
index 031fb09..ef617a6 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.vmanager.platform;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
@@ -17,10 +16,6 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
-
-import java.util.List;
-import java.util.Map;
-
@CrossOrigin
@RestController
@@ -110,7 +105,7 @@
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
}
- if (StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+ if (StringUtils.isEmpty(parentPlatform.getServerGBId())
){
return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
}
@@ -118,14 +113,14 @@
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
commanderForPlatform.unregister(parentPlatform, (event -> {
// 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
}), (event -> {
// 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
}));
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
--
Gitblit v1.8.0