合并主线

648540858

2022-10-17 f6320c7dd3dfd25e98bb63f41d79a33af5009a93

 src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.event;

import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent;
import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
@@ -10,6 +11,7 @@
import javax.sip.*;
import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
import java.text.ParseException;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,8 +58,7 @@
        logger.debug("errorSubscribes.size:{}",errorSubscribes.size());
    }

    public interface Event {
        void response(EventResult eventResult);
    public interface Event { void response(EventResult eventResult);
    }

    /**
@@ -81,18 +82,13 @@
        public EventResultType type;
        public String msg;
        public String callId;
        public Dialog dialog;
        public EventObject event;

        public EventResult() {
        }

        public EventResult(EventObject event) {
            this.event = event;
            if (event instanceof ResponseEvent) {
                ResponseEvent responseEvent = (ResponseEvent)event;
                Response response = responseEvent.getResponse();
                this.dialog = responseEvent.getDialog();
                this.type = EventResultType.response;
                if (response != null) {
                    this.msg = response.getReasonPhrase();
@@ -127,12 +123,10 @@
                this.statusCode = -1024;
                this.callId = dialogTerminatedEvent.getDialog().getCallId().getCallId();
            }else if (event instanceof DeviceNotFoundEvent) {
                DeviceNotFoundEvent deviceNotFoundEvent = (DeviceNotFoundEvent)event;
                this.type = EventResultType.deviceNotFoundEvent;
                this.msg = "设备未找到";
                this.statusCode = -1024;
                this.dialog = deviceNotFoundEvent.getDialog();
                this.callId = this.dialog != null ?deviceNotFoundEvent.getDialog().getCallId().getCallId() : null;
                this.callId = ((DeviceNotFoundEvent) event).getCallId();
            }
        }
    }