修复订阅清理请示任务的执行时长

648540858

2021-11-03 b445128fb5bdc24f6703e7a40e9fd9f40919baf2

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

@@ -13,7 +13,11 @@
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;

import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;

import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



/**    

 * @Description:ACK请求处理器  

@@ -22,9 +26,13 @@
 */

public class AckRequestProcessor extends SIPRequestAbstractProcessor {



   private Logger logger = LoggerFactory.getLogger(AckRequestProcessor.class);



    private IRedisCatchStorage redisCatchStorage;



   private ZLMRTPServerFactory zlmrtpServerFactory;



   private IMediaServerService mediaServerService;



   /**   

    * 处理  ACK请求

@@ -55,8 +63,8 @@
         }



         redisCatchStorage.updateSendRTPSever(sendRtpItem);

         System.out.println(platformGbId);

         System.out.println(channelId);

         logger.info(platformGbId);

         logger.info(channelId);

         Map<String, Object> param = new HashMap<>();

         param.put("vhost","__defaultVhost__");

         param.put("app",streamInfo.getApp());

@@ -72,18 +80,22 @@
         while (!rtpPushed) {

            try {

               if (System.currentTimeMillis() - startTime < 30 * 1000) {

                  if (zlmrtpServerFactory.isStreamReady(streamInfo.getApp(), streamInfo.getStreamId())) {

                  MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());

                  if (zlmrtpServerFactory.isStreamReady(mediaInfo, streamInfo.getApp(), streamInfo.getStreamId())) {

                     rtpPushed = true;

                     System.out.println("已获取设备推流，开始向上级推流");

                     zlmrtpServerFactory.startSendRtpStream(param);

                     logger.info("已获取设备推流[{}/{}]，开始向上级推流[{}:{}]",

                           streamInfo.getApp() ,streamInfo.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort());

                     zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);

                  } else {

                     System.out.println("等待设备推流.......");

                     logger.info("等待设备推流[{}/{}].......",

                           streamInfo.getApp() ,streamInfo.getStreamId());

                     Thread.sleep(1000);

                     continue;

                  }

               } else {

                  rtpPushed = true;

                  System.out.println("设备推流超时，终止向上级推流");

                  logger.info("设备推流[{}/{}]超时，终止向上级推流",

                        streamInfo.getApp() ,streamInfo.getStreamId());

               }

            } catch (InterruptedException e) {

               e.printStackTrace();

@@ -95,7 +107,7 @@
      //    CSeq csReq = (CSeq) request.getHeader(CSeq.NAME);

      //    ackRequest = dialog.createAck(csReq.getSeqNumber());

      //    dialog.sendAck(ackRequest);

      //    System.out.println("send ack to callee:" + ackRequest.toString());

      //    logger.info("send ack to callee:" + ackRequest.toString());

      // } catch (SipException e) {

      //    e.printStackTrace();

      // } catch (InvalidArgumentException e) {

@@ -119,4 +131,12 @@
   public void setZlmrtpServerFactory(ZLMRTPServerFactory zlmrtpServerFactory) {

      this.zlmrtpServerFactory = zlmrtpServerFactory;

   }



   public IMediaServerService getMediaServerService() {

      return mediaServerService;

   }



   public void setMediaServerService(IMediaServerService mediaServerService) {

      this.mediaServerService = mediaServerService;

   }

}