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 adc021f..42933fc 100644 --- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java @@ -28,7 +28,7 @@ public class MessageConsumer { } @RabbitHandler - @RabbitListener(queues = {"websocket.drone.queue"}, concurrency = "8") + @RabbitListener(queues = {"websocket.drone.queue"}) public void receiveDroneMessage(final String message) throws JsonProcessingException { // log.info("websocket message : {}", message); GPModel model = objectMapper.readValue(message, GPModel.class); @@ -92,6 +92,10 @@ public class MessageConsumer { model.setControlCacheCount(1); +// log.info("==============================="); +// log.info("Warn : {}", model.isControlWarnCd()); +// log.info("Noty : {}", model.isControlWarnNotyCd()); + return model; } } diff --git a/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java b/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java index 2235954..dc08a6e 100644 --- a/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java +++ b/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java @@ -32,15 +32,21 @@ public class CtrCntrlTaskService { if(Objects.nonNull(allHistory)) { allHistory.forEach((k, v) -> { - // 데이터가 수신 되지 않고 이전 데이터를 표출하고 있는 경우 - // 비정상 상황 판별하여 알림 표출 X - if(v.getControlCacheCount() == 2) { - if(v.isControlWarnCd() && v.isControlWarnNotyCd()) { - v.setControlWarnNotyCd(false); - } - } - - v.setControlCacheCount(2); +// int cacheCount = v.getControlCacheCount(); +// +// // 데이터가 수신 되지 않고 이전 데이터를 표출하고 있는 경우 +// if(cacheCount == 1) { +// if(v.isControlWarnCd() && v.isControlWarnNotyCd()) { +// v.setControlCacheCount(2); +// } +// } +// +// // 비정상 상황 판별하여 알림 표출 X +// if(cacheCount == 2) { +// if(v.isControlWarnCd() && v.isControlWarnNotyCd()) { +// v.setControlWarnNotyCd(false); +// } +// } list.add(v); });