Browse Source

비정상 상태 값 추가

master
노승철 2 years ago
parent
commit
7af1dcd9cf
  1. 4
      src/main/java/com/palnet/comn/model/GPModel.java
  2. 8
      src/main/java/com/palnet/server/command/SocketCommand.java

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

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

8
src/main/java/com/palnet/server/command/SocketCommand.java

@ -144,7 +144,12 @@ public class SocketCommand {
try { try {
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
// .uri(new URI("http://127.0.0.1:8080/api/ctr/cntrl/id/" + model.getObjectId())) // .uri(new URI("http://127.0.0.1:8080/api/ctr/cntrl/id/" + model.getObjectId()))
.uri(new URI(env.getProperty("app.host") + "api/ctr/cntrl/id/" + model.getObjectId())) .uri(new URI(
env.getProperty("app.host") + "api/ctr/cntrl/id/" + model.getObjectId()
+ "/" + model.getLat()
+ "/" + model.getLng()
))
.version(HttpClient.Version.HTTP_2) .version(HttpClient.Version.HTTP_2)
.GET() .GET()
.build(); .build();
@ -161,6 +166,7 @@ public class SocketCommand {
model.setControlId((String) data.get("controlId")); model.setControlId((String) data.get("controlId"));
model.setTypeCd((String) data.get("typeCd")); model.setTypeCd((String) data.get("typeCd"));
model.setAreaTrnsYn((String) data.get("areaTrnsYn")); model.setAreaTrnsYn((String) data.get("areaTrnsYn"));
model.setControlWarnCd("Y".equals(data.get("controlWarnCd")) ? true : false);
model.setServerRcvDt(DateUtils.getCurrentTime()); model.setServerRcvDt(DateUtils.getCurrentTime());
} catch (IOException e) { } catch (IOException e) {

Loading…
Cancel
Save