From 66ab09396cecb4caf3f1b6803fb97792132fffc6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:18:33 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 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
index ef2eecd..7ea0df1 100644
--- 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璁よ瘉鐢ㄦ埛鍚�(榛樿浣跨敤璁惧鍥芥爣缂栧彿)
@@ -84,13 +84,13 @@
      * 娉ㄥ唽鍛ㄦ湡 (绉�)
      */
     @Schema(description = "娉ㄥ唽鍛ㄦ湡 (绉�)")
-    private String expires;
+    private int expires;
 
     /**
      * 蹇冭烦鍛ㄦ湡(绉�)
      */
     @Schema(description = "蹇冭烦鍛ㄦ湡(绉�)")
-    private String keepTimeout;
+    private int keepTimeout;
 
     /**
      * 浼犺緭鍗忚
@@ -113,7 +113,6 @@
 
     /**
      * RTCP娴佷繚娲�
-     * TODO 棰勭暀, 鏆備笉瀹炵幇
      */
     @Schema(description = "RTCP娴佷繚娲�")
     private boolean rtcp;
@@ -190,6 +189,9 @@
     @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGrou")
     private String treeType;
 
+    @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+    private boolean asMessageChannel;
+
     public Integer getId() {
         return id;
     }
@@ -262,11 +264,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;
     }
 
@@ -286,19 +288,19 @@
         this.password = password;
     }
 
-    public String getExpires() {
+    public int getExpires() {
         return expires;
     }
 
-    public void setExpires(String expires) {
+    public void setExpires(int expires) {
         this.expires = expires;
     }
 
-    public String getKeepTimeout() {
+    public int getKeepTimeout() {
         return keepTimeout;
     }
 
-    public void setKeepTimeout(String keepTimeout) {
+    public void setKeepTimeout(int keepTimeout) {
         this.keepTimeout = keepTimeout;
     }
 
@@ -429,4 +431,12 @@
     public void setTreeType(String treeType) {
         this.treeType = treeType;
     }
+
+    public boolean isAsMessageChannel() {
+        return asMessageChannel;
+    }
+
+    public void setAsMessageChannel(boolean asMessageChannel) {
+        this.asMessageChannel = asMessageChannel;
+    }
 }

--
Gitblit v1.8.0