diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml index fb8689c..87a31e1 100644 --- a/xymanager_admin/src/main/resources/application-test.yml +++ b/xymanager_admin/src/main/resources/application-test.yml @@ -127,4 +127,6 @@ mqtt: cmdtopic: /v1/devices/MSRDT-A/command resptopic: /v1/devices/MSRDT-A/commandResponse datatopic: /v1/devices/MSRDT-A/datas - photodir: /home/xymp/photos/ \ No newline at end of file + photodir: /home/xymp/photos/ + +camera-schedule: false \ No newline at end of file diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java index 1b82919..9f05ed5 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java @@ -14,6 +14,7 @@ import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.NewCacheService; import com.shxy.xymanager_service.service.TermSetService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -29,6 +30,9 @@ import java.util.Map; @Slf4j public class StoreCameraScheduleTask { + @Value("${camera-schedule:false}") + private boolean enable; + @Resource NewCacheService newCacheService; @Resource @@ -90,6 +94,9 @@ public class StoreCameraScheduleTask { @Scheduled(cron = "0 1 3 * * ?") private void search() { + if (!enable) { + return; + } Map terminalMap = newCacheService.getTerminalMap(); Map termAndChannelMap = cacheService.getTermAndChannelMap(); Iterator it = terminalMap.keySet().iterator();