From c5f2aba9b20089f184ce175b58a33a881ea9e0b1 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Fri, 16 Apr 2021 18:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=B5=81=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E5=85=B3=E9=97=AD=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=85=B3=E9=97=AD=E6=B5=81=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/session/VideoStreamSessionManager.java    | 1 +
 .../iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java       | 3 ++-
 .../iot/vmp/vmanager/gb28181/play/PlayController.java         | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
index 360472fb..b6c0dfc4 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -44,5 +44,6 @@ public class VideoStreamSessionManager {
 		sessionMap.remove(deviceId + "_" + channelId);
 		SsrcUtil.releaseSsrc(ssrcMap.get(deviceId + "_" + channelId));
 		ssrcMap.remove(deviceId + "_" + channelId);
+		streamIdMap.remove(deviceId + "_" + channelId);
 	}
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index e0d0bf30..4263a787 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -581,8 +581,9 @@ public class SIPCommander implements ISIPCommander {
 			if (transaction == null) {
 				StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
 				if (streamInfo != null) {
-
+					redisCatchStorage.stopPlay(streamInfo);
 				}
+				okEvent.response(null);
 				return;
 			}
 			
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index f9b6a35d..3d4c64c0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -99,8 +99,8 @@ public class PlayController {
 			StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
 			if (streamInfo == null) {
 				RequestMessage msg = new RequestMessage();
-				msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
-				msg.setData("streamId not found");
+				msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
+				msg.setData("点播未找到");
 				resultHolder.invokeResult(msg);
 			}else {
 				redisCatchStorage.stopPlay(streamInfo);