From b6e604f2449bb65dfaafb0f0741ba54ff0d2f9c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 四月 2024 15:20:03 +0800
Subject: [PATCH] 修改云端录像详情页使用直接访问zlm的方式播放录像
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
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
old mode 100644
new mode 100755
index a4ec52a..e07761a
--- 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,17 +1,19 @@
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 gov.nist.javax.sip.message.SIPResponse;
+import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.sip.*;
-import javax.sip.header.CallIdHeader;
-import javax.sip.message.Response;
-import java.text.ParseException;
+import javax.sip.DialogTerminatedEvent;
+import javax.sip.ResponseEvent;
+import javax.sip.TimeoutEvent;
+import javax.sip.TransactionTerminatedEvent;
+import javax.sip.header.WarningHeader;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -30,6 +32,7 @@
private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
private Map<String, Instant> okTimeSubscribes = new ConcurrentHashMap<>();
+
private Map<String, Instant> errorTimeSubscribes = new ConcurrentHashMap<>();
// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
@@ -74,7 +77,11 @@
// 浼氳瘽宸茬粨鏉�
dialogTerminated,
// 璁惧鏈壘鍒�
- deviceNotFoundEvent
+ deviceNotFoundEvent,
+ // 娑堟伅鍙戦�佸け璐�
+ cmdSendFailEvent,
+ // 娑堟伅鍙戦�佸け璐�
+ failedToGetPort
}
public static class EventResult<EventObject>{
@@ -84,18 +91,34 @@
public String callId;
public EventObject event;
+ public EventResult() {
+ }
+
public EventResult(EventObject event) {
this.event = event;
if (event instanceof ResponseEvent) {
ResponseEvent responseEvent = (ResponseEvent)event;
- Response response = responseEvent.getResponse();
+ SIPResponse response = (SIPResponse)responseEvent.getResponse();
this.type = EventResultType.response;
if (response != null) {
- this.msg = response.getReasonPhrase();
+ WarningHeader warningHeader = (WarningHeader)response.getHeader(WarningHeader.NAME);
+ if (warningHeader != null && !ObjectUtils.isEmpty(warningHeader.getText())) {
+ this.msg = "";
+ if (warningHeader.getCode() > 0) {
+ this.msg += warningHeader.getCode() + ":";
+ }
+ if (warningHeader.getAgent() != null) {
+ this.msg += warningHeader.getCode() + ":";
+ }
+ if (warningHeader.getText() != null) {
+ this.msg += warningHeader.getText();
+ }
+ }else {
+ this.msg = response.getReasonPhrase();
+ }
this.statusCode = response.getStatusCode();
+ this.callId = response.getCallIdHeader().getCallId();
}
- this.callId = ((CallIdHeader)response.getHeader(CallIdHeader.NAME)).getCallId();
-
}else if (event instanceof TimeoutEvent) {
TimeoutEvent timeoutEvent = (TimeoutEvent)event;
this.type = EventResultType.timeout;
--
Gitblit v1.8.0