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 d25c631..9d5394f 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,13 +199,26 @@ public class CtrCntrlController { return ResponseEntity.ok().body(new SuccessResponse(rs)); } - @GetMapping("/id/{id}/{lat}/{lon}") - public ResponseEntity getId(@PathVariable String id, - @PathVariable Double lat, - @PathVariable Double lon) { + @GetMapping("/id/{id}") + public ResponseEntity getId(@PathVariable String id) { Map result; try { - result = service.getId(id, lat, lon); + result = service.getId(id); + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + } + + @GetMapping("/warn/{id}/{lat}/{lon}") + public ResponseEntity checkWarring(@PathVariable String id, + @PathVariable Double lat, + @PathVariable Double lon) { + Map result; + try { + result = service.checkWarring(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 8fe6e2b..5e3ae8f 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 @@ -255,7 +255,7 @@ public class CtrCntrlService { if (arcrftList != null && !arcrftList.isEmpty()) { arcrftList.forEach(arcrft -> { FltPlanBas plan = planBasRepository. - findByGroupFlightPlan(arcrft.getPlanSno(), "N", fltNowDt).orElse(null); + findByGroupFlightPlan(arcrft.getPlanSno(), "Y", fltNowDt).orElse(null); if (plan != null ) { BasFlightPlanModel planMapping = BasFlightMapper.mapper.entityToModel(plan); @@ -380,7 +380,7 @@ public class CtrCntrlService { } - public Map getId(String id, Double lat, Double lon) { + public Map getId(String id) { Map result = new HashMap<>(); @@ -424,8 +424,15 @@ public class CtrCntrlService { shareContext.putIdntfKey(id, controlID); } + return result; + } + + public Map checkWarring(String id, Double lat, Double lon) { + Map result = new HashMap<>(); + List planList = this.getFlightPlan(id); + result.put("controlWarnCd", "N"); if(planList != null && !planList.isEmpty()) { CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq(); containsRq.setIdntfNum(id); diff --git a/src/main/java/com/palnet/biz/config/WebSecurityConfig.java b/src/main/java/com/palnet/biz/config/WebSecurityConfig.java index 71e8336..f24a967 100644 --- a/src/main/java/com/palnet/biz/config/WebSecurityConfig.java +++ b/src/main/java/com/palnet/biz/config/WebSecurityConfig.java @@ -38,6 +38,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { private final String[] PERMITTED_URL = { "/api/acnt/**", "/api/ctr/cntrl/id/**", + "/api/ctr/cntrl/warn/**", /* swagger v2 */ "/v2/api-docs", "/swagger-resources",