修复通道共享的BUG以及增加通道手动推送的功能

src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java

@@ -2,9 +2,12 @@ package com.genersoft.iot.vmp.gb28181.bean;
 
 import gov.nist.javax.sip.message.SIPRequest;
 import gov.nist.javax.sip.message.SIPResponse;
+import lombok.Data;
 
 import javax.sip.header.*;
+import java.util.UUID;
 
+@Data
 public class SubscribeInfo {
 
 
@@ -31,9 +34,9 @@ public class SubscribeInfo {
 
     /**
      * 以下为可选字段
-     * @return
      */
     private String sn;
+
     private int gpsInterval;
 
     /**
@@ -51,91 +54,18 @@ public class SubscribeInfo {
      */
     private String simulatedCallId;
 
-    public String getId() {
-        return id;
+
+    public static SubscribeInfo buildSimulated(String platFormServerId, String platFormServerIp){
+        SubscribeInfo subscribeInfo = new SubscribeInfo();
+        subscribeInfo.setId(platFormServerId);
+        subscribeInfo.setExpires(-1);
+        subscribeInfo.setEventType("Catalog");
+        int random = (int) Math.floor(Math.random() * 10000);
+        subscribeInfo.setEventId(random + "");
+        subscribeInfo.setSimulatedCallId(UUID.randomUUID().toString().replace("-", "") + "@" + platFormServerIp);
+        subscribeInfo.setSimulatedFromTag(UUID.randomUUID().toString().replace("-", ""));
+        subscribeInfo.setSimulatedToTag(UUID.randomUUID().toString().replace("-", ""));
+        return subscribeInfo;
     }
 
-    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 String getEventId() {
-        return eventId;
-    }
-
-    public void setEventId(String eventId) {
-        this.eventId = eventId;
-    }
-
-    public String getEventType() {
-        return eventType;
-    }
-
-    public void setEventType(String eventType) {
-        this.eventType = eventType;
-    }
-
-    public SIPResponse getResponse() {
-        return response;
-    }
-
-    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;
-    }
 }