修正启动提示错误（UDP误为TCP）

Lawrence

2020-10-19 27a2394115286ed3fce465943d6c8f95cf088769

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java

@@ -2,13 +2,24 @@


import javax.sip.RequestEvent;

import javax.sip.ResponseEvent;

import javax.sip.SipProvider;

import javax.sip.header.CSeqHeader;

import javax.sip.message.Request;

import javax.sip.message.Response;



import com.alibaba.fastjson.JSON;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.stereotype.Component;



import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.auth.RegisterLogicHandler;

import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;

import com.genersoft.iot.vmp.gb28181.event.EventPublisher;

import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;

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

import com.genersoft.iot.vmp.gb28181.transmit.request.impl.AckRequestProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.request.impl.ByeRequestProcessor;

@@ -23,6 +34,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.response.impl.CancelResponseProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.InviteResponseProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.OtherResponseProcessor;

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

import com.genersoft.iot.vmp.utils.SpringBeanFactory;

import com.genersoft.iot.vmp.utils.redis.RedisUtil;



/**    

 * @Description:TODO(这里用一句话描述这个类的作用)   

@@ -32,29 +46,31 @@
@Component

public class SIPProcessorFactory {

   

   @Autowired

   private InviteRequestProcessor inviteRequestProcessor;

   private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);

   

   @Autowired

   private RegisterRequestProcessor registerRequestProcessor;

   private SipConfig sipConfig;

   

   @Autowired

   private SubscribeRequestProcessor subscribeRequestProcessor;

   private RegisterLogicHandler handler;

   

   @Autowired

   private AckRequestProcessor ackRequestProcessor;

   private IVideoManagerStorager storager;

   

   @Autowired

   private ByeRequestProcessor byeRequestProcessor;

   private EventPublisher publisher;

   

   @Autowired

   private CancelRequestProcessor cancelRequestProcessor;

   private SIPCommander cmder;

   

   @Autowired

   private MessageRequestProcessor messageRequestProcessor;

   private RedisUtil redis;

   

   @Autowired

   private OtherRequestProcessor otherRequestProcessor;

   private DeferredResultHolder deferredResultHolder;

	
   @Autowired

   private DeviceOffLineDetector offLineDetector;

   

   @Autowired

   private InviteResponseProcessor inviteResponseProcessor;

@@ -68,27 +84,63 @@
   @Autowired

   private OtherResponseProcessor otherResponseProcessor;

   

   // 注：这里使用注解会导致循环依赖注入，暂用springBean

   private SipProvider tcpSipProvider;

		
   // 注：这里使用注解会导致循环依赖注入，暂用springBean

   private SipProvider udpSipProvider;

   

   public ISIPRequestProcessor createRequestProcessor(RequestEvent evt) {

      Request request = evt.getRequest();

      String method = request.getMethod();

		
//      logger.info("接收到消息："+request.getMethod());

      if (Request.INVITE.equals(method)) {

         return inviteRequestProcessor;

         InviteRequestProcessor processor = new InviteRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         return processor;

      } else if (Request.REGISTER.equals(method)) {

         return registerRequestProcessor;

         RegisterRequestProcessor processor = new RegisterRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         processor.setHandler(handler);

         processor.setPublisher(publisher);

         processor.setSipConfig(sipConfig);

         processor.setVideoManagerStorager(storager);

         return processor;

      } else if (Request.SUBSCRIBE.equals(method)) {

         return subscribeRequestProcessor;

         SubscribeRequestProcessor processor = new SubscribeRequestProcessor();

         processor.setRequestEvent(evt);

         return processor;

      } else if (Request.ACK.equals(method)) {

         return ackRequestProcessor;

         AckRequestProcessor processor = new AckRequestProcessor();

         processor.setRequestEvent(evt);

         return processor;

      } else if (Request.BYE.equals(method)) {

         return byeRequestProcessor;

         ByeRequestProcessor processor = new ByeRequestProcessor();

         processor.setRequestEvent(evt);

         return processor;

      } else if (Request.CANCEL.equals(method)) {

         return cancelRequestProcessor;

         CancelRequestProcessor processor = new CancelRequestProcessor();

         processor.setRequestEvent(evt);

         return processor;

      } else if (Request.MESSAGE.equals(method)) {

         return messageRequestProcessor;



         MessageRequestProcessor processor = new MessageRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         processor.setPublisher(publisher);

         processor.setRedis(redis);

         processor.setDeferredResultHolder(deferredResultHolder);

         processor.setOffLineDetector(offLineDetector);

         processor.setCmder(cmder);

         processor.setStorager(storager);

         return processor;

      } else {

         return otherRequestProcessor;

         return new OtherRequestProcessor();

      }

   }

   

@@ -107,4 +159,18 @@
      }

   }

   

   private SipProvider getTcpSipProvider() {

      if (tcpSipProvider == null) {

         tcpSipProvider = (SipProvider) SpringBeanFactory.getBean("tcpSipProvider");

      }

      return tcpSipProvider;

   }

	
   private SipProvider getUdpSipProvider() {

      if (udpSipProvider == null) {

         udpSipProvider = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");

      }

      return udpSipProvider;

   }

	
}