From 7af1dcd9cf65e367115dee77662d86e9adbe32fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 20 Sep 2022 14:50:03 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/palnet/comn/model/GPModel.java | 4 +++- .../java/com/palnet/server/command/SocketCommand.java | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/palnet/comn/model/GPModel.java b/src/main/java/com/palnet/comn/model/GPModel.java index 77f5cc8..b954b95 100644 --- a/src/main/java/com/palnet/comn/model/GPModel.java +++ b/src/main/java/com/palnet/comn/model/GPModel.java @@ -65,6 +65,8 @@ public class GPModel { // 전체 히스토리 저장 private List postionHistory; - + + // 비정상 상황 식별 코드 + private boolean controlWarnCd; } diff --git a/src/main/java/com/palnet/server/command/SocketCommand.java b/src/main/java/com/palnet/server/command/SocketCommand.java index 8be1bfd..3951bd2 100644 --- a/src/main/java/com/palnet/server/command/SocketCommand.java +++ b/src/main/java/com/palnet/server/command/SocketCommand.java @@ -144,7 +144,12 @@ public class SocketCommand { try { HttpRequest request = HttpRequest.newBuilder() // .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) .GET() .build(); @@ -161,6 +166,7 @@ public class SocketCommand { model.setControlId((String) data.get("controlId")); model.setTypeCd((String) data.get("typeCd")); model.setAreaTrnsYn((String) data.get("areaTrnsYn")); + model.setControlWarnCd("Y".equals(data.get("controlWarnCd")) ? true : false); model.setServerRcvDt(DateUtils.getCurrentTime()); } catch (IOException e) {