From aea6af160247bc3381078daef72536fde753b6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Wed, 31 Jul 2024 11:58:32 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=93=9C=EB=A1=A0=EC=9B=90=EC=8A=A4?= =?UTF-8?q?=ED=86=B1=20=EC=97=B0=EB=8F=99=EC=8B=9C=20=EB=B0=98=ED=99=98=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/external/service/DronOneStopService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java index 79036bfe..da9eccfd 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java @@ -159,18 +159,17 @@ public class DronOneStopService { dosFltPlanResultRepository.save(dosFltPlanResultInsert); // rs - ApprovalCd approvalCd = approvalResult.getApprovalCd(); // 조건부 승인인 경우 미승인으로 변경 - 아직 드론원스톱에서 작업을 안함으로 인한 작업 - if (approvalCd == null) { - approvalCd = ApprovalCd.UNTARGETED_AREA; - } else if (approvalCd == ApprovalCd.CONDITIONAL_APPROVED) { - approvalCd = ApprovalCd.UNAPPROVED; + if (saveApprovalCd == null) { + saveApprovalCd = ApprovalCd.UNTARGETED_AREA; + } else if (saveApprovalCd == ApprovalCd.CONDITIONAL_APPROVED) { + saveApprovalCd = ApprovalCd.UNAPPROVED; } - log.info("approvalCd : {}/{}", approvalCd.getCode(), approvalCd); + log.info("approvalCd : {}/{}", saveApprovalCd.getCode(), saveApprovalCd); DosPlanRs.DosPlan.CheckInfo checkInfo = DosPlanRs.DosPlan.CheckInfo.builder() .zoneno(area.getZoneno()) - .chkresult(approvalCd.getCode()) - .reason(approvalCd.getMessage()) + .chkresult(saveApprovalCd.getCode()) + .reason(saveApprovalCd.getMessage()) .obslimit(Objects.requireNonNull(LimitZoneType.fromCode(approvalResult.getLimitZone())).getMessage()) .prmtelev(approvalResult.getFltElevMax() != null ? String.valueOf(((int) Math.floor(approvalResult.getFltElevMax()))) : null) .build();