feat: 드론원스톱 재검토 사유 항목 추가

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}}
 
@@ -81,7 +82,8 @@ Authorization: {{accessToken}}
     "fltElev": 80.0,
     "dtl": "수정상세",
     "era": "수정응급실",
-    "rm": "수정ㅂㅣ고"
+    "rm": "수정ㅂㅣ고",
+    "reviewedReason": "사유사유"
   }
 ]
 

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;
     // 허용반경

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;
 }

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,7 +157,7 @@ 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();
                             List<AirspaceUtils.FeatureInfo> airspaces = airspaceUtils.getAirspaces(AirspaceUtils.AirspaceType.GIMPO);
@@ -167,9 +167,9 @@ public class BasDosService {
                                 Geometry airspaceGeometry = airspace.getGeometry();
                                 return airspaceGeometry.contains(point);
                             });
-                            if(!isContain) continue;
-                        }else if("DF0002-1".equals(cptAuthCode)) {
-                            // TODO 운항과(김항소 관리 전역 + 김포공항 9.3km)
+                            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);
 
@@ -890,4 +891,5 @@ public class BasDosService {
             return null;
         }
     }
+
 }

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;