From 488a5fc32ab4c64c5d8f2fb7025b33efb9a262a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 1 Aug 2024 16:54:26 +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=9E=AC=EA=B2=80=ED=86=A0=20=EC=82=AC=EC=9C=A0=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http/server/server.http | 4 +++- .../biz/api/bas/dos/model/BasDosPlanAreaRs.java | 2 ++ .../api/bas/dos/model/BasDosUpdatePlanRq.java | 2 ++ .../biz/api/bas/dos/service/BasDosService.java | 17 +++++++++-------- .../palnet/biz/jpa/entity/DosFltPlanArea.java | 3 +++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/http/server/server.http b/http/server/server.http index 2be95ad8..5b2f1c33 100644 --- a/http/server/server.http +++ b/http/server/server.http @@ -66,6 +66,7 @@ Authorization: {{accessToken}} GET {{appHost}}/api/bas/dos/plan ?searchStDt=2023-06-29 &searchEndDt=2024-06-29 +# &applyNo=T201118-3010 # &reviewedType=W Authorization: {{accessToken}} @@ -95,7 +96,8 @@ Authorization: {{accessToken}} "fltElev": 80.0, "dtl": "수정상세", "era": "수정응급실", - "rm": "수정ㅂㅣ고" + "rm": "수정ㅂㅣ고", + "reviewedReason": "사유사유" } ] diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java index c7db8702..eb17af28 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java @@ -52,6 +52,8 @@ public class BasDosPlanAreaRs { private String rm; // 검토유형 private ReviewedType reviewedType; + // 재검튜사유 + private String reviewedReason; // 요청반경 private Long reqRadius; // 허용반경 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 547f573f..69fc76da 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 @@ -24,4 +24,6 @@ public class BasDosUpdatePlanRq { private String era; // 비고 private String rm; + // 재검토 사유 + private String reviewedReason; } 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 acbc194d..6a700458 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 @@ -147,8 +147,8 @@ public class BasDosService { } // ReviewedType이 UNNECESSARY(불필요)인 경우 ApprovalCd가 UNTARGETED_AREA(비대상)인 경우만 조회 - if(rq.getReviewedType() == ReviewedType.UNNECESSARY){ - if(approvalCd != ApprovalCd.UNTARGETED_AREA) { + if (rq.getReviewedType() == ReviewedType.UNNECESSARY) { + if (approvalCd != ApprovalCd.UNTARGETED_AREA) { continue; } } @@ -157,9 +157,9 @@ public class BasDosService { String cptAuthCode = jwtTokenUtil.getCptAuthCodeByToken(); if (cptAuthCode != null) { Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat()); - if("DF0002".equals(cptAuthCode)) { + if ("DF0002".equals(cptAuthCode)) { // 관제과(9.3km) - AirspaceUtils airspaceUtils = AirspaceUtils.getInstance(); + AirspaceUtils airspaceUtils = AirspaceUtils.getInstance(); List airspaces = airspaceUtils.getAirspaces(AirspaceUtils.AirspaceType.GIMPO); GeometryFactory geometryFactory = new GeometryFactory(); Point point = geometryFactory.createPoint(centerPoint); @@ -167,8 +167,8 @@ public class BasDosService { Geometry airspaceGeometry = airspace.getGeometry(); return airspaceGeometry.contains(point); }); - if(!isContain) continue; - }else if("DF0002-1".equals(cptAuthCode)) { + if (!isContain) continue; + } else if ("DF0002-1".equals(cptAuthCode)) { // TODO 운항과(김항소 관리 전역) // if(boundary == null) { // boundary = comnCoordinateService.getDeptGeometry("F0002"); @@ -232,12 +232,11 @@ public class BasDosService { LimitZoneType limitZoneType = LimitZoneType.fromCode(limitZone); ReviewedType reviewedType = area.getReviewedType() != null ? area.getReviewedType() : ReviewedType.WAIT; - if(approvalCd == ApprovalCd.UNTARGETED_AREA) { + if (approvalCd == ApprovalCd.UNTARGETED_AREA) { reviewedType = ReviewedType.UNNECESSARY; } - BasDosPlanAreaRs areaRs = BasDosPlanAreaRs.builder() .planAreaSno(area.getPlanAreaSno()) .planSno(area.getPlanSno()) @@ -260,6 +259,7 @@ public class BasDosService { .era(area.getEra()) .rm(area.getRm()) .reviewedType(reviewedType) + .reviewedReason(area.getReviewedReason()) .reqRadius(area.getReqRadius()) .allowRadius(area.getAllowRadius()) .limitZoneCd(area.getLimitZone()) @@ -342,6 +342,7 @@ public class BasDosService { area.setDtl(planRq.getDtl()); area.setEra(planRq.getEra()); area.setRm(planRq.getRm()); + area.setReviewedReason(planRq.getReviewedReason()); area = dosFltPlanAreaRepository.save(area); diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java index ee59225a..77f488ad 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java @@ -62,6 +62,9 @@ public class DosFltPlanArea { @Convert(converter = ReviewedTypeConverter.class) @Column(name = "REVIEWED_TYPE") private ReviewedType reviewedType; + // 재검토 사유 + @Column(name = "REVIEWED_REASON") + private String reviewedReason; // 장애물 제한 표면 @Column(name = "LIMIT_ZONE") private String limitZone;