Browse Source

feat: 드론원스탑 수정 항목 변경

pull/19/head
지대한 2 months ago
parent
commit
a022668ca9
  1. 4
      pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosUpdatePlanRq.java
  2. 8
      pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java

4
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;
// 세부사항

8
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<DosFltPlanResult> 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) {

Loading…
Cancel
Save