diff --git a/src/main/java/com/palnet/comn/utils/ControlCacheUtils.java b/src/main/java/com/palnet/comn/utils/ControlCacheUtils.java index cf514ef..ffd10f9 100644 --- a/src/main/java/com/palnet/comn/utils/ControlCacheUtils.java +++ b/src/main/java/com/palnet/comn/utils/ControlCacheUtils.java @@ -36,7 +36,7 @@ public class ControlCacheUtils { for (String key : controls.keySet()) { ControlCacheModel model = controls.get(key); Long diff = System.currentTimeMillis() - model.getRegTime(); - if(diff > (1000 * 10)){ + if(diff > removeTime){ removeControl(key); } } diff --git a/src/main/java/com/palnet/server/command/SocketCommand.java b/src/main/java/com/palnet/server/command/SocketCommand.java index 89759f0..01b0e3e 100644 --- a/src/main/java/com/palnet/server/command/SocketCommand.java +++ b/src/main/java/com/palnet/server/command/SocketCommand.java @@ -152,11 +152,7 @@ public class SocketCommand { try { HttpRequest request = HttpRequest.newBuilder() .uri(new URI( -// "http://211.253.38.218:8080/api/ctr/cntrl/id/" + model.getObjectId() env.getProperty("app.host") + "api/ctr/cntrl/id/" + model.getObjectId() - + "/" + model.getLat() - + "/" + model.getLng() - )) .version(HttpClient.Version.HTTP_2) .GET() @@ -174,14 +170,12 @@ 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.setControlStartDt(DateUtils.getCurrentTime()); ControlCacheModel ccm = new ControlCacheModel(); ccm.setControlId((String) data.get("controlId")); ccm.setTypeCd((String) data.get("typeCd")); ccm.setAreaTrnsYn((String) data.get("areaTrnsYn")); - ccm.setControlWarnCd("Y".equals(data.get("controlWarnCd")) ? true : false); ccm.setRegTime(System.currentTimeMillis()); ControlCacheUtils.setControl(model.getObjectId(),ccm); @@ -197,6 +191,7 @@ public class SocketCommand { model.setAreaTrnsYn(control.getAreaTrnsYn()); model.setControlWarnCd(control.isControlWarnCd()); control.setRegTime(System.currentTimeMillis()); + ControlCacheUtils.setControl(model.getObjectId(),control); } Long end = System.currentTimeMillis(); logger.info(">>> during time : {}::{}", model.getObjectId(),end - start);