diff --git a/http/server/server.http b/http/server/server.http index 5b2f1c33..73c14171 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 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; + */ } }