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/ParentPlatform.java | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 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
old mode 100644
new mode 100755
index 4377282..1638c71
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -1,158 +1,193 @@
package com.genersoft.iot.vmp.gb28181.bean;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * @author lin
+ */
+@Schema(description = "骞冲彴淇℃伅")
public class ParentPlatform {
/**
* id
*/
+ @Schema(description = "ID(鏁版嵁搴撲腑)")
private Integer id;
/**
* 鏄惁鍚敤
*/
+ @Schema(description = "鏄惁鍚敤")
private boolean enable;
/**
* 鍚嶇О
*/
+ @Schema(description = "鍚嶇О")
private String name;
/**
* SIP鏈嶅姟鍥芥爣缂栫爜
*/
+ @Schema(description = "SIP鏈嶅姟鍥芥爣缂栫爜")
private String serverGBId;
/**
* SIP鏈嶅姟鍥芥爣鍩�
*/
+ @Schema(description = "SIP鏈嶅姟鍥芥爣鍩�")
private String serverGBDomain;
/**
* SIP鏈嶅姟IP
*/
+ @Schema(description = "SIP鏈嶅姟IP")
private String serverIP;
/**
* SIP鏈嶅姟绔彛
*/
+ @Schema(description = "SIP鏈嶅姟绔彛")
private int serverPort;
/**
* 璁惧鍥芥爣缂栧彿
*/
+ @Schema(description = "璁惧鍥芥爣缂栧彿")
private String deviceGBId;
/**
* 璁惧ip
*/
+ @Schema(description = "璁惧ip")
private String deviceIp;
/**
* 璁惧绔彛
*/
+ @Schema(description = "璁惧绔彛")
private String devicePort;
/**
* SIP璁よ瘉鐢ㄦ埛鍚�(榛樿浣跨敤璁惧鍥芥爣缂栧彿)
*/
+ @Schema(description = "SIP璁よ瘉鐢ㄦ埛鍚�(榛樿浣跨敤璁惧鍥芥爣缂栧彿)")
private String username;
/**
* SIP璁よ瘉瀵嗙爜
*/
+ @Schema(description = "SIP璁よ瘉瀵嗙爜")
private String password;
/**
* 娉ㄥ唽鍛ㄦ湡 (绉�)
*/
- private String expires;
+ @Schema(description = "娉ㄥ唽鍛ㄦ湡 (绉�)")
+ private int expires;
/**
* 蹇冭烦鍛ㄦ湡(绉�)
*/
- private String keepTimeout;
+ @Schema(description = "蹇冭烦鍛ㄦ湡(绉�)")
+ private int keepTimeout;
/**
* 浼犺緭鍗忚
* UDP/TCP
*/
+ @Schema(description = "浼犺緭鍗忚")
private String transport;
/**
* 瀛楃闆�
*/
+ @Schema(description = "瀛楃闆�")
private String characterSet;
/**
* 鍏佽浜戝彴鎺у埗
*/
+ @Schema(description = "鍏佽浜戝彴鎺у埗")
private boolean ptz;
/**
* RTCP娴佷繚娲�
- * TODO 棰勭暀, 鏆備笉瀹炵幇
*/
+ @Schema(description = "RTCP娴佷繚娲�")
private boolean rtcp;
/**
* 鍦ㄧ嚎鐘舵��
*/
+ @Schema(description = "鍦ㄧ嚎鐘舵��")
private boolean status;
/**
* 鍦ㄧ嚎鐘舵��
*/
+ @Schema(description = "鍦ㄧ嚎鐘舵��")
private int channelCount;
-
- /**
- * 鍏变韩鎵�鏈夌殑鐩存挱娴�
- */
- private boolean shareAllLiveStream;
/**
* 榛樿鐩綍Id,鑷姩娣诲姞鐨勯�氶亾澶氭斁鍦ㄨ繖涓洰褰曚笅
*/
+ @Schema(description = "榛樿鐩綍Id,鑷姩娣诲姞鐨勯�氶亾澶氭斁鍦ㄨ繖涓洰褰曚笅")
private String catalogId;
/**
* 宸茶璁㈤槄鐩綍淇℃伅
*/
+ @Schema(description = "宸茶璁㈤槄鐩綍淇℃伅")
private boolean catalogSubscribe;
/**
* 宸茶璁㈤槄鎶ヨ淇℃伅
*/
+ @Schema(description = "宸茶璁㈤槄鎶ヨ淇℃伅")
private boolean alarmSubscribe;
/**
* 宸茶璁㈤槄绉诲姩浣嶇疆淇℃伅
*/
+ @Schema(description = "宸茶璁㈤槄绉诲姩浣嶇疆淇℃伅")
private boolean mobilePositionSubscribe;
/**
* 鐐规挱鏈帹娴佺殑璁惧鏃舵槸鍚︿娇鐢╮edis閫氱煡鎷夎捣
*/
+ @Schema(description = "鐐规挱鏈帹娴佺殑璁惧鏃舵槸鍚︿娇鐢╮edis閫氱煡鎷夎捣")
private boolean startOfflinePush;
/**
* 鐩綍鍒嗙粍-姣忔鍚戜笂绾у彂閫侀�氶亾淇℃伅鏃跺崟涓寘鎼哄甫鐨勯�氶亾鏁伴噺锛屽彇鍊�1,2,4,8
*/
+ @Schema(description = "鐩綍鍒嗙粍-姣忔鍚戜笂绾у彂閫侀�氶亾淇℃伅鏃跺崟涓寘鎼哄甫鐨勯�氶亾鏁伴噺锛屽彇鍊�1,2,4,8")
private int catalogGroup;
/**
* 琛屾斂鍖哄垝
*/
+ @Schema(description = "琛屾斂鍖哄垝")
private String administrativeDivision;
/**
* 鏇存柊鏃堕棿
*/
+ @Schema(description = "鏇存柊鏃堕棿")
private String updateTime;
/**
* 鍒涘缓鏃堕棿
*/
+ @Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
+
+ @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+ private boolean asMessageChannel;
+
+ @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+ private boolean autoPushChannel;
public Integer getId() {
return id;
@@ -250,19 +285,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;
}
@@ -312,15 +347,6 @@
public void setChannelCount(int channelCount) {
this.channelCount = channelCount;
- }
-
-
- public boolean isShareAllLiveStream() {
- return shareAllLiveStream;
- }
-
- public void setShareAllLiveStream(boolean shareAllLiveStream) {
- this.shareAllLiveStream = shareAllLiveStream;
}
public String getCatalogId() {
@@ -394,4 +420,20 @@
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
+
+ public boolean isAsMessageChannel() {
+ return asMessageChannel;
+ }
+
+ public void setAsMessageChannel(boolean asMessageChannel) {
+ this.asMessageChannel = asMessageChannel;
+ }
+
+ public boolean isAutoPushChannel() {
+ return autoPushChannel;
+ }
+
+ public void setAutoPushChannel(boolean autoPushChannel) {
+ this.autoPushChannel = autoPushChannel;
+ }
}
--
Gitblit v1.8.0