From de4bf7aa77b616df97df2b40dac7e29ea3f5485f 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: Mon, 29 Aug 2022 11:42:39 +0900
Subject: [PATCH] =?UTF-8?q?[=EA=B4=80=EC=A0=9C]=20=EB=B9=84=EC=A0=95?=
 =?UTF-8?q?=EC=83=81=20=EC=83=81=ED=99=A9=20=EC=83=81=ED=83=9C=20=EA=B0=92?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/consumer/MessageConsumer.java      | 18 ++++++++++++------
 .../task/ctr/service/CtrCntrlTaskService.java  | 16 ++++++++--------
 2 files changed, 20 insertions(+), 14 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 84c7fa0..3701e6a 100644
--- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
+++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
@@ -76,13 +76,19 @@ public class MessageConsumer {
 
 		if(prevModel == null) {
 			if(model.isControlWarnCd()) {
-				model.setControlWarnNotyCd(true);
-				model.setWarnNotyExposure("N");
-			} else {
-				model.setControlWarnNotyCd(false);
-				model.setWarnNotyExposure("N");
+				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); // 정상 -> 비정상상
+			}
+	}
 
 		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 e6182a8..b59a715 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,14 +32,14 @@ public class CtrCntrlTaskService {
 
 		if(Objects.nonNull(allHistory)) {
 			allHistory.forEach((k, v) -> {
-				if(v.isControlWarnCd() && v.isControlWarnNotyCd()) {
-					if(!"Y".equals(v.getWarnNotyExposure())) {
-						v.setControlWarnNotyCd(true);
-						v.setWarnNotyExposure("Y");
-					} else {
-						v.setControlWarnNotyCd(false);
-					}
-				}
+//				if(v.isControlWarnCd() && v.isControlWarnNotyCd()) {
+//					if(!"Y".equals(v.getWarnNotyExposure())) {
+//						v.setControlWarnNotyCd(true);
+//						v.setWarnNotyExposure("Y");
+//					} else {
+//						v.setControlWarnNotyCd(false);
+//					}
+//				}
 
 				list.add(v);
 			});