From b1fb1c4616a1924496465c6cff60acf328d7ab05 Mon Sep 17 00:00:00 2001 From: QingObject <1120359293@qq.com> Date: 星期五, 28 四月 2023 14:39:50 +0800 Subject: [PATCH] 1、新增视频回放、视频回放控制Template 2、修复直播控制指令BUG --- src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 62 ++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java index be7d5af..539198f 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.conf; +import org.junit.jupiter.api.Order; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -11,6 +12,7 @@ */ @Component @ConfigurationProperties(prefix = "user-settings", ignoreInvalidFields = true) +@Order(0) public class UserSetting { private Boolean savePositionHistory = Boolean.FALSE; @@ -46,13 +48,23 @@ private Boolean syncChannelOnDeviceOnline = Boolean.FALSE; private Boolean sipLog = Boolean.FALSE; - private Boolean syncDb = Boolean.TRUE; + private Boolean sendToPlatformsWhenIdLost = Boolean.FALSE; + + private Boolean refuseChannelStatusChannelFormNotify = Boolean.FALSE; + + private Boolean deviceStatusNotify = Boolean.FALSE; private String serverId = "000000"; + + private String recordPath = null; private String thirdPartyGBIdReg = "[\\s\\S]*"; private List<String> interfaceAuthenticationExcludes = new ArrayList<>(); + + private List<String> allowedOrigins = new ArrayList<>(); + + private int maxNotifyCountQueue = 10000; public Boolean getSavePositionHistory() { return savePositionHistory; @@ -218,11 +230,51 @@ this.sipLog = sipLog; } - public Boolean getSyncDb() { - return syncDb; + public List<String> getAllowedOrigins() { + return allowedOrigins; } - public void setSyncDb(Boolean syncDb) { - this.syncDb = syncDb; + public void setAllowedOrigins(List<String> allowedOrigins) { + this.allowedOrigins = allowedOrigins; + } + + public Boolean getSendToPlatformsWhenIdLost() { + return sendToPlatformsWhenIdLost; + } + + public void setSendToPlatformsWhenIdLost(Boolean sendToPlatformsWhenIdLost) { + this.sendToPlatformsWhenIdLost = sendToPlatformsWhenIdLost; + } + + public Boolean getRefuseChannelStatusChannelFormNotify() { + return refuseChannelStatusChannelFormNotify; + } + + public void setRefuseChannelStatusChannelFormNotify(Boolean refuseChannelStatusChannelFormNotify) { + this.refuseChannelStatusChannelFormNotify = refuseChannelStatusChannelFormNotify; + } + + public String getRecordPath() { + return recordPath; + } + + public void setRecordPath(String recordPath) { + this.recordPath = recordPath; + } + + public int getMaxNotifyCountQueue() { + return maxNotifyCountQueue; + } + + public void setMaxNotifyCountQueue(int maxNotifyCountQueue) { + this.maxNotifyCountQueue = maxNotifyCountQueue; + } + + public Boolean getDeviceStatusNotify() { + return deviceStatusNotify; + } + + public void setDeviceStatusNotify(Boolean deviceStatusNotify) { + this.deviceStatusNotify = deviceStatusNotify; } } -- Gitblit v1.8.0