From d6281c67642507cd165df6de447aacf17ac6ad54 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 1 Apr 2024 17:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/DataCollectorListener.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/listener/DataCollectorListener.java b/src/main/java/cn/lihongjie/coal/dataCollector/listener/DataCollectorListener.java index ccbaf52c..a0ea7b75 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/listener/DataCollectorListener.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/listener/DataCollectorListener.java @@ -29,8 +29,7 @@ public class DataCollectorListener { @Autowired DataCollectorService dataCollectorService; - @Autowired - DataCollectorLogService dataCollectorLogService; + @Autowired DataCollectorLogService dataCollectorLogService; @RabbitListener( bindings = { @@ -68,24 +67,24 @@ public class DataCollectorListener { DataCollectorLogEntity log = new DataCollectorLogEntity(); log.setDataCollector(dataCollector); - log.setOrganizationId(dataCollector.getOrganizationId() ); + log.setOrganizationId(dataCollector.getOrganizationId()); log.setLogTime(LocalDateTime.now()); Object rk = headers.get(AmqpHeaders.RECEIVED_ROUTING_KEY); switch (rk.toString()) { case "dataCollector.online": dataCollector.setLastLoginTime(LocalDateTime.now()); - log.setContent("online"); + log.setType("online"); break; case "dataCollector.offline": dataCollector.setLastLogoutTime(LocalDateTime.now()); - log.setContent("offline"); + log.setType("offline"); break; case "dataCollector.heartbeat": dataCollector.setHeartbeatTime(LocalDateTime.now()); - log.setContent("heartbeat"); + log.setType("heartbeat"); break; default: @@ -94,6 +93,9 @@ public class DataCollectorListener { } dataCollectorService.save(dataCollector); - dataCollectorLogService.save(log); + // 心跳不记录日志 + if (!StringUtils.equals(rk.toString(), "dataCollector.heartbeat")) { + dataCollectorLogService.save(log); + } } }