From 15f28eab12f981733cebc21c350c18ddb1dc58a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?leehagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Fri, 22 Sep 2023 18:35:22 +0900 Subject: [PATCH] =?UTF-8?q?[LDRA]=2056=20D=20:=20=EB=B2=94=EC=9C=84=20?= =?UTF-8?q?=EB=82=B4=EC=97=90=EC=84=9C=20=EC=BA=90=EC=B9=98=EA=B0=80=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=83=81=ED=83=9C=EB=A1=9C=20=EB=8D=98?= =?UTF-8?q?=EC=A0=B8=EC=A7=80=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=2056D=20=EA=B7=9C=EC=B9=99=20=EC=9C=84=EB=B0=98?= =?UTF-8?q?=EC=9D=80=20=EC=95=88=EB=82=98=EC=98=A4=EC=A7=80=EB=A7=8C=2071D?= =?UTF-8?q?=20=EA=B7=9C=EC=B9=99=20=EC=9C=84=EB=B0=98=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B0=94=EB=80=8C=EB=8A=94=20=ED=98=84=EC=83=81=20=EB=AA=A8?= =?UTF-8?q?=EC=95=84=EC=86=8C=ED=94=84=ED=8A=B8=EC=B8=A1=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=82=AC=EC=9C=A0=EC=84=9C=20=EC=9E=91=EC=84=B1=20=ED=95=B4?= =?UTF-8?q?=EC=95=BC=ED=95=B4=EC=84=9C=20=ED=95=9C=EC=AA=BD=20=EA=B7=9C?= =?UTF-8?q?=EC=B9=99=EC=9D=84=20=ED=81=B4=EB=A6=AC=EC=96=B4=20=ED=95=98?= =?UTF-8?q?=EB=8A=94=EA=B2=8C=20=EC=A2=8B=EB=8B=A4=EA=B3=A0=20=ED=95=98?= =?UTF-8?q?=EC=97=AC=2056=20D=20=EB=A1=9C=20=EA=B7=9C=EC=B9=99=EC=97=90=20?= =?UTF-8?q?=EB=A7=9E=EA=B2=8C=20=ED=81=B4=EB=A6=AC=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/acnt/jwt/service/JwtService.java | 3 ++- .../api/bas/dron/service/BasDronService.java | 3 ++- .../bas/flight/service/BasFlightService.java | 23 ++++++++++++------- 3 files changed, 19 insertions(+), 10 deletions(-) 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();