From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java |   80 ++++++++++++++++++++++++---------------
 1 files changed, 49 insertions(+), 31 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 e9d4167..1958b44 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
@@ -1,28 +1,31 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
+import com.genersoft.iot.vmp.utils.SerializeUtils;
+
+import javax.sip.Dialog;
 import javax.sip.RequestEvent;
+import javax.sip.ServerTransaction;
 import javax.sip.header.*;
 import javax.sip.message.Request;
 
 public class SubscribeInfo {
 
-    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();
+        this.transaction = evt.getServerTransaction();
+        this.dialog = evt.getDialog();
+        CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
+        this.callId = callIdHeader.getCallId();
+    }
+
+    public SubscribeInfo() {
     }
 
     private String id;
@@ -30,9 +33,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;
@@ -46,18 +56,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;
     }
@@ -68,10 +66,6 @@
 
     public void setCallId(String callId) {
         this.callId = callId;
-    }
-
-    public void setFromTag(String fromTag) {
-        this.fromTag = fromTag;
     }
 
     public String getEventId() {
@@ -90,11 +84,35 @@
         this.eventType = eventType;
     }
 
-    public String getBranch() {
-        return branch;
+    public ServerTransaction getTransaction() {
+        return transaction;
     }
 
-    public void setBranch(String branch) {
-        this.branch = branch;
+    public void setTransaction(ServerTransaction transaction) {
+        this.transaction = transaction;
+    }
+
+    public Dialog getDialog() {
+        return dialog;
+    }
+
+    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