临时提交

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);

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);
 

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());