From 61f4076f443c8d793b2c42dd511fefb0e9482413 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 14:36:11 +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=EA=B9=80=ED=8F=AC=EA=B3=B5?=
 =?UTF-8?q?=ED=95=AD=20=EA=B4=80=EC=A0=9C=EA=B3=BC=20=ED=95=84=ED=84=B0?=
 =?UTF-8?q?=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/server/server.http                       | 16 ++++++-------
 .../api/bas/dos/service/BasDosService.java    | 23 +++++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/http/server/server.http b/http/server/server.http
index f3a9f4c9..bf0bba04 100644
--- a/http/server/server.http
+++ b/http/server/server.http
@@ -30,18 +30,18 @@
     //     userPswd: "palnet!909"
     // }
 
-    // 김항소-운항과
-    // const loginInfo = {
-    //     userId: "GMPATC",
-    //     userPswd: "GMPATC12!@"
-    // }
-
     // 김항소-관제과
     const loginInfo = {
-        userId: "GMPOPS",
-        userPswd: "GMPOPS12!@"
+        userId: "GMPATC",
+        userPswd: "GMPATC12!@"
     }
 
+    // 김항소-운항과
+    // const loginInfo = {
+    //     userId: "GMPOPS",
+    //     userPswd: "GMPOPS12!@"
+    // }
+
 
     request.variables.set("loginInfo", JSON.stringify(loginInfo))
 %}
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 edb04739..3b2487a4 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,7 +158,10 @@ public class BasDosService {
                     if (cptAuthCode != null) {
                         Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat());
                         if ("DF0002".equals(cptAuthCode)) {
-                            // TODO 검토신청한 건에 대해만 보이도록
+                            // 검토요청한 건에 대해만 보이도록(reviewedType - REQUEST(요청), REQUEST_CANCEL(요청취소), REQUEST_AGAIN(재요청), REVIEWED(완료))
+                            if (area.getReviewedType() != ReviewedType.REQUEST && area.getReviewedType() != ReviewedType.REQUEST_AGAIN && area.getReviewedType() != ReviewedType.REQUEST_CANCEL && area.getReviewedType() != ReviewedType.REVIEWED) {
+                                continue;
+                            }
                             // 관제과(9.3km)
                             AirspaceUtils airspaceUtils = AirspaceUtils.getInstance();
                             List<AirspaceUtils.FeatureInfo> airspaces = airspaceUtils.getAirspaces(AirspaceUtils.AirspaceType.GIMPO);
@@ -170,15 +173,17 @@ public class BasDosService {
                             });
                             if (!isContain) continue;
                         } else if ("DF0002-1".equals(cptAuthCode)) {
+                            /*
                             // TODO 운항과(김항소 관리 전역)
-//                            if(boundary == null) {
-//                                boundary = comnCoordinateService.getDeptGeometry("F0002");
-//                            }
-////                            log.info("boundary : {}", boundary);
-//                            GeometryFactory geometryFactory = new GeometryFactory();
-//                            Point point = geometryFactory.createPoint(centerPoint);
-//                            boolean isContain = boundary.stream().anyMatch(geometry -> geometry.contains(point));
-//                            if(!isContain) continue;
+                            if(boundary == null) {
+                                boundary = comnCoordinateService.getDeptGeometry("F0002");
+                            }
+//                            log.info("boundary : {}", boundary);
+                            GeometryFactory geometryFactory = new GeometryFactory();
+                            Point point = geometryFactory.createPoint(centerPoint);
+                            boolean isContain = boundary.stream().anyMatch(geometry -> geometry.contains(point));
+                            if(!isContain) continue;
+                             */
 
                         }
                     }