合并解决冲突或升级jdk17语法

This commit is contained in:
guoshengxiong 2025-12-20 16:46:52 +08:00
parent ff147038df
commit f16422f123

View File

@ -35,7 +35,7 @@ import com.zhgd.xmgl.util.HikvisionUtil;
import com.zhgd.xmgl.util.PathUtil; import com.zhgd.xmgl.util.PathUtil;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.core.SchedulerLock; import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
@ -76,7 +76,7 @@ public class PoliceCameraTask {
* 每天巡检一下磁盘存储是否超过75%超过了就删除存储时间最久的视频循环检查超过了就删保证磁盘存储容量不超过75% * 每天巡检一下磁盘存储是否超过75%超过了就删除存储时间最久的视频循环检查超过了就删保证磁盘存储容量不超过75%
*/ */
@Scheduled(cron = "0 0 3 * * ?") @Scheduled(cron = "0 0 3 * * ?")
@SchedulerLock(name = "monitorDiskSpace", lockAtMostFor = 1000 * 60, lockAtLeastFor = 1000 * 60) @SchedulerLock(name = "monitorDiskSpace", lockAtMostFor = "PT60S", lockAtLeastFor = "PT60S")
@RequestMapping("monitorDiskSpace") @RequestMapping("monitorDiskSpace")
public void monitorDiskSpace() { public void monitorDiskSpace() {
diskCleanupService.dailyDiskInspection(); diskCleanupService.dailyDiskInspection();