Browse Source

message type 수정

master
노승철 2 years ago
parent
commit
ac8ba7367f
  1. 2
      src/main/java/com/palnet/comn/model/CtrCntrlModel.java
  2. 3
      src/main/java/com/palnet/comn/model/GPModel.java
  3. 9
      src/main/java/com/palnet/process/message/consumer/MessageConsumer.java

2
src/main/java/com/palnet/comn/model/CtrCntrlModel.java

@ -62,7 +62,7 @@ public class CtrCntrlModel implements Comparable<CtrCntrlModel>{
private List<Map<String , Double>> lastHistory; private List<Map<String , Double>> lastHistory;
// 비정상 상황 식별 코드 // 비정상 상황 식별 코드
private boolean controlWarnCd; // 정상: false, 비정상: true private boolean controlWarnCd;
@Override @Override
public int compareTo(CtrCntrlModel o) { public int compareTo(CtrCntrlModel o) {

3
src/main/java/com/palnet/comn/model/GPModel.java

@ -65,6 +65,9 @@ public class GPModel {
// 전체 히스토리 저장 // 전체 히스토리 저장
private List<GPHistoryModel> postionHistory; private List<GPHistoryModel> postionHistory;
// 비정상 상황 식별 코드
private boolean controlWarnCd = true;
} }

9
src/main/java/com/palnet/process/message/consumer/MessageConsumer.java

@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.palnet.comn.model.CtrCntrlModel; import com.palnet.comn.model.CtrCntrlModel;
import com.palnet.comn.model.GPHistoryShareContext; import com.palnet.comn.model.GPHistoryShareContext;
import com.palnet.comn.model.GPDatabaseModel; import com.palnet.comn.model.GPDatabaseModel;
import com.palnet.comn.model.GPModel;
import com.palnet.comn.utils.JsonUtils; import com.palnet.comn.utils.JsonUtils;
import com.palnet.server.collection.ChannelCollection; import com.palnet.server.collection.ChannelCollection;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -29,14 +30,14 @@ public class MessageConsumer {
@RabbitHandler @RabbitHandler
@RabbitListener(queues = {"websocket.drone.queue"}) @RabbitListener(queues = {"websocket.drone.queue"})
public void receiveDroneMessage(final String message) throws JsonProcessingException { public void receiveDroneMessage(final String message) throws JsonProcessingException {
GPDatabaseModel gpDatabaseModel = objectMapper.readValue(message, GPDatabaseModel.class); GPModel model = objectMapper.readValue(message, GPModel.class);
CtrCntrlModel history = this.modelConvert(gpDatabaseModel); CtrCntrlModel history = this.modelConvert(model);
gpHistoryShareModel.putHistory(gpDatabaseModel.getObjectId(), history); gpHistoryShareModel.putHistory(model.getObjectId(), history);
} }
public CtrCntrlModel modelConvert(final GPDatabaseModel dataInfo) { public CtrCntrlModel modelConvert(final GPModel dataInfo) {
CtrCntrlModel model = new CtrCntrlModel(); CtrCntrlModel model = new CtrCntrlModel();
model.setObjectId(dataInfo.getObjectId()); model.setObjectId(dataInfo.getObjectId());

Loading…
Cancel
Save