优化引起误解的日志

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

@@ -99,7 +99,7 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In
 		}
 		// tcp主动时，此时是级联下级平台，在回复200ok时，本地已经请求zlm开启监听，跳过下面步骤
 		if (sendRtpItem.isTcpActive()) {
-			log.info("收到ACK，rtp/{} TCP主动方式后续处理", sendRtpItem.getStream());
+			log.info("收到ACK，rtp/{} TCP主动方式等收到上级连接后开始发流", sendRtpItem.getStream());
 			return;
 		}
 		MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());

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

@@ -4,12 +4,10 @@ import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.service.*;
 import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
-import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
 import com.genersoft.iot.vmp.gb28181.session.SipInviteSessionManager;
 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
@@ -17,12 +15,9 @@ import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
 import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
 import com.genersoft.iot.vmp.media.bean.MediaServer;
-import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
 import com.genersoft.iot.vmp.media.service.IMediaServerService;
-import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
 import com.genersoft.iot.vmp.service.ISendRtpServerService;
 import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
-import com.genersoft.iot.vmp.service.redisMsg.RedisPushStreamResponseListener;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import gov.nist.javax.sdp.TimeDescriptionImpl;
 import gov.nist.javax.sdp.fields.TimeField;
@@ -34,7 +29,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.sdp.*;
@@ -44,7 +38,6 @@ import javax.sip.SipException;
 import javax.sip.header.CallIdHeader;
 import javax.sip.message.Response;
 import java.text.ParseException;
-import java.time.Instant;
 import java.util.List;
 import java.util.Vector;
 
@@ -82,12 +75,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
     @Autowired
     private IMediaServerService mediaServerService;
 
-    @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
-
-    @Autowired
-    private SSRCFactory ssrcFactory;
-
     @Autowired
     private DynamicTask dynamicTask;
 
@@ -100,27 +87,15 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
     @Autowired
     private AudioBroadcastManager audioBroadcastManager;
 
-    @Autowired
-    private HookSubscribe hookSubscribe;
-
     @Autowired
     private SIPProcessorObserver sipProcessorObserver;
 
-    @Autowired
-    private UserSetting userSetting;
-
     @Autowired
     private SipConfig config;
 
     @Autowired
     private SipInviteSessionManager sessionManager;
 
-    @Autowired
-    private SendRtpPortManager sendRtpPortManager;
-
-    @Autowired
-    private RedisPushStreamResponseListener redisPushStreamResponseListener;
-
 
     @Override
     public void afterPropertiesSet() throws Exception {
@@ -223,7 +198,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                                 sendBye(platform, inviteInfo.getCallId());
                             }
                         }
-
                     }
                 }));
             }
@@ -287,16 +261,11 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
         // 如果是录像回放，则会存在录像的开始时间与结束时间
         Long startTime = null;
         Long stopTime = null;
-        Instant start = null;
+        if (sdp.getTimeDescriptions(false) != null && !sdp.getTimeDescriptions(false).isEmpty()) {
-        Instant end = null;
-        if (sdp.getTimeDescriptions(false) != null && sdp.getTimeDescriptions(false).size() > 0) {
             TimeDescriptionImpl timeDescription = (TimeDescriptionImpl) (sdp.getTimeDescriptions(false).get(0));
             TimeField startTimeFiled = (TimeField) timeDescription.getTime();
             startTime = startTimeFiled.getStartTime();
             stopTime = startTimeFiled.getStopTime();
-
-            start = Instant.ofEpochSecond(startTime);
-            end = Instant.ofEpochSecond(stopTime);
         }
         //  获取支持的格式
         Vector mediaDescriptions = sdp.getMediaDescriptions(true);
@@ -338,13 +307,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
         inviteInfo.setTcpActive(tcpActive != null? tcpActive: false);
         inviteInfo.setStartTime(startTime);
         inviteInfo.setStopTime(stopTime);
-        String username = sdp.getOrigin().getUsername();
-//        String addressStr;
-//        if(StringUtils.isEmpty(platform.getSendStreamIp())){
-//            addressStr = sdp.getConnection().getAddress();
-//        }else {
-//            addressStr = platform.getSendStreamIp();
-//        }
 
         Vector sdpMediaDescriptions = sdp.getMediaDescriptions(true);
         MediaDescription mediaDescription = null;