From 381c3bdc2079ece5147cf4cee004e9071edadf7a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 五月 2023 16:04:44 +0800
Subject: [PATCH] 修复国标点播下级平台，ssrc更新的时单端口错误更新rtpserver的问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 2 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 880117f..daf709f 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
@@ -1,41 +1,50 @@
package com.genersoft.iot.vmp.gb28181.bean;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
* 鍥芥爣璁惧/骞冲彴
* @author lin
*/
+@Schema(description = "鍥芥爣璁惧/骞冲彴")
public class Device {
/**
- * 璁惧Id
+ * 璁惧鍥芥爣缂栧彿
*/
+ @Schema(description = "璁惧鍥芥爣缂栧彿")
private String deviceId;
/**
* 璁惧鍚�
*/
+ @Schema(description = "鍚嶇О")
private String name;
/**
* 鐢熶骇鍘傚晢
*/
+ @Schema(description = "鐢熶骇鍘傚晢")
private String manufacturer;
/**
* 鍨嬪彿
*/
+ @Schema(description = "鍨嬪彿")
private String model;
/**
* 鍥轰欢鐗堟湰
*/
+ @Schema(description = "鍥轰欢鐗堟湰")
private String firmware;
/**
* 浼犺緭鍗忚
* UDP/TCP
*/
+ @Schema(description = "浼犺緭鍗忚锛圲DP/TCP锛�")
private String transport;
/**
@@ -44,104 +53,146 @@
* TCP-ACTIVE锛歵cp涓诲姩妯″紡
* TCP-PASSIVE锛歵cp琚姩妯″紡
*/
+ @Schema(description = "鏁版嵁娴佷紶杈撴ā寮�")
private String streamMode;
/**
* wan鍦板潃_ip
*/
+ @Schema(description = "IP")
private String ip;
/**
* wan鍦板潃_port
*/
+ @Schema(description = "绔彛")
private int port;
/**
* wan鍦板潃
*/
+ @Schema(description = "wan鍦板潃")
private String hostAddress;
/**
* 鍦ㄧ嚎
*/
+ @Schema(description = "鏄惁鍦ㄧ嚎锛�1涓哄湪绾匡紝0涓虹绾�")
private int online;
/**
* 娉ㄥ唽鏃堕棿
*/
+ @Schema(description = "娉ㄥ唽鏃堕棿")
private String registerTime;
/**
* 蹇冭烦鏃堕棿
*/
+ @Schema(description = "蹇冭烦鏃堕棿")
private String keepaliveTime;
+
+
+ /**
+ * 蹇冭烦闂撮殧
+ */
+ @Schema(description = "蹇冭烦闂撮殧")
+ private int keepaliveIntervalTime;
/**
* 閫氶亾涓暟
*/
+ @Schema(description = "閫氶亾涓暟")
private int channelCount;
/**
* 娉ㄥ唽鏈夋晥鏈�
*/
+ @Schema(description = "娉ㄥ唽鏈夋晥鏈�")
private int expires;
/**
* 鍒涘缓鏃堕棿
*/
+ @Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
/**
* 鏇存柊鏃堕棿
*/
+ @Schema(description = "鏇存柊鏃堕棿")
private String updateTime;
/**
* 璁惧浣跨敤鐨勫獟浣搃d, 榛樿涓簄ull
*/
+ @Schema(description = "璁惧浣跨敤鐨勫獟浣搃d, 榛樿涓簄ull")
private String mediaServerId;
/**
* 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
*/
+ @Schema(description = "绗﹂泦, 鏀寔 UTF-8 涓� GB2312")
private String charset ;
/**
* 鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
*/
+ @Schema(description = "鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄")
private int subscribeCycleForCatalog;
/**
* 绉诲姩璁惧浣嶇疆璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
*/
+ @Schema(description = "绉诲姩璁惧浣嶇疆璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄")
private int subscribeCycleForMobilePosition;
/**
* 绉诲姩璁惧浣嶇疆淇℃伅涓婃姤鏃堕棿闂撮殧,鍗曚綅:绉�,榛樿鍊�5
*/
+ @Schema(description = "绉诲姩璁惧浣嶇疆淇℃伅涓婃姤鏃堕棿闂撮殧,鍗曚綅:绉�,榛樿鍊�5")
private int mobilePositionSubmissionInterval = 5;
/**
* 鎶ヨ璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
*/
+ @Schema(description = "鎶ヨ蹇冭烦鏃堕棿璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄")
private int subscribeCycleForAlarm;
/**
* 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
*/
+ @Schema(description = "鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�")
private boolean ssrcCheck = true;
/**
- * 鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02 TODO CGCS2000
+ * 鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02
*/
+ @Schema(description = "鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02")
private String geoCoordSys;
/**
* 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
*/
+ @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup")
private String treeType;
+
+ @Schema(description = "瀵嗙爜")
+ private String password;
+
+ @Schema(description = "鏀舵祦IP")
+ private String sdpIp;
+
+ @Schema(description = "SIP浜や簰IP锛堣澶囪闂钩鍙扮殑IP锛�")
+ private String localIp;
+
+ @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+ private boolean asMessageChannel;
+
+ @Schema(description = "璁惧娉ㄥ唽鐨勪簨鍔′俊鎭�")
+ private SipTransactionInfo sipTransactionInfo;
public String getDeviceId() {
@@ -194,6 +245,17 @@
public String getStreamMode() {
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) {
@@ -351,4 +413,52 @@
public void setTreeType(String treeType) {
this.treeType = treeType;
}
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getSdpIp() {
+ return sdpIp;
+ }
+
+ public void setSdpIp(String sdpIp) {
+ this.sdpIp = sdpIp;
+ }
+
+ public String getLocalIp() {
+ return localIp;
+ }
+
+ public void setLocalIp(String localIp) {
+ this.localIp = localIp;
+ }
+
+ public int getKeepaliveIntervalTime() {
+ return keepaliveIntervalTime;
+ }
+
+ public void setKeepaliveIntervalTime(int keepaliveIntervalTime) {
+ this.keepaliveIntervalTime = keepaliveIntervalTime;
+ }
+
+ public boolean isAsMessageChannel() {
+ return asMessageChannel;
+ }
+
+ public void setAsMessageChannel(boolean asMessageChannel) {
+ this.asMessageChannel = asMessageChannel;
+ }
+
+ public SipTransactionInfo getSipTransactionInfo() {
+ return sipTransactionInfo;
+ }
+
+ public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
+ this.sipTransactionInfo = sipTransactionInfo;
+ }
}
--
Gitblit v1.8.0