From 4e6ba796be67ccbefb8e0f8f61bbfa12d8e0df6d Mon Sep 17 00:00:00 2001 From: huangzhen <867217663@qq.com> Date: 星期四, 04 一月 2024 09:53:51 +0800 Subject: [PATCH] 新增功能 --- src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java index 33ea153..f0c9d01 100644 --- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java +++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java @@ -18,7 +18,9 @@ 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 @@ -42,9 +44,13 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private static final String deviceExcLogFormat = "【设备预警提示】{0} 硬件设备离线。"; + + private static final DateTimeFormatter deviceExcLogFormatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss"); - @Scheduled(cron = "0/30 * * * * ?") + + @Scheduled(cron = "0 0/1 * * * ?") @Async(value = "SocketTaskExecutor") public void gasConcentrationStatus() { GasConcentration gasConcentration = gasConcentrationService.getLastData(); @@ -53,9 +59,12 @@ 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) @@ -76,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