diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java index 6cf50c9..d25c631 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java @@ -199,11 +199,13 @@ public class CtrCntrlController { return ResponseEntity.ok().body(new SuccessResponse(rs)); } - @GetMapping("/id/{id}") - public ResponseEntity getId(@PathVariable String id) { + @GetMapping("/id/{id}/{lat}/{lon}") + public ResponseEntity getId(@PathVariable String id, + @PathVariable Double lat, + @PathVariable Double lon) { Map result; try { - result = service.getId(id); + result = service.getId(id, lat, lon); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 68e06e0..6d41d9a 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -380,7 +380,7 @@ public class CtrCntrlService { } - public Map getId(String id) { + public Map getId(String id, Double lat, Double lon) { Map result = new HashMap<>(); /* 식별번호의 가장 최근 이력 불러오기 */ @@ -418,6 +418,20 @@ public class CtrCntrlService { // 기체 식별번호의 관제 ID 저장 (single ton) shareContext.putIdntfKey(id, controlID); } + + List planList = this.getFlightPlan(id); + + if(planList != null && !planList.isEmpty()) { + CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq(); + containsRq.setIdntfNum(id); + containsRq.setLat(lat); + containsRq.setLon(lon); + containsRq.setPlanList(planList); + + CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq); + result.put("controlWarnCd", ctrCntrlPlanContainsRs.isWarning() ? "Y" : "N"); + } + return result; } } diff --git a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java index a688677..5893c8c 100644 --- a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java @@ -36,9 +36,9 @@ public class MessageConsumer { e.printStackTrace(); } - GPModel mapper = messageService.mapper(model); +// GPModel mapper = messageService.mapper(model); - messageService.insert(mapper); // GPS 정보 DB 동기화 처리 + messageService.insert(model); // GPS 정보 DB 동기화 처리 /* Websocket Model 메세지 서버로 위임 */ // messageService.sendToMessage(mapper); diff --git a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java index f8f6cf4..9014fa3 100644 --- a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java @@ -130,18 +130,18 @@ public class MessageServiceImpl implements MessageService { // } // 비행구역 Contains Check - List planList = ctrCntrlService.getFlightPlan(model.getObjectId()); - - if(planList != null && !planList.isEmpty()) { - CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq(); - containsRq.setIdntfNum(model.getObjectId()); - containsRq.setLat(model.getLat()); - containsRq.setLon(model.getLng()); - containsRq.setPlanList(planList); - - CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = ctrCntrlService.checkPlanContains(containsRq); - model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning()); - } +// List planList = ctrCntrlService.getFlightPlan(model.getObjectId()); +// +// if(planList != null && !planList.isEmpty()) { +// CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq(); +// containsRq.setIdntfNum(model.getObjectId()); +// containsRq.setLat(model.getLat()); +// containsRq.setLon(model.getLng()); +// containsRq.setPlanList(planList); +// +// CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = ctrCntrlService.checkPlanContains(containsRq); +// model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning()); +// } return model; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index df87745..56ca77a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -47,8 +47,8 @@ spring: hibernate: # use_sql_comments: true # use_sql_comments: false - show_sql: true - format_sql: true +# show_sql: true +# format_sql: true rabbitmq: host: 192.168.0.24 port: 5672