合并主线

648540858

2022-11-18 ecf84bb0f1952c4a044ff6c8aa18226b31593f3f

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

@@ -17,6 +17,7 @@
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -87,7 +88,7 @@
   public void process(RequestEvent evt) {

      try {
         responseAck(getServerTransaction(evt), Response.OK);
         responseAck((SIPRequest) evt.getRequest(), Response.OK);
      } catch (SipException | InvalidArgumentException | ParseException e) {
         logger.error("[回复BYE信息失败]，{}", e.getMessage());
      }
@@ -110,7 +111,7 @@
         if (totalReaderCount <= 0) {
            logger.info("[收到bye] {} 无其它观看者，通知设备停止推流", streamId);
            if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
               Device device = deviceService.queryDevice(sendRtpItem.getDeviceId());
               Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
               if (device == null) {
                  logger.info("[收到bye] {} 通知设备停止推流时未找到设备信息", streamId);
               }