From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 60418f2..e9d4167 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
@@ -18,15 +18,21 @@
this.fromTag = fromHeader.getTag();
ExpiresHeader expiresHeader = (ExpiresHeader)request.getHeader(ExpiresHeader.NAME);
this.expires = expiresHeader.getExpires();
- this.event = ((EventHeader)request.getHeader(EventHeader.NAME)).getName();
+ 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 int expires;
private String callId;
- private String event;
+ private String eventId;
+ private String eventType;
private String fromTag;
private String toTag;
+ private String branch;
public String getId() {
return id;
@@ -68,11 +74,27 @@
this.fromTag = fromTag;
}
- public String getEvent() {
- return event;
+ public String getEventId() {
+ return eventId;
}
- public void setEvent(String event) {
- this.event = event;
+ public void setEventId(String eventId) {
+ this.eventId = eventId;
+ }
+
+ public String getEventType() {
+ return eventType;
+ }
+
+ public void setEventType(String eventType) {
+ this.eventType = eventType;
+ }
+
+ public String getBranch() {
+ return branch;
+ }
+
+ public void setBranch(String branch) {
+ this.branch = branch;
}
}
--
Gitblit v1.8.0