From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java | 149 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
old mode 100644
new mode 100755
index e9d4167..e5c5045
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
@@ -1,77 +1,78 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import javax.sip.RequestEvent;
+import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
+
import javax.sip.header.*;
-import javax.sip.message.Request;
public class SubscribeInfo {
+
+
+ public SubscribeInfo(SIPRequest request, String id) {
+ this.id = id;
+ this.request = request;
+ this.expires = request.getExpires().getExpires();
+ EventHeader eventHeader = (EventHeader)request.getHeader(EventHeader.NAME);
+ this.eventId = eventHeader.getEventId();
+ this.eventType = eventHeader.getEventType();
+
+ }
public SubscribeInfo() {
}
- public SubscribeInfo(RequestEvent evt, String id) {
- this.id = id;
- Request request = evt.getRequest();
- CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);
- this.callId = callIdHeader.getCallId();
- FromHeader fromHeader = (FromHeader)request.getHeader(FromHeader.NAME);
- this.fromTag = fromHeader.getTag();
- ExpiresHeader expiresHeader = (ExpiresHeader)request.getHeader(ExpiresHeader.NAME);
- this.expires = expiresHeader.getExpires();
- EventHeader eventHeader = (EventHeader)request.getHeader(EventHeader.NAME);
- this.eventId = eventHeader.getEventId();
- this.eventType = eventHeader.getEventType();
- ViaHeader viaHeader = (ViaHeader)request.getHeader(ViaHeader.NAME);
- this.branch = viaHeader.getBranch();
- }
-
private String id;
+
+ private SIPRequest request;
private int expires;
- private String callId;
private String eventId;
private String eventType;
- private String fromTag;
- private String toTag;
- private String branch;
+ private SIPResponse response;
+
+ /**
+ * 浠ヤ笅涓哄彲閫夊瓧娈�
+ * @return
+ */
+ private String sn;
+ private int gpsInterval;
+
+ /**
+ * 妯℃嫙鐨凢romTag
+ */
+ private String simulatedFromTag;
+
+ /**
+ * 妯℃嫙鐨凾oTag
+ */
+ private String simulatedToTag;
+
+ /**
+ * 妯℃嫙鐨凜allID
+ */
+ private String simulatedCallId;
public String getId() {
return id;
- }
-
- public int getExpires() {
- return expires;
- }
-
- public String getCallId() {
- return callId;
- }
-
- public String getFromTag() {
- return fromTag;
- }
-
- public void setToTag(String toTag) {
- this.toTag = toTag;
- }
-
- public String getToTag() {
- return toTag;
}
public void setId(String id) {
this.id = id;
}
+ public SIPRequest getRequest() {
+ return request;
+ }
+
+ public void setRequest(SIPRequest request) {
+ this.request = request;
+ }
+
+ public int getExpires() {
+ return expires;
+ }
+
public void setExpires(int expires) {
this.expires = expires;
- }
-
- public void setCallId(String callId) {
- this.callId = callId;
- }
-
- public void setFromTag(String fromTag) {
- this.fromTag = fromTag;
}
public String getEventId() {
@@ -90,11 +91,51 @@
this.eventType = eventType;
}
- public String getBranch() {
- return branch;
+ public SIPResponse getResponse() {
+ return response;
}
- public void setBranch(String branch) {
- this.branch = branch;
+ public void setResponse(SIPResponse response) {
+ this.response = response;
+ }
+
+ public String getSn() {
+ return sn;
+ }
+
+ public void setSn(String sn) {
+ this.sn = sn;
+ }
+
+ public int getGpsInterval() {
+ return gpsInterval;
+ }
+
+ public void setGpsInterval(int gpsInterval) {
+ this.gpsInterval = gpsInterval;
+ }
+
+ public String getSimulatedFromTag() {
+ return simulatedFromTag;
+ }
+
+ public void setSimulatedFromTag(String simulatedFromTag) {
+ this.simulatedFromTag = simulatedFromTag;
+ }
+
+ public String getSimulatedCallId() {
+ return simulatedCallId;
+ }
+
+ public void setSimulatedCallId(String simulatedCallId) {
+ this.simulatedCallId = simulatedCallId;
+ }
+
+ public String getSimulatedToTag() {
+ return simulatedToTag;
+ }
+
+ public void setSimulatedToTag(String simulatedToTag) {
+ this.simulatedToTag = simulatedToTag;
}
}
--
Gitblit v1.8.0