国标级联支持添加通道后主动推动到上级

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

@@ -186,6 +186,9 @@ public class ParentPlatform {
     @Schema(description = "是否作为消息通道")
     private boolean asMessageChannel;
 
+    @Schema(description = "是否作为消息通道")
+    private boolean autoPushChannel;
+
     public Integer getId() {
         return id;
     }
@@ -425,4 +428,12 @@ public class ParentPlatform {
     public void setAsMessageChannel(boolean asMessageChannel) {
         this.asMessageChannel = asMessageChannel;
     }
+
+    public boolean isAutoPushChannel() {
+        return autoPushChannel;
+    }
+
+    public void setAutoPushChannel(boolean autoPushChannel) {
+        this.autoPushChannel = autoPushChannel;
+    }
 }

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

@@ -32,11 +32,13 @@ public class SubscribeHolder {
 
     public void putCatalogSubscribe(String platformId, SubscribeInfo subscribeInfo) {
         catalogMap.put(platformId, subscribeInfo);
-        // 添加订阅到期
-        String taskOverdueKey = taskOverduePrefix +  "catalog_" + platformId;
-        // 添加任务处理订阅过期
-        dynamicTask.startDelay(taskOverdueKey, () -> removeCatalogSubscribe(subscribeInfo.getId()),
-                subscribeInfo.getExpires() * 1000);
+        if (subscribeInfo.getExpires() > 0) {
+            // 添加订阅到期
+            String taskOverdueKey = taskOverduePrefix +  "catalog_" + platformId;
+            // 添加任务处理订阅过期
+            dynamicTask.startDelay(taskOverdueKey, () -> removeCatalogSubscribe(subscribeInfo.getId()),
+                    subscribeInfo.getExpires() * 1000);
+        }
     }
 
     public SubscribeInfo getCatalogSubscribe(String platformId) {
@@ -63,11 +65,13 @@ public class SubscribeHolder {
         dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(platformId),
                 subscribeInfo.getGpsInterval() * 1000);
         String taskOverdueKey = taskOverduePrefix +  "MobilePosition_" + platformId;
-        // 添加任务处理订阅过期
-        dynamicTask.startDelay(taskOverdueKey, () -> {
-                    removeMobilePositionSubscribe(subscribeInfo.getId());
-                },
-                subscribeInfo.getExpires() * 1000);
+        if (subscribeInfo.getExpires() > 0) {
+            // 添加任务处理订阅过期
+            dynamicTask.startDelay(taskOverdueKey, () -> {
+                        removeMobilePositionSubscribe(subscribeInfo.getId());
+                    },
+                    subscribeInfo.getExpires() * 1000);
+        }
     }
 
     public SubscribeInfo getMobilePositionSubscribe(String platformId) {

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

@@ -18,6 +18,9 @@ public class SubscribeInfo {
 
     }
 
+    public SubscribeInfo() {
+    }
+
     private String id;
 
     private SIPRequest request;
@@ -33,6 +36,21 @@ public class SubscribeInfo {
     private String sn;
     private int gpsInterval;
 
+    /**
+     * 模拟的FromTag
+     */
+    private String simulatedFromTag;
+
+    /**
+     * 模拟的ToTag
+     */
+    private String simulatedToTag;
+
+    /**
+     * 模拟的CallID
+     */
+    private String simulatedCallId;
+
     public String getId() {
         return id;
     }
@@ -96,4 +114,28 @@ public class SubscribeInfo {
     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;
+    }
 }