bug修复
This commit is contained in:
parent
891e1bd8d6
commit
c4ab6d4e0b
@ -149,7 +149,7 @@ public class EnvironmentDevTask {
|
|||||||
*/
|
*/
|
||||||
@SchedulerLock(name = "getEnvironmentDustData", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3)
|
@SchedulerLock(name = "getEnvironmentDustData", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3)
|
||||||
@Scheduled(cron = "0 0/5 * * * ?")
|
@Scheduled(cron = "0 0/5 * * * ?")
|
||||||
@GetMapping("dustData")
|
@RequestMapping("dustData")
|
||||||
public void getEnvironmentDustData() {
|
public void getEnvironmentDustData() {
|
||||||
log.info("获取扬尘数据(携稳)开始任务");
|
log.info("获取扬尘数据(携稳)开始任务");
|
||||||
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()
|
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()
|
||||||
@ -230,7 +230,7 @@ public class EnvironmentDevTask {
|
|||||||
*/
|
*/
|
||||||
@SchedulerLock(name = "sprayAutoClose", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3)
|
@SchedulerLock(name = "sprayAutoClose", lockAtMostFor = 1000 * 60 * 5, lockAtLeastFor = 1000 * 60 * 3)
|
||||||
@Scheduled(cron = "0 0/1 * * * ?")
|
@Scheduled(cron = "0 0/1 * * * ?")
|
||||||
@GetMapping("sprayAutoClose")
|
@RequestMapping("sprayAutoClose")
|
||||||
public void sprayAutoClose() {
|
public void sprayAutoClose() {
|
||||||
List<SprayRtDev> sprayDevList = sprayRtDevMapper.selectList(null);
|
List<SprayRtDev> sprayDevList = sprayRtDevMapper.selectList(null);
|
||||||
if (CollUtil.isNotEmpty(sprayDevList)) {
|
if (CollUtil.isNotEmpty(sprayDevList)) {
|
||||||
@ -239,12 +239,14 @@ public class EnvironmentDevTask {
|
|||||||
//过期时间
|
//过期时间
|
||||||
String key = SprayRtDevServiceImpl.SPRAY_FREFIX_AUTO_CLOSE + sprayDev.getId();
|
String key = SprayRtDevServiceImpl.SPRAY_FREFIX_AUTO_CLOSE + sprayDev.getId();
|
||||||
String time = (String) redisRepository.get(key);
|
String time = (String) redisRepository.get(key);
|
||||||
long between = DateUtil.between(DateUtil.parse(time), DateUtil.date(), DateUnit.MINUTE);
|
if (time != null) {
|
||||||
if (between > 10) {
|
long between = DateUtil.between(DateUtil.parse(time), DateUtil.date(), DateUnit.MINUTE);
|
||||||
redisRepository.del(key);
|
if (between > 10) {
|
||||||
if (Objects.equals(sprayDev.getSprayMode(), 2)) {
|
redisRepository.del(key);
|
||||||
sprayDev.setSwitchStatus(1);
|
if (Objects.equals(sprayDev.getSprayMode(), 2)) {
|
||||||
sprayRtDevMapper.updateById(sprayDev);
|
sprayDev.setSwitchStatus(1);
|
||||||
|
sprayRtDevMapper.updateById(sprayDev);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user