From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 a364f00..34d624f 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
@@ -165,19 +165,13 @@
* 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
*/
@Schema(description = "鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�")
- private boolean ssrcCheck = true;
+ private boolean ssrcCheck = false;
/**
* 鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02
*/
@Schema(description = "鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02")
private String geoCoordSys;
-
- /**
- * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
- */
- @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup")
- private String treeType;
@Schema(description = "瀵嗙爜")
private String password;
@@ -193,6 +187,8 @@
@Schema(description = "璁惧娉ㄥ唽鐨勪簨鍔′俊鎭�")
private SipTransactionInfo sipTransactionInfo;
+
+
public String getDeviceId() {
@@ -248,6 +244,9 @@
}
public Integer getStreamModeForParam() {
+ if (streamMode == null) {
+ return 0;
+ }
if (streamMode.equalsIgnoreCase("UDP")) {
return 0;
}else if (streamMode.equalsIgnoreCase("TCP-PASSIVE")) {
@@ -406,14 +405,6 @@
this.geoCoordSys = geoCoordSys;
}
- public String getTreeType() {
- return treeType;
- }
-
- public void setTreeType(String treeType) {
- this.treeType = treeType;
- }
-
public String getPassword() {
return password;
}
@@ -461,4 +452,20 @@
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
+
+ /*======================璁惧涓诲瓙鐮佹祦閫昏緫START=========================*/
+ @Schema(description = "寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙false-涓嶅紑鍚紝true-寮�鍚級")
+ private boolean switchPrimarySubStream;
+
+ public boolean isSwitchPrimarySubStream() {
+ return switchPrimarySubStream;
+ }
+
+ public void setSwitchPrimarySubStream(boolean switchPrimarySubStream) {
+ this.switchPrimarySubStream = switchPrimarySubStream;
+ }
+
+ /*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/
+
+
}
--
Gitblit v1.8.0