feat: 드론원스톱 목록 김포공항 관제과 필터링

http/server/server.http

@@ -30,18 +30,18 @@
     //     userPswd: "palnet!909"
     // }
 
-    // 김항소-운항과
-    // const loginInfo = {
-    //     userId: "GMPATC",
-    //     userPswd: "GMPATC12!@"
-    // }
-
     // 김항소-관제과
     const loginInfo = {
-        userId: "GMPOPS",
+        userId: "GMPATC",
-        userPswd: "GMPOPS12!@"
+        userPswd: "GMPATC12!@"
     }
 
+    // 김항소-운항과
+    // const loginInfo = {
+    //     userId: "GMPOPS",
+    //     userPswd: "GMPOPS12!@"
+    // }
+
 
     request.variables.set("loginInfo", JSON.stringify(loginInfo))
 %}

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) {
+                            if(boundary == null) {
-//                                boundary = comnCoordinateService.getDeptGeometry("F0002");
+                                boundary = comnCoordinateService.getDeptGeometry("F0002");
-//                            }
+                            }
-////                            log.info("boundary : {}", boundary);
+//                            log.info("boundary : {}", boundary);
-//                            GeometryFactory geometryFactory = new GeometryFactory();
+                            GeometryFactory geometryFactory = new GeometryFactory();
-//                            Point point = geometryFactory.createPoint(centerPoint);
+                            Point point = geometryFactory.createPoint(centerPoint);
-//                            boolean isContain = boundary.stream().anyMatch(geometry -> geometry.contains(point));
+                            boolean isContain = boundary.stream().anyMatch(geometry -> geometry.contains(point));
-//                            if(!isContain) continue;
+                            if(!isContain) continue;
+                             */
 
                         }
                     }