From d4020168658efdee89a633083cd9c14b06c4d863 Mon Sep 17 00:00:00 2001 From: zhangf <1603559716@qq.com> Date: 星期三, 11 九月 2024 17:09:10 +0800 Subject: [PATCH] 修改消息推送时间间隔 --- src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java index c067a09..1b4ace2 100644 --- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java +++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java @@ -18,14 +18,16 @@ import org.springframework.stereotype.Component; import java.io.IOException; +import java.text.MessageFormat; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; /** * @author Mr.huang * @decription * @date 2023/8/8 10:49 */ -//@Component +@Component public class HeartbeatSchedule { @Autowired @@ -42,19 +44,27 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private static final String deviceExcLogFormat = "【设备预警提示】{0} 硬件设备离线。"; - @Scheduled(cron = "0/1 * * * * ?") // 每秒执行一次 + private static final DateTimeFormatter deviceExcLogFormatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss"); + + + + @Scheduled(cron = "0 0/10 * * * ?") @Async(value = "SocketTaskExecutor") public void gasConcentrationStatus() { GasConcentration gasConcentration = gasConcentrationService.getLastData(); if (gasConcentration != null){ - LocalDateTime lastReceiveTime = gasConcentration.getDataReceivingTime().plusMinutes(1); + LocalDateTime lastReceiveTime = gasConcentration.getDataReceivingTime().plusMinutes(10); if (LocalDateTime.now().compareTo(lastReceiveTime) > 0){ try { heartbeatExcWebsocketServer.sendInfo(HeartbeatExecEnum.GAS_CONCENTRATION.getStatus()+"",null); - logger.info(HeartbeatExecEnum.GAS_CONCENTRATION.getDesc()); + //logger.info(HeartbeatExecEnum.GAS_CONCENTRATION.getDesc()); DeviceExceptionLog deviceExceptionLog = new DeviceExceptionLog(); - deviceExceptionLog.setTime(LocalDateTime.now()); + LocalDateTime now = LocalDateTime.now(); + String content = MessageFormat.format(deviceExcLogFormat,deviceExcLogFormatter.format(now)); + deviceExceptionLog.setTime(now); + deviceExceptionLog.setContent(content); deviceExceptionLog.setExecDesc(HeartbeatExecEnum.GAS_CONCENTRATION.getDesc()); DeviceExceptionLog save = deviceExceptionLogService.save(deviceExceptionLog); if (save == null) @@ -75,9 +85,12 @@ if (LocalDateTime.now().compareTo(lastReceiveTime) > 0){ try { heartbeatExcWebsocketServer.sendInfo(HeartbeatExecEnum.GAS_FLUX.getStatus()+"",null); - logger.info(HeartbeatExecEnum.GAS_FLUX.getDesc()); + //logger.info(HeartbeatExecEnum.GAS_FLUX.getDesc()); DeviceExceptionLog deviceExceptionLog = new DeviceExceptionLog(); - deviceExceptionLog.setTime(LocalDateTime.now()); + LocalDateTime now = LocalDateTime.now(); + String content = MessageFormat.format(deviceExcLogFormat,deviceExcLogFormatter.format(now)); + deviceExceptionLog.setTime(now); + deviceExceptionLog.setContent(content); deviceExceptionLog.setExecDesc(HeartbeatExecEnum.GAS_FLUX.getDesc()); DeviceExceptionLog save = deviceExceptionLogService.save(deviceExceptionLog); if (save == null) -- Gitblit v1.9.2