From 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 01 四月 2022 16:45:29 +0800
Subject: [PATCH] 支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
similarity index 90%
rename from src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
rename to src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
index d1d0e20..4776551 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetup.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -6,10 +6,12 @@
import java.util.ArrayList;
import java.util.List;
-
+/**
+ * 閰嶇疆鏂囦欢 user-settings 鏄犲皠鐨勯厤缃俊鎭�
+ */
@Component
@ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true)
-public class UserSetup {
+public class UserSetting {
private Boolean savePositionHistory = Boolean.FALSE;
@@ -18,6 +20,8 @@
private Boolean seniorSdp = Boolean.FALSE;
private Long playTimeout = 18000L;
+
+ private int platformPlayTimeout = 60000;
private Boolean interfaceAuthentication = Boolean.TRUE;
@@ -134,4 +138,12 @@
public void setRecordSip(Boolean recordSip) {
this.recordSip = recordSip;
}
+
+ public int getPlatformPlayTimeout() {
+ return platformPlayTimeout;
+ }
+
+ public void setPlatformPlayTimeout(int platformPlayTimeout) {
+ this.platformPlayTimeout = platformPlayTimeout;
+ }
}
--
Gitblit v1.8.0