Commit 49e937c39637c897cccf430de85af33942887a29

Authored by 648540858
1 parent 28f4f688

修复invite超时任务的设置

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -915,7 +915,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -915,7 +915,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
915 } 915 }
916 if (device != null) { 916 if (device != null) {
917 logger.info("收到设备" + requesterId + "的语音广播Invite请求"); 917 logger.info("收到设备" + requesterId + "的语音广播Invite请求");
918 - String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + request.getCallIdHeader().getCallId(); 918 + String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + device.getDeviceId() + audioBroadcastCatch.getChannelId();
919 dynamicTask.stop(key); 919 dynamicTask.stop(key);
920 try { 920 try {
921 responseAck(request, Response.TRYING); 921 responseAck(request, Response.TRYING);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
@@ -71,7 +71,7 @@ public class BroadcastResponseMessageHandler extends SIPRequestProcessorParent i @@ -71,7 +71,7 @@ public class BroadcastResponseMessageHandler extends SIPRequestProcessorParent i
71 audioBroadcastCatch.setStatus(AudioBroadcastCatchStatus.WaiteInvite); 71 audioBroadcastCatch.setStatus(AudioBroadcastCatchStatus.WaiteInvite);
72 audioBroadcastManager.update(audioBroadcastCatch); 72 audioBroadcastManager.update(audioBroadcastCatch);
73 // 等待invite消息, 超时则结束 73 // 等待invite消息, 超时则结束
74 - String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + request.getCallIdHeader().getCallId(); 74 + String key = VideoManagerConstants.BROADCAST_WAITE_INVITE + device.getDeviceId() + channelId;
75 dynamicTask.startDelay(key, ()->{ 75 dynamicTask.startDelay(key, ()->{
76 logger.info("[语音广播]等待invite消息超时:{}/{}", device.getDeviceId(), channelId); 76 logger.info("[语音广播]等待invite消息超时:{}/{}", device.getDeviceId(), channelId);
77 playService.stopAudioBroadcast(device.getDeviceId(), channelId); 77 playService.stopAudioBroadcast(device.getDeviceId(), channelId);