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