From a9b54c9e50fb9a525715c87e2a3b78f3374a1246 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: Wed, 14 Aug 2024 10:38:48 +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=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=EB=B0=98=EA=B2=BD=EC=97=90=20=EC=9D=98?=
 =?UTF-8?q?=ED=95=9C=20=EB=B0=98=EC=9B=90=20=EC=A0=84=EC=86=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java |  2 ++
 .../palnet/biz/api/bas/dos/service/BasDosService.java  | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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 4c26d4c5..e2a19deb 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
@@ -71,4 +71,6 @@ public class BasDosPlanAreaRs {
     private String approvalCd;
     // buffer
     private List<Map<String, Double>> bufferCoordList;
+    // req buffer
+    private List<Map<String, Double>> reqBufferCoordList;
 }
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 82bdecf9..6ead5688 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
@@ -158,6 +158,7 @@ public class BasDosService {
                     if (cptAuthCode != null) {
                         Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat());
                         if ("DF0002".equals(cptAuthCode)) {
+                            // 검토신청한 건에 대해서
                             // 관제과(9.3km)
                             AirspaceUtils airspaceUtils = AirspaceUtils.getInstance();
                             List<AirspaceUtils.FeatureInfo> airspaces = airspaceUtils.getAirspaces(AirspaceUtils.AirspaceType.GIMPO);
@@ -183,9 +184,9 @@ public class BasDosService {
                     }
 
                     List<Map<String, Double>> bufferCoordList = null;
+                    List<Map<String, Double>> reqBufferCoordList = null;
                     if (type == PlanSelectType.LIST) {
                         List<Coordinate> coordBuffers = areaUtils.createCircle(new Coordinate(area.getLon(), area.getLat()), area.getBufferZone());
-
                         if ("GIMPO".equalsIgnoreCase(rq.getSelectZone())) {
                             AirspaceUtils airspaceUtils = AirspaceUtils.getInstance();
                             Geometry rqGeometry = airspaceUtils.createGeometryByCoordinate(coordBuffers);
@@ -201,6 +202,12 @@ public class BasDosService {
                             }
                         }
                         bufferCoordList = coordBuffers.stream().map(coord -> Map.of("lat", coord.y, "lon", coord.x)).collect(Collectors.toList());
+                        if(area.getReqRadius() != null && area.getReqRadius() > 0) {
+                            List<Coordinate> reqCoordBuffers = areaUtils.createCircle(new Coordinate(area.getLon(), area.getLat()), area.getReqRadius());
+                            reqBufferCoordList = reqCoordBuffers.stream().map(coord -> Map.of("lat", coord.y, "lon", coord.x)).collect(Collectors.toList());
+                        }
+
+
                     }
 
                     // TODO 추후 Utils 생성
@@ -266,6 +273,7 @@ public class BasDosService {
                             .limitZoneCd(area.getLimitZone())
                             .limitZoneNm(limitZoneType != null ? limitZoneType.getMessage() : null)
                             .bufferCoordList(bufferCoordList)
+                            .reqBufferCoordList(reqBufferCoordList)
                             .build();
                     areaRsList.add(areaRs);
                 }