解决循环依赖导致的打包失败

panlinlin

2021-03-25 b37a77f23f995758178b6af38b89a860107d218d

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

@@ -4,7 +4,10 @@
import java.util.Map;



import javax.sip.*;

//import javax.sip.message.Request;

import javax.sip.address.SipURI;

import javax.sip.header.FromHeader;

import javax.sip.header.HeaderAddress;

import javax.sip.header.ToHeader;



import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;

@@ -12,22 +15,16 @@
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;

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



import org.springframework.stereotype.Component;



/**    

 * @Description:ACK请求处理器  

 * @author: swwheihei

 * @date:   2020年5月3日 下午5:31:45     

 */

@Component

public class AckRequestProcessor extends SIPRequestAbstractProcessor {



    //@Autowired

    private IRedisCatchStorage redisCatchStorage;



   //@Autowired

   private ZLMRTPServerFactory zlmrtpServerFactory;





   /**   

    * 处理  ACK请求

@@ -40,15 +37,15 @@
      Dialog dialog = evt.getDialog();

      if (dialog == null) return;

      //DialogState state = dialog.getState();

      if (/*request.getMethod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {

         String remoteUri = dialog.getRemoteParty().getURI().toString();

         String localUri = dialog.getLocalParty().getURI().toString();

         String platformGbId = remoteUri.substring(remoteUri.indexOf(":") + 1, remoteUri.indexOf("@"));

         String channelId = localUri.substring(remoteUri.indexOf(":") + 1, remoteUri.indexOf("@"));

      if (/*request.getMecodewwthod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {

         String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();

         String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();

         SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(platformGbId, channelId);

         String is_Udp = sendRtpItem.isTcp() ? "0" : "1";

         String deviceId = sendRtpItem.getDeviceId();

         StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);

         sendRtpItem.setStreamId(streamInfo.getStreamId());

         redisCatchStorage.updateSendRTPSever(sendRtpItem);

         System.out.println(platformGbId);

         System.out.println(channelId);

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

@@ -68,11 +65,16 @@
               if (System.currentTimeMillis() - startTime < 30 * 1000) {

                  if (zlmrtpServerFactory.isRtpReady(streamInfo.getStreamId())) {

                     rtpPushed = true;

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

                     zlmrtpServerFactory.startSendRtpStream(param);

                  } else {

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

                     Thread.sleep(2000);

                     continue;

                  }

               } else {

                  rtpPushed = true;

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

               }

            } catch (InterruptedException e) {

               e.printStackTrace();

@@ -108,5 +110,4 @@
   public void setZlmrtpServerFactory(ZLMRTPServerFactory zlmrtpServerFactory) {

      this.zlmrtpServerFactory = zlmrtpServerFactory;

   }



}