From 7145ce07e6a84854fc1e5afd65b664c54a47bffd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 四月 2022 14:16:10 +0800
Subject: [PATCH] Merge pull request #439 from hotcoffie/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 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
index 373533a..feb6a72 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
@@ -14,19 +14,15 @@
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();
this.transaction = evt.getServerTransaction();
this.dialog = evt.getDialog();
+ CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
+ this.callId = callIdHeader.getCallId();
}
private String id;
@@ -34,11 +30,16 @@
private String callId;
private String eventId;
private String eventType;
- private String fromTag;
- private String toTag;
- private String branch;
private ServerTransaction transaction;
private Dialog dialog;
+
+ /**
+ * 浠ヤ笅涓哄彲閫夊瓧娈�
+ * @return
+ */
+ private String sn;
+ private int gpsInterval;
+
public String getId() {
return id;
@@ -52,18 +53,6 @@
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;
}
@@ -74,10 +63,6 @@
public void setCallId(String callId) {
this.callId = callId;
- }
-
- public void setFromTag(String fromTag) {
- this.fromTag = fromTag;
}
public String getEventId() {
@@ -96,14 +81,6 @@
this.eventType = eventType;
}
- public String getBranch() {
- return branch;
- }
-
- public void setBranch(String branch) {
- this.branch = branch;
- }
-
public ServerTransaction getTransaction() {
return transaction;
}
@@ -119,4 +96,20 @@
public void setDialog(Dialog dialog) {
this.dialog = dialog;
}
+
+ 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;
+ }
}
--
Gitblit v1.8.0