diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipSendFailEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipSendFailEvent.java deleted file mode 100644 index 2e2c54e5c..000000000 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipSendFailEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.genersoft.iot.vmp.gb28181.bean; - -import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; -import lombok.Data; - -@Data -public class SipSendFailEvent extends SipSubscribe.EventResult { - - private String callId; - - private String msg; - - public static SipSendFailEvent getInstance(String callId, String msg){ - SipSendFailEvent sipSendFailEvent = new SipSendFailEvent(); - sipSendFailEvent.setMsg(msg); - sipSendFailEvent.setCallId(callId); - return sipSendFailEvent; - } -} diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java index 22edb7f54..bd966b6f6 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java @@ -1,7 +1,6 @@ package com.genersoft.iot.vmp.gb28181.event; import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent; -import com.genersoft.iot.vmp.gb28181.bean.SipSendFailEvent; import com.genersoft.iot.vmp.gb28181.event.sip.SipEvent; import gov.nist.javax.sip.message.SIPRequest; import gov.nist.javax.sip.message.SIPResponse; @@ -150,12 +149,6 @@ public class SipSubscribe { this.msg = "设备未找到"; this.statusCode = -1024; this.callId = ((DeviceNotFoundEvent) event).getCallId(); - }else if (event instanceof SipSendFailEvent) { - SipSendFailEvent sipSendFailEvent = (SipSendFailEvent) event; - this.type = EventResultType.deviceNotFoundEvent; - this.msg = sipSendFailEvent.getMsg(); - this.statusCode = -1024; - this.callId = ((SipSendFailEvent) event).getCallId(); } } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java index 53cfb86f7..a3d3c4f4d 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java @@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.gb28181.transmit; import com.genersoft.iot.vmp.conf.SipConfig; import com.genersoft.iot.vmp.gb28181.SipLayer; -import com.genersoft.iot.vmp.gb28181.bean.SipSendFailEvent; import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; import com.genersoft.iot.vmp.gb28181.event.sip.SipEvent; import com.genersoft.iot.vmp.gb28181.utils.SipUtils; @@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; -import javax.sip.ResponseEvent; import javax.sip.SipException; import javax.sip.header.CSeqHeader; import javax.sip.header.CallIdHeader; @@ -115,14 +113,9 @@ public class SIPSender { } } }catch (SipException e) { - log.error("[发送信息失败] ", e); - SipSendFailEvent sipSendFailEvent = SipSendFailEvent.getInstance(callIdHeader.getCallId(), e.getMessage()); - SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult<>(sipSendFailEvent); - SipEvent subscribe = sipSubscribe.getSubscribe(key); - subscribe.getErrorEvent().response(eventResult); sipSubscribe.removeSubscribe(key); + throw e; } - } public CallIdHeader getNewCallIdHeader(String ip, String transport) {