From e46e9027e0185c61cb3e60c9af9b438a8f0eb2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Thu, 25 Aug 2022 10:36:45 +0900 Subject: [PATCH] =?UTF-8?q?message=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/palnet/process/message/Receiver.java | 22 +++++++++++++++++++ .../message/consumer/MessageConsumer.java | 3 +-- .../process/scheduler/GpHistoryScheduler.java | 3 +-- src/main/resources/application.yml | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/palnet/process/message/Receiver.java diff --git a/src/main/java/com/palnet/process/message/Receiver.java b/src/main/java/com/palnet/process/message/Receiver.java new file mode 100644 index 0000000..aa61a67 --- /dev/null +++ b/src/main/java/com/palnet/process/message/Receiver.java @@ -0,0 +1,22 @@ +package com.palnet.process.message; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CountDownLatch; + +@Component +@Slf4j +public class Receiver { + + private CountDownLatch latch = new CountDownLatch(1); + + public void receiveMessage(String message) { + log.info("Received <" + message); + latch.countDown(); + } + + public CountDownLatch getLatch() { + return latch; + } +} diff --git a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java index bceeff8..0dfe2ea 100644 --- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java @@ -30,8 +30,7 @@ public class MessageConsumer { @RabbitHandler @RabbitListener(queues = {"websocket.drone.queue"}) public void receiveDroneMessage(final String message) throws JsonProcessingException { - log.debug("websocket message : {}", message); - +// log.info("websocket message : {}", message); GPModel model = objectMapper.readValue(message, GPModel.class); CtrCntrlModel history = this.modelConvert(model); // 웹 표출 model로 변환 diff --git a/src/main/java/com/palnet/process/scheduler/GpHistoryScheduler.java b/src/main/java/com/palnet/process/scheduler/GpHistoryScheduler.java index 151ac77..f7027c0 100644 --- a/src/main/java/com/palnet/process/scheduler/GpHistoryScheduler.java +++ b/src/main/java/com/palnet/process/scheduler/GpHistoryScheduler.java @@ -14,14 +14,13 @@ import java.util.Objects; @Component public class GpHistoryScheduler { - private final int timeLimit = 10; // -- 테스트 10초 + private final int timeLimit = 60; // -- 화면 노출시간 1분 private final GPHistoryShareContext gpHistoryShareContext; public GpHistoryScheduler(GPHistoryShareContext gpHistoryShareContext) { this.gpHistoryShareContext = gpHistoryShareContext; } - /* Client 노출 시간 5분 */ @Scheduled(fixedDelay = 1000 * 10) public void removeHistory() { Map allHistory = gpHistoryShareContext.getAllHistory(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c935828..d836eae 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,6 +7,7 @@ spring: port: 5672 username: guest password: guest + virtual-host: / server: port: 8181