XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复上级播放后未发送redis通知的BUG

Browse Source
This commit is contained in:
lin
2025-11-08 07:24:45 +08:00
parent 2de8db731c
commit 869953b08d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
View File

@@ -140,17 +140,17 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
}
return;
}
log.info("[上级Invite] 平台：{}， 通道：{}({}), 收流地址：{}:{}，收流方式：{}, 点播类型：{}, ssrc：{}",
log.info("[上级INVITE] 平台：{}， 通道：{}({}), 收流地址：{}:{}，收流方式：{}, 点播类型：{}, SSRC：{}",
platform.getName(), channel.getGbName(), channel.getGbDeviceId(), inviteInfo.getIp(),
inviteInfo.getPort(), inviteInfo.isTcp()?(inviteInfo.isTcpActive()?"TCP主动":"TCP被动"): "UDP",
inviteInfo.getSessionName(), inviteInfo.getSsrc());
if(!userSetting.getUseCustomSsrcForParentInvite() && ObjectUtils.isEmpty(inviteInfo.getSsrc())) {
log.warn("[上级INVITE] 点播失败, 上级为携带SSRC, 并且本级未设置使用自定义ssrc");
log.warn("[上级INVITE] 点播失败, 上级未携带SSRC, 并且本级未设置使用自定义SSRC");
// 通道存在，发100，TRYING
try {
responseAck(request, Response.BAD_REQUEST);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 上级Invite TRYING: {}", e.getMessage());
log.error("[命令发送失败] 上级INVITE TRYING: {}", e.getMessage());
}
return;
}
@@ -158,7 +158,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
try {
responseAck(request, Response.TRYING);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 上级Invite TRYING: {}", e.getMessage());
log.error("[命令发送失败] 上级INVITE TRYING: {}", e.getMessage());
}
channelPlayService.startInvite(channel, inviteInfo, platform, ((code, msg, streamInfo) -> {
@@ -166,7 +166,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
try {
responseAck(request, Response.BUSY_HERE , msg);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 上级Invite 点播失败: {}", e.getMessage());
log.error("[命令发送失败] 上级INVITE 点播失败: {}", e.getMessage());
}
}else {
// 点播成功， TODO 可以在此处检测cancel命令是否存在，存在则不发送
@@ -208,7 +208,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
try {
responseSdpAck(request, content, platform);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 上级Invite 发送 200（SDP）: {}", e.getMessage());
log.error("[命令发送失败] 上级INVITE 发送 200（SDP）: {}", e.getMessage());
}
// tcp主动模式，回复sdp后开启监听
@@ -221,7 +221,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);
}
}catch (ControllerException e) {
log.warn("[上级Invite] tcp主动模式 发流失败", e);
log.warn("[上级INVITE] tcp主动模式 发流失败", e);
sendBye(platform, inviteInfo.getCallId());
}
}
@@ -400,7 +400,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
}
cmderFroPlatform.streamByeCmd(platform, sendRtpItem, channel);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 上级Invite 发送BYE: {}", e.getMessage());
log.error("[命令发送失败] 上级INVITE 发送BYE: {}", e.getMessage());
}
}

2
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
View File

@@ -428,7 +428,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
@Override
public void sendPlatformStartPlayMsg(SendRtpInfo sendRtpItem, DeviceChannel channel, Platform platform) {
if (sendRtpItem.getPlayType() == InviteStreamType.PUSH && platform != null) {
if (platform != null) {
MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0, sendRtpItem.getApp(), sendRtpItem.getStream(),
channel.getDeviceId(), platform.getServerGBId(), platform.getName(), userSetting.getServerId(),
sendRtpItem.getMediaServerId());