From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 d50ffb7..e8eab8c 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
@@ -100,11 +100,6 @@
private String mediaServerId;
/**
- * 棣栨娉ㄥ唽
- */
- private boolean firsRegister;
-
- /**
* 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
*/
private String charset ;
@@ -128,6 +123,11 @@
* 鎶ヨ璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
*/
private int subscribeCycleForAlarm;
+
+ /**
+ * 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
+ */
+ private boolean ssrcCheck;
public String getDeviceId() {
@@ -274,14 +274,6 @@
this.mediaServerId = mediaServerId;
}
- public boolean isFirsRegister() {
- return firsRegister;
- }
-
- public void setFirsRegister(boolean firsRegister) {
- this.firsRegister = firsRegister;
- }
-
public String getCharset() {
return charset;
}
@@ -321,4 +313,12 @@
public void setSubscribeCycleForAlarm(int subscribeCycleForAlarm) {
this.subscribeCycleForAlarm = subscribeCycleForAlarm;
}
+
+ public boolean isSsrcCheck() {
+ return ssrcCheck;
+ }
+
+ public void setSsrcCheck(boolean ssrcCheck) {
+ this.ssrcCheck = ssrcCheck;
+ }
}
--
Gitblit v1.8.0