From ac8ba7367fb3f07792659e08f422068fe7c0abcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 9 Aug 2022 17:01:51 +0900 Subject: [PATCH] =?UTF-8?q?message=20type=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/palnet/comn/model/CtrCntrlModel.java | 2 +- src/main/java/com/palnet/comn/model/GPModel.java | 3 +++ .../palnet/process/message/consumer/MessageConsumer.java | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/palnet/comn/model/CtrCntrlModel.java b/src/main/java/com/palnet/comn/model/CtrCntrlModel.java index 3831005..75752f5 100644 --- a/src/main/java/com/palnet/comn/model/CtrCntrlModel.java +++ b/src/main/java/com/palnet/comn/model/CtrCntrlModel.java @@ -62,7 +62,7 @@ public class CtrCntrlModel implements Comparable{ private List> lastHistory; // 비정상 상황 식별 코드 - private boolean controlWarnCd; // 정상: false, 비정상: true + private boolean controlWarnCd; @Override public int compareTo(CtrCntrlModel o) { diff --git a/src/main/java/com/palnet/comn/model/GPModel.java b/src/main/java/com/palnet/comn/model/GPModel.java index 77f5cc8..91cd6c9 100644 --- a/src/main/java/com/palnet/comn/model/GPModel.java +++ b/src/main/java/com/palnet/comn/model/GPModel.java @@ -65,6 +65,9 @@ public class GPModel { // 전체 히스토리 저장 private List postionHistory; + + // 비정상 상황 식별 코드 + private boolean controlWarnCd = true; } 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 064dd9c..917015f 100644 --- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.palnet.comn.model.CtrCntrlModel; import com.palnet.comn.model.GPHistoryShareContext; import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.model.GPModel; import com.palnet.comn.utils.JsonUtils; import com.palnet.server.collection.ChannelCollection; import lombok.extern.slf4j.Slf4j; @@ -29,14 +30,14 @@ public class MessageConsumer { @RabbitHandler @RabbitListener(queues = {"websocket.drone.queue"}) public void receiveDroneMessage(final String message) throws JsonProcessingException { - GPDatabaseModel gpDatabaseModel = objectMapper.readValue(message, GPDatabaseModel.class); + GPModel model = objectMapper.readValue(message, GPModel.class); - CtrCntrlModel history = this.modelConvert(gpDatabaseModel); + CtrCntrlModel history = this.modelConvert(model); - gpHistoryShareModel.putHistory(gpDatabaseModel.getObjectId(), history); + gpHistoryShareModel.putHistory(model.getObjectId(), history); } - public CtrCntrlModel modelConvert(final GPDatabaseModel dataInfo) { + public CtrCntrlModel modelConvert(final GPModel dataInfo) { CtrCntrlModel model = new CtrCntrlModel(); model.setObjectId(dataInfo.getObjectId());