diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java b/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java index 66e280f..6051281 100644 --- a/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java @@ -187,7 +187,8 @@ public class JwtService { Optional optional = ptyCstmrBasRepository.findById(cstmrSno); if (!optional.isPresent()) { - throw new CustomException(ErrorCode.DATA_NOTFIND); +// throw new CustomException(ErrorCode.DATA_NOTFIND); + log.error("NO DATA FOUND"); } PtyCstmrBas entity = optional.get(); diff --git a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java index e75ba7d..f8e21e0 100644 --- a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java +++ b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java @@ -325,7 +325,8 @@ public class BasDronService { Optional optional = comArcrftBasRepository.findById(model.getArcrftSno()); if (!optional.isPresent()) { - log.error("DATA_NOTFIND"); + // throw new CustomException(ErrorCode.DATA_NOTFIND); + log.error("NO DATA FOUND."); } ComArcrftBas entity = optional.get(); 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 885b6ef..edce979 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 @@ -196,7 +196,7 @@ public class BasFlightService { return rs; } - public void planValid(BasFlightPlanModel rq) { + public void planValid(BasFlightPlanModel rq){ boolean isEqualsFltElev = false; List rqAreaList = rq.getAreaList(); String rqFltElev = rqAreaList.get(0).getFltElev(); @@ -304,10 +304,14 @@ public class BasFlightService { // 비행계획서 등록 @Transactional - public void createPlan(BasFlightPlanModel rq) throws IOException, JAXBException { + public void createPlan(BasFlightPlanModel rq) throws IOException, JAXBException{ - // 비행계획서 유효성 검사. - this.planValid(rq); + try { + // 비행계획서 유효성 검사. + this.planValid(rq); + }catch (RuntimeException e) { + throw new CustomException(ErrorCode.FAIL); + } // 비행계획서 String userId = jwtTokenUtil.getUserIdByToken(); @@ -384,10 +388,13 @@ public class BasFlightService { // 비행계획서 수정 @Transactional - public boolean updatePlan(BasFlightPlanModel rq) throws IOException, JAXBException { - - // 비행계획서 유효성 검사. - this.planValid(rq); + public boolean updatePlan(BasFlightPlanModel rq) throws IOException, JAXBException{ + try { + // 비행계획서 유효성 검사. + this.planValid(rq); + }catch (RuntimeException e) { + throw new CustomException(ErrorCode.FAIL); + } if (rq != null && rq.getPlanSno() != null) { String userId = jwtTokenUtil.getUserIdByToken();