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); });