From 2673fbb0bf7af6405c544cc8a56f17d03018c59a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 12 十月 2023 17:08:59 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
old mode 100644
new mode 100755
index ade5d0e..7de5098
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -53,7 +53,7 @@
     /**
      * 璁惧鍥芥爣缂栧彿
      */
-    @Schema(description = "11111")
+    @Schema(description = "璁惧鍥芥爣缂栧彿")
     private String deviceGBId;
 
     /**
@@ -66,7 +66,7 @@
      * 璁惧绔彛
      */
     @Schema(description = "璁惧绔彛")
-    private String devicePort;
+    private int devicePort;
 
     /**
      * SIP璁よ瘉鐢ㄦ埛鍚�(榛樿浣跨敤璁惧鍥芥爣缂栧彿)
@@ -90,7 +90,7 @@
      * 蹇冭烦鍛ㄦ湡(绉�)
      */
     @Schema(description = "蹇冭烦鍛ㄦ湡(绉�)")
-    private String keepTimeout;
+    private int keepTimeout;
 
     /**
      * 浼犺緭鍗忚
@@ -113,7 +113,6 @@
 
     /**
      * RTCP娴佷繚娲�
-     * TODO 棰勭暀, 鏆備笉瀹炵幇
      */
     @Schema(description = "RTCP娴佷繚娲�")
     private boolean rtcp;
@@ -184,11 +183,11 @@
     @Schema(description = "鍒涘缓鏃堕棿")
     private String createTime;
 
-    /**
-     * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
-     */
-    @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGrou")
-    private String treeType;
+    @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+    private boolean asMessageChannel;
+
+    @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+    private boolean autoPushChannel;
 
     public Integer getId() {
         return id;
@@ -262,11 +261,11 @@
         this.deviceIp = deviceIp;
     }
 
-    public String getDevicePort() {
+    public int getDevicePort() {
         return devicePort;
     }
 
-    public void setDevicePort(String devicePort) {
+    public void setDevicePort(int devicePort) {
         this.devicePort = devicePort;
     }
 
@@ -294,11 +293,11 @@
         this.expires = expires;
     }
 
-    public String getKeepTimeout() {
+    public int getKeepTimeout() {
         return keepTimeout;
     }
 
-    public void setKeepTimeout(String keepTimeout) {
+    public void setKeepTimeout(int keepTimeout) {
         this.keepTimeout = keepTimeout;
     }
 
@@ -422,11 +421,19 @@
         this.createTime = createTime;
     }
 
-    public String getTreeType() {
-        return treeType;
+    public boolean isAsMessageChannel() {
+        return asMessageChannel;
     }
 
-    public void setTreeType(String treeType) {
-        this.treeType = treeType;
+    public void setAsMessageChannel(boolean asMessageChannel) {
+        this.asMessageChannel = asMessageChannel;
+    }
+
+    public boolean isAutoPushChannel() {
+        return autoPushChannel;
+    }
+
+    public void setAutoPushChannel(boolean autoPushChannel) {
+        this.autoPushChannel = autoPushChannel;
     }
 }

--
Gitblit v1.8.0