From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 83b9c6a..a294ab1 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
@@ -77,8 +77,8 @@
/**
* 鍦ㄧ嚎
*/
- @Schema(description = "鏄惁鍦ㄧ嚎锛�1涓哄湪绾匡紝0涓虹绾�")
- private int online;
+ @Schema(description = "鏄惁鍦ㄧ嚎锛宼rue涓哄湪绾匡紝false涓虹绾�")
+ private boolean onLine;
/**
@@ -140,7 +140,7 @@
/**
* 鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
*/
- @Schema(description = "鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄")
+ @Schema(description = "鐩綍璁㈤槄鍛ㄦ湡锛宱涓轰笉璁㈤槄")
private int subscribeCycleForCatalog;
/**
@@ -190,6 +190,11 @@
@Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
private boolean asMessageChannel;
+
+ @Schema(description = "璁惧娉ㄥ唽鐨勪簨鍔′俊鎭�")
+ private SipTransactionInfo sipTransactionInfo;
+
+
public String getDeviceId() {
@@ -244,6 +249,17 @@
return streamMode;
}
+ public Integer getStreamModeForParam() {
+ if (streamMode.equalsIgnoreCase("UDP")) {
+ return 0;
+ }else if (streamMode.equalsIgnoreCase("TCP-PASSIVE")) {
+ return 1;
+ }else if (streamMode.equalsIgnoreCase("TCP-ACTIVE")) {
+ return 2;
+ }
+ return 0;
+ }
+
public void setStreamMode(String streamMode) {
this.streamMode = streamMode;
}
@@ -272,12 +288,12 @@
this.hostAddress = hostAddress;
}
- public int getOnline() {
- return online;
+ public boolean isOnLine() {
+ return onLine;
}
- public void setOnline(int online) {
- this.online = online;
+ public void setOnLine(boolean onLine) {
+ this.onLine = onLine;
}
public int getChannelCount() {
@@ -439,4 +455,28 @@
public void setAsMessageChannel(boolean asMessageChannel) {
this.asMessageChannel = asMessageChannel;
}
+
+ public SipTransactionInfo getSipTransactionInfo() {
+ return sipTransactionInfo;
+ }
+
+ 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