From bef7bb4b043e8084b7b3347669b1f232460c19a3 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 15:59:58 +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=20null=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/api/external/service/DronOneStopService.java | 4 +++- .../biz/api/external/service/DronOneStopServiceTest.java | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 da9eccfd..8609ea52 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 @@ -166,11 +166,12 @@ public class DronOneStopService { saveApprovalCd = ApprovalCd.UNAPPROVED; } log.info("approvalCd : {}/{}", saveApprovalCd.getCode(), saveApprovalCd); + LimitZoneType limitZoneType = LimitZoneType.fromCode(approvalResult.getLimitZone()); DosPlanRs.DosPlan.CheckInfo checkInfo = DosPlanRs.DosPlan.CheckInfo.builder() .zoneno(area.getZoneno()) .chkresult(saveApprovalCd.getCode()) .reason(saveApprovalCd.getMessage()) - .obslimit(Objects.requireNonNull(LimitZoneType.fromCode(approvalResult.getLimitZone())).getMessage()) + .obslimit(limitZoneType != null ? limitZoneType.getMessage() : null) .prmtelev(approvalResult.getFltElevMax() != null ? String.valueOf(((int) Math.floor(approvalResult.getFltElevMax()))) : null) .build(); @@ -340,4 +341,5 @@ public class DronOneStopService { Double distance = distances.stream().min(Double::compare).orElse(null); return distance; } + } diff --git a/pav-server/src/test/java/com/palnet/biz/api/external/service/DronOneStopServiceTest.java b/pav-server/src/test/java/com/palnet/biz/api/external/service/DronOneStopServiceTest.java index a9283934..fa677e0c 100644 --- a/pav-server/src/test/java/com/palnet/biz/api/external/service/DronOneStopServiceTest.java +++ b/pav-server/src/test/java/com/palnet/biz/api/external/service/DronOneStopServiceTest.java @@ -126,4 +126,10 @@ class DronOneStopServiceTest { } } + + @Test + void test() { + DosApprovalResult approvalResult= dronOneStopService.getApprovalResult(500.0, 492.0, new Coordinate(126.83916033495814, 37.56642984745274)); + log.info("{}", approvalResult); + } } \ No newline at end of file