From ec4b1d6b9e9879d961a8ae1303117f094b56e9a9 Mon Sep 17 00:00:00 2001 From: lkd9125 Date: Thu, 7 Sep 2023 15:04:09 +0900 Subject: [PATCH] =?UTF-8?q?GP=20Model=20RegDate=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=ED=98=84=EC=9E=AC=EC=8B=9C=EA=B0=84=20set=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pav-socket/src/main/java/com/palnet/comn/model/GPModel.java | 2 ++ .../main/java/com/palnet/server/command/SocketCommand.java | 2 ++ .../src/main/java/com/palnet/comn/model/CtrCntrlModel.java | 3 +++ .../src/main/java/com/palnet/comn/model/GPModel.java | 6 ++++-- .../palnet/server/task/ctr/service/CtrCntrlTaskService.java | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pav-socket/src/main/java/com/palnet/comn/model/GPModel.java b/pav-socket/src/main/java/com/palnet/comn/model/GPModel.java index 3a9835ae..933695f7 100644 --- a/pav-socket/src/main/java/com/palnet/comn/model/GPModel.java +++ b/pav-socket/src/main/java/com/palnet/comn/model/GPModel.java @@ -69,6 +69,8 @@ public class GPModel { // 비정상 상황 식별 코드 private boolean controlWarnCd; + + // 큐가 Socket서버에 도착한 시간 private Instant regDt; } diff --git a/pav-socket/src/main/java/com/palnet/server/command/SocketCommand.java b/pav-socket/src/main/java/com/palnet/server/command/SocketCommand.java index 97ce61e9..183e34b8 100644 --- a/pav-socket/src/main/java/com/palnet/server/command/SocketCommand.java +++ b/pav-socket/src/main/java/com/palnet/server/command/SocketCommand.java @@ -173,6 +173,8 @@ public class SocketCommand { } } + model.setRegDt(Instant.now()); + // STEP 3. 화면에 표출할 정보 WebSocket 전달 // messageProducer.sendControlMessage(model); try { diff --git a/pav-websocket/src/main/java/com/palnet/comn/model/CtrCntrlModel.java b/pav-websocket/src/main/java/com/palnet/comn/model/CtrCntrlModel.java index 392b1657..686a9d9c 100644 --- a/pav-websocket/src/main/java/com/palnet/comn/model/CtrCntrlModel.java +++ b/pav-websocket/src/main/java/com/palnet/comn/model/CtrCntrlModel.java @@ -4,6 +4,7 @@ import com.palnet.comn.utils.DateUtils; import io.netty.util.internal.StringUtil; import lombok.Data; +import java.time.Instant; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -69,6 +70,8 @@ public class CtrCntrlModel implements Comparable{ private boolean controlWarnNotyCd; // 비정상 상황 알림 중복 체크 private Integer controlCacheCount; + // 큐가 Socket서버에 도착한 시간 + private Instant regDt; @Override public int compareTo(CtrCntrlModel o) { diff --git a/pav-websocket/src/main/java/com/palnet/comn/model/GPModel.java b/pav-websocket/src/main/java/com/palnet/comn/model/GPModel.java index 91cd6c92..61ccf89c 100644 --- a/pav-websocket/src/main/java/com/palnet/comn/model/GPModel.java +++ b/pav-websocket/src/main/java/com/palnet/comn/model/GPModel.java @@ -2,6 +2,7 @@ package com.palnet.comn.model; import lombok.Data; +import java.time.Instant; import java.util.List; @Data @@ -68,6 +69,7 @@ public class GPModel { // 비정상 상황 식별 코드 private boolean controlWarnCd = true; - - + + // 큐가 Socket서버에 도착한 시간 + private Instant regDt; } diff --git a/pav-websocket/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java b/pav-websocket/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java index 2c284683..1c205c8a 100644 --- a/pav-websocket/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java +++ b/pav-websocket/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java @@ -76,6 +76,9 @@ public class CtrCntrlTaskService { model.setControlCacheCount(1); + // // 큐가 Socket서버에 도착한 시간 + model.setRegDt(dataInfo.getRegDt()); + return model; }