From a022668ca98b7a4b42e8cf06f3a8c79d6cd738e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 15 Jul 2024 18:02: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=83=91=20=EC=88=98=EC=A0=95=20=ED=95=AD=EB=AA=A9=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/api/bas/dos/model/BasDosUpdatePlanRq.java | 4 ++-- .../com/palnet/biz/api/bas/dos/service/BasDosService.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosUpdatePlanRq.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosUpdatePlanRq.java index d16e2e34..547f573f 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosUpdatePlanRq.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosUpdatePlanRq.java @@ -14,8 +14,8 @@ public class BasDosUpdatePlanRq { // private Long planSno; // 비행구역일련번호 private Long planAreaSno; - // 버퍼존(반경) - private Double bufferZone; + // 요청반경 + private Long reqRadius; // 고도 private Double fltElev; // 세부사항 diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java index bd813bf3..71f10e33 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java @@ -287,7 +287,7 @@ public class BasDosService { DosFltPlanArea area = optional.get(); area.setFltElev(planRq.getFltElev()); - area.setBufferZone(planRq.getBufferZone()); + area.setReqRadius(planRq.getReqRadius()); area.setDtl(planRq.getDtl()); area.setEra(planRq.getEra()); area.setRm(planRq.getRm()); @@ -295,7 +295,7 @@ public class BasDosService { area = dosFltPlanAreaRepository.save(area); // 재검증 - if (planRq.getFltElev() != null || planRq.getBufferZone() != null) { + if (planRq.getFltElev() != null || planRq.getReqRadius() != null) { Optional optionalResult = dosFltPlanResultRepository.findById(area.getPlanAreaSno()); DosFltPlanResult dosFltPlanResult = null; if (optionalResult.isPresent()) { @@ -303,12 +303,14 @@ public class BasDosService { } // Circle만 체크 Double bufferZone = area.getBufferZone(); + Long reqRadius = area.getReqRadius(); Double fltElev = area.getFltElev() != null ? area.getFltElev() : 0; // 좌표 추출 - 중심 좌표 Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat()); - DosApprovalResult approvalResult = dronOneStopService.getApprovalResult(bufferZone, fltElev, centerPoint); + double radius = area.getReqRadius() != null ? area.getReqRadius() : area.getBufferZone(); + DosApprovalResult approvalResult = dronOneStopService.getApprovalResult(radius, fltElev, centerPoint); // 재검증 수정 if (dosFltPlanResult != null) {