Pre Merge pull request !42 from 樊冲/fix-bug-fanchong

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java

@@ -13,6 +13,7 @@ import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.ObjectUtils;
 
 import javax.sip.*;
@@ -30,10 +31,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-/**    
+/**
  * @description:处理接收IPCamera发来的SIP协议请求消息
  * @author: songww
- * @date:   2020年5月3日 下午4:42:22     
+ * @date:   2020年5月3日 下午4:42:22
  */
 @Slf4j
 public abstract class SIPRequestProcessorParent {
@@ -77,6 +78,11 @@ public abstract class SIPRequestProcessorParent {
 		return responseAck(sipRequest, statusCode, null);
 	}
 
+	@Async("taskExecutor")
+	public void responseAckAsync(SIPRequest sipRequest, int statusCode) throws SipException, InvalidArgumentException, ParseException {
+		responseAck(sipRequest, statusCode, null);
+	}
+
 	public SIPResponse responseAck(SIPRequest sipRequest, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
 		return responseAck(sipRequest, statusCode, msg, null);
 	}

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

@@ -217,7 +217,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                         if (sendRtpItem.isTcpActive()) {
                             MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                             try {
-                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5);
+                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5*1000);
                                 DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(sendRtpItem.getChannelId());
                                 if (deviceChannel != null) {
                                     redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java

@@ -96,7 +96,7 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp
             RequestEvent evt = sipMsgInfo.getEvt();
             // 回复200 OK
             try {
-                responseAck((SIPRequest) evt.getRequest(), Response.OK);
+                responseAckAsync((SIPRequest) evt.getRequest(), Response.OK);
             } catch (SipException | InvalidArgumentException | ParseException e) {
                 log.error("[命令发送失败] 心跳回复: {}", e.getMessage());
             }