Browse Source

GP Model RegDate추가 및 현재시간 set 추가

master
lkd9125 1 year ago
parent
commit
ec4b1d6b9e
  1. 2
      pav-socket/src/main/java/com/palnet/comn/model/GPModel.java
  2. 2
      pav-socket/src/main/java/com/palnet/server/command/SocketCommand.java
  3. 3
      pav-websocket/src/main/java/com/palnet/comn/model/CtrCntrlModel.java
  4. 4
      pav-websocket/src/main/java/com/palnet/comn/model/GPModel.java
  5. 3
      pav-websocket/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java

2
pav-socket/src/main/java/com/palnet/comn/model/GPModel.java

@ -69,6 +69,8 @@ public class GPModel {
// 비정상 상황 식별 코드 // 비정상 상황 식별 코드
private boolean controlWarnCd; private boolean controlWarnCd;
// 큐가 Socket서버에 도착한 시간
private Instant regDt; private Instant regDt;
} }

2
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 전달 // STEP 3. 화면에 표출할 정보 WebSocket 전달
// messageProducer.sendControlMessage(model); // messageProducer.sendControlMessage(model);
try { try {

3
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 io.netty.util.internal.StringUtil;
import lombok.Data; import lombok.Data;
import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@ -69,6 +70,8 @@ public class CtrCntrlModel implements Comparable<CtrCntrlModel>{
private boolean controlWarnNotyCd; private boolean controlWarnNotyCd;
// 비정상 상황 알림 중복 체크 // 비정상 상황 알림 중복 체크
private Integer controlCacheCount; private Integer controlCacheCount;
// 큐가 Socket서버에 도착한 시간
private Instant regDt;
@Override @Override
public int compareTo(CtrCntrlModel o) { public int compareTo(CtrCntrlModel o) {

4
pav-websocket/src/main/java/com/palnet/comn/model/GPModel.java

@ -2,6 +2,7 @@ package com.palnet.comn.model;
import lombok.Data; import lombok.Data;
import java.time.Instant;
import java.util.List; import java.util.List;
@Data @Data
@ -69,5 +70,6 @@ public class GPModel {
// 비정상 상황 식별 코드 // 비정상 상황 식별 코드
private boolean controlWarnCd = true; private boolean controlWarnCd = true;
// 큐가 Socket서버에 도착한 시간
private Instant regDt;
} }

3
pav-websocket/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java

@ -76,6 +76,9 @@ public class CtrCntrlTaskService {
model.setControlCacheCount(1); model.setControlCacheCount(1);
// // 큐가 Socket서버에 도착한 시간
model.setRegDt(dataInfo.getRegDt());
return model; return model;
} }

Loading…
Cancel
Save