From 020fa757f4872b83ce3de1dc4ed04aef976948cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Fri, 26 Jul 2024 11:30:49 +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=EA=B2=80=ED=86=A0=20=ED=83=80=EC=9E=85=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bas/dos/service/BasDosService.java    | 27 ++++++++++++-------
 .../biz/jpa/entity/type/ReviewedType.java     |  3 ++-
 2 files changed, 20 insertions(+), 10 deletions(-)

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 6b2e3cb2..bf086018 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
@@ -8,8 +8,6 @@ import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.layout.font.FontProvider;
 import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
 import com.palnet.biz.api.bas.dos.model.*;
-import com.palnet.biz.api.comn.coordinate.model.BoundaryModel;
-import com.palnet.biz.api.comn.coordinate.model.SearchDepartmentBoundaryRS;
 import com.palnet.biz.api.comn.coordinate.service.ComnCoordinateService;
 import com.palnet.biz.api.comn.file.model.ValidPdfModel;
 import com.palnet.biz.api.external.model.ApprovalCd;
@@ -22,7 +20,10 @@ import com.palnet.biz.jpa.entity.type.ReviewedType;
 import com.palnet.biz.jpa.repository.dos.*;
 import com.palnet.comn.code.ErrorCode;
 import com.palnet.comn.exception.CustomException;
-import com.palnet.comn.utils.*;
+import com.palnet.comn.utils.AirspaceUtils;
+import com.palnet.comn.utils.AreaUtils;
+import com.palnet.comn.utils.HttpUtils;
+import com.palnet.comn.utils.PdfUtils;
 import kr.dogfoot.hwpxlib.object.HWPXFile;
 import kr.dogfoot.hwpxlib.object.content.section_xml.SectionXMLFile;
 import kr.dogfoot.hwpxlib.object.content.section_xml.paragraph.Run;
@@ -43,7 +44,6 @@ import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -134,15 +134,15 @@ public class BasDosService {
             for (DosFltPlanArea area : areaList) {
                 if (area.getPlanSno().equals(planSno)) {
                     Optional<DosFltPlanResult> first = resultList.stream().filter(result -> result.getPlanAreaSno().equals(area.getPlanAreaSno())).findFirst();
-                    String approvalCd = "";
+                    ApprovalCd approvalCd = null;
                     Double fltElevMax = null;
                     if (first.isPresent()) {
                         DosFltPlanResult dosFltPlanResult = first.get();
-                        approvalCd = dosFltPlanResult.getApprovalCd();
+                        approvalCd = ApprovalCd.fromCode(dosFltPlanResult.getApprovalCd());
                         fltElevMax = dosFltPlanResult.getFltElevMax();
                     }
 
-                    if (rq.getApprovalCd() != null && !rq.getApprovalCd().equals(approvalCd)) {
+                    if (rq.getApprovalCd() != null && approvalCd != null && !rq.getApprovalCd().equals(approvalCd.getCode())) {
                         continue;
                     }
 
@@ -219,9 +219,18 @@ public class BasDosService {
                                 break;
                         }
                     }
+
                     String addr3 = addrRest.toString();
                     String limitZone = area.getLimitZone();
                     LimitZoneType limitZoneType = LimitZoneType.fromCode(limitZone);
+
+                    ReviewedType reviewedType = area.getReviewedType() != null ? area.getReviewedType() : ReviewedType.WAIT;
+                    if(approvalCd == ApprovalCd.UNTARGETED_AREA) {
+                        reviewedType = ReviewedType.UNNECESSARY;
+                    }
+
+
+
                     BasDosPlanAreaRs areaRs = BasDosPlanAreaRs.builder()
                             .planAreaSno(area.getPlanAreaSno())
                             .planSno(area.getPlanSno())
@@ -238,12 +247,12 @@ public class BasDosService {
                             .addr1(addr1)
                             .addr2(addr2)
                             .addr3(addr3)
-                            .approvalCd(approvalCd)
+                            .approvalCd(approvalCd.getCode())
                             .fltElevMax(fltElevMax)
                             .dtl(area.getDtl())
                             .era(area.getEra())
                             .rm(area.getRm())
-                            .reviewedType(area.getReviewedType() != null ? area.getReviewedType() : ReviewedType.WAIT)
+                            .reviewedType(reviewedType)
                             .reqRadius(area.getReqRadius())
                             .allowRadius(area.getAllowRadius())
                             .limitZoneCd(area.getLimitZone())
diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java
index c451f86f..bfd2c223 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java
@@ -7,7 +7,8 @@ import lombok.Getter;
 public enum ReviewedType {
     REVIEWED("R", "완료"),
     WAIT("W", "대기"),
-    CANCEL("C", "취소");
+    CANCEL("C", "취소"),
+    UNNECESSARY("U", "불필요");
 
     private final String code;
     @Getter