diff --git a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index ae83b82..ad4ad0f 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -93,6 +93,7 @@ public class BasFlightController { log.info(">>> rq : {}", rq); boolean result = basFlightService.createPlan(rq); resultMap.put("result", result); + log.info(">>> resultMap : " , resultMap); } catch (CustomException e) { log.error("IGNORE : {}", e); diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index 11c2f9e..5bcdf3b 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -110,7 +110,7 @@ public class BasFlightService { } // 비행계획서 등록 - public BasFlightPlanResultMessageRq createPlan(BasFlightPlanModel rq) { + public boolean createPlan(BasFlightPlanModel rq) { // 비행계획서 등록 시 계획일자 중복 , 비행구역 중복 체크 BasFlightPlanResultMessageRq ReturnCheck = new BasFlightPlanResultMessageRq(); GeometryFactory geometryFactory = new GeometryFactory(); @@ -120,11 +120,8 @@ public class BasFlightService { String idntfNum = arcrftModelList.get(i).getIdntfNum(); int size = fltPlanQueryRepository.arcrftCheck(rq, idntfNum).size(); if( size != 0) { - ReturnCheck.setDateCheck(false); - ReturnCheck.setFinalCheck(false); - return ReturnCheck; - }else { - ReturnCheck.setDateCheck(true); + + return false; } } List coordList = new ArrayList<>(); @@ -240,16 +237,12 @@ public class BasFlightService { queryContains = true; break; } - } + } boolean check = FlightUtils.overlaps(rqPoly, queryPoly); boolean checks = FlightUtils.overlaps(queryPoly, rqPoly); if(check == true || checks == true || rqContains == true || queryContains == true) { - ReturnCheck.setAreaCheck(false); - ReturnCheck.setFinalCheck(false); - return ReturnCheck; + return false; } - ReturnCheck.setAreaCheck(true); - ReturnCheck.setFinalCheck(true); } //비행계획서 String userId = jwtTokenUtil.getCstmrSnoByToken().toString(); @@ -304,7 +297,7 @@ public class BasFlightService { fltPlanArcrftRepository.save(arcrftEntity); } } - return ReturnCheck; + return true; } // 비행계획서 수정