From 4597fb197db560ee1bfb1f3c63e06f28c92b5c8e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 4 Sep 2024 10:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transmit/event/request/impl/ByeRequestProcessor.java     | 5 +++--
 .../com/genersoft/iot/vmp/storager/IRedisCatchStorage.java   | 2 +-
 .../iot/vmp/storager/impl/RedisCatchStorageImpl.java         | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
index 948bcbc9..501a39fa 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
@@ -116,7 +116,8 @@ public class ByeRequestProcessor extends SIPRequestProcessorParent implements In
 
 		// 收流端发送的停止
 		if (sendRtpItem != null){
-			log.info("[收到bye] 来自{}，停止通道：{}, 类型： {}, callId: {}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getPlayType(), callIdHeader.getCallId());
+			CommonGBChannel channel = channelService.getOne(sendRtpItem.getChannelId());
+			log.info("[收到bye] 来自{}，停止通道：{}, 类型： {}, callId: {}", sendRtpItem.getPlatformId(), channel.getGbDeviceId(), sendRtpItem.getPlayType(), callIdHeader.getCallId());
 
 			String streamId = sendRtpItem.getStream();
 			log.info("[收到bye] 停止推流：{}, 媒体节点： {}", streamId, sendRtpItem.getMediaServerId());
@@ -125,7 +126,7 @@ public class ByeRequestProcessor extends SIPRequestProcessorParent implements In
 				// 不是本平台的就发送redis消息让其他wvp停止发流
 				Platform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
 				if (platform != null) {
-					redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform);
+					redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform, channel);
 					if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
 						redisRpcService.stopSendRtp(sendRtpItem.getRedisKey());
 						redisCatchStorage.deleteSendRTPServer(null, null, sendRtpItem.getCallId(), null);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index f0007475..8a5e11ae 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -210,7 +210,7 @@ public interface IRedisCatchStorage {
 
     void sendPlatformStartPlayMsg(SendRtpItem sendRtpItem, Platform platform);
 
-    void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, Platform platform);
+    void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, Platform platform, CommonGBChannel channel);
 
     void addPushListItem(String app, String stream, MediaInfo param);
 
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index 247eadf4..776ee6ea 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -675,10 +675,10 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
     }
 
     @Override
-    public void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, Platform platform) {
+    public void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, Platform platform, CommonGBChannel channel) {
 
         MessageForPushChannel msg = MessageForPushChannel.getInstance(0,
-                sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getChannelId(),
+                sendRtpItem.getApp(), sendRtpItem.getStream(), channel.getGbDeviceId(),
                 sendRtpItem.getPlatformId(), platform.getName(), userSetting.getServerId(), sendRtpItem.getMediaServerId());
         msg.setPlatFormIndex(platform.getId());