From 19c996774edc4fd915eb4d61008df7e42461405f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 七月 2023 15:37:59 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index a294ab1..541c111 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -173,12 +173,6 @@
@Schema(description = "鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02")
private String geoCoordSys;
- /**
- * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
- */
- @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup")
- private String treeType;
-
@Schema(description = "瀵嗙爜")
private String password;
@@ -194,8 +188,8 @@
@Schema(description = "璁惧娉ㄥ唽鐨勪簨鍔′俊鎭�")
private SipTransactionInfo sipTransactionInfo;
-
-
+ @Schema(description = "鎺у埗璇煶瀵硅娴佺▼锛岄噴鏀炬敹鍒癆CK鍚庡彂娴�")
+ private boolean broadcastPushAfterAck;
public String getDeviceId() {
return deviceId;
@@ -250,6 +244,9 @@
}
public Integer getStreamModeForParam() {
+ if (streamMode == null) {
+ return 0;
+ }
if (streamMode.equalsIgnoreCase("UDP")) {
return 0;
}else if (streamMode.equalsIgnoreCase("TCP-PASSIVE")) {
@@ -408,14 +405,6 @@
this.geoCoordSys = geoCoordSys;
}
- public String getTreeType() {
- return treeType;
- }
-
- public void setTreeType(String treeType) {
- this.treeType = treeType;
- }
-
public String getPassword() {
return password;
}
@@ -479,4 +468,11 @@
/*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/
+ public boolean isBroadcastPushAfterAck() {
+ return broadcastPushAfterAck;
+ }
+
+ public void setBroadcastPushAfterAck(boolean broadcastPushAfterAck) {
+ this.broadcastPushAfterAck = broadcastPushAfterAck;
+ }
}
--
Gitblit v1.8.0