diff --git a/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java b/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java index 0782278ab..18888e8db 100644 --- a/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java +++ b/src/main/java/com/zhgd/xmgl/task/EnvironmentDevTask.java @@ -149,7 +149,7 @@ public class EnvironmentDevTask { */ @SchedulerLock(name = "getEnvironmentDustData", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3) @Scheduled(cron = "0 0/5 * * * ?") - @GetMapping("dustData") + @RequestMapping("dustData") public void getEnvironmentDustData() { log.info("获取扬尘数据(携稳)开始任务"); List projects = projectMapper.selectList(new LambdaQueryWrapper() @@ -230,7 +230,7 @@ public class EnvironmentDevTask { */ @SchedulerLock(name = "sprayAutoClose", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3) @Scheduled(cron = "0 0/1 * * * ?") - @GetMapping("sprayAutoClose") + @RequestMapping("sprayAutoClose") public void sprayAutoClose() { List sprayDevList = sprayRtDevMapper.selectList(null); if (CollUtil.isNotEmpty(sprayDevList)) { @@ -239,12 +239,14 @@ public class EnvironmentDevTask { //过期时间 String key = SprayRtDevServiceImpl.SPRAY_FREFIX_AUTO_CLOSE + sprayDev.getId(); String time = (String) redisRepository.get(key); - long between = DateUtil.between(DateUtil.parse(time), DateUtil.date(), DateUnit.MINUTE); - if (between > 10) { - redisRepository.del(key); - if (Objects.equals(sprayDev.getSprayMode(), 2)) { - sprayDev.setSwitchStatus(1); - sprayRtDevMapper.updateById(sprayDev); + if (time != null) { + long between = DateUtil.between(DateUtil.parse(time), DateUtil.date(), DateUnit.MINUTE); + if (between > 10) { + redisRepository.del(key); + if (Objects.equals(sprayDev.getSprayMode(), 2)) { + sprayDev.setSwitchStatus(1); + sprayRtDevMapper.updateById(sprayDev); + } } } } catch (Exception e) {