From dd9927785ffdf9fe79232e54fb2153505afcf008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Tue, 27 Sep 2022 16:35:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9D=EB=B3=84=EC=9E=A5=EC=B9=98=20drone?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=8B=9D=EB=B3=84=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=EB=A7=8C=20=EC=9D=B4=EB=A0=A5=EA=B4=80=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/consumer/MessageConsumer.java     | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

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 a16271e..c3439ec 100644
--- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
+++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
@@ -33,11 +33,15 @@ public class MessageConsumer {
     @RabbitListener(queues = {"websocket.drone.queue"}, concurrency = "8")
     public void receiveDroneMessage(final String message) throws JsonProcessingException {
 		log.info("websocket message : {}", message);
+
 		GPModel model = objectMapper.readValue(message, GPModel.class);
 
-		CtrCntrlModel history = this.convertModel(model); // 웹 표출 model로 변환
+		CtrCntrlModel history = this.convertModel(model);
 
-		gpHistoryShareModel.putHistory(model.getObjectId(), history);
+		// DRON의 대한 식별정보만 이력 관리
+		if (history.getObjectId().indexOf("PALDRON") > -1) {
+			gpHistoryShareModel.putHistory(model.getObjectId(), history);
+		}
     }
 
     public CtrCntrlModel convertModel(final GPModel dataInfo) {
@@ -73,23 +77,23 @@ public class MessageConsumer {
 		// 비정상 상황 식별코드 추가
 		model.setControlWarnCd(dataInfo.isControlWarnCd());
 
-		if(prevModel == null) {
-			if(model.isControlWarnCd()) {
-				model.setControlWarnNotyCd(true); // 최초 비정상 발생
-			}
-		} else {
-			if(prevModel.isControlWarnCd() && model.isControlWarnCd()) {
-				model.setControlWarnNotyCd(false); // 비정상 -> 비정상
-			}
-			if(prevModel.isControlWarnCd() && !model.isControlWarnCd()) {
-				model.setControlWarnNotyCd(false); // 비정상 -> 정상
-			}
-			if(!prevModel.isControlWarnCd() && model.isControlWarnCd()) {
-				model.setControlWarnNotyCd(true); // 정상 -> 비정상상
-			}
-		}
-
-		model.setControlCacheCount(1);
+//		if(prevModel == null) {
+//			if(model.isControlWarnCd()) {
+//				model.setControlWarnNotyCd(true); // 최초 비정상 발생
+//			}
+//		} else {
+//			if(prevModel.isControlWarnCd() && model.isControlWarnCd()) {
+//				model.setControlWarnNotyCd(false); // 비정상 -> 비정상
+//			}
+//			if(prevModel.isControlWarnCd() && !model.isControlWarnCd()) {
+//				model.setControlWarnNotyCd(false); // 비정상 -> 정상
+//			}
+//			if(!prevModel.isControlWarnCd() && model.isControlWarnCd()) {
+//				model.setControlWarnNotyCd(true); // 정상 -> 비정상상
+//			}
+//		}
+//
+//		model.setControlCacheCount(1);
 
 		return model;
 	}