From 6c640bce90a0f6322fb7ce80a1ddd56b9cd391a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Tue, 23 Jul 2024 16:21:55 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B6=80=EC=84=9C=EB=B3=84=20=EA=B4=80?= =?UTF-8?q?=EC=A0=9C=20=EB=B0=94=EC=9A=B4=EB=8D=94=EB=A6=AC=20=ED=94=BC?= =?UTF-8?q?=EB=93=9C=EB=B0=B1=20=EC=A0=81=EC=9A=A9[=EB=A7=A4=EA=B0=9C?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=A5=BC=20=EB=B0=9B=EC=95=84=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comn/coordinate/model/BoundaryModel.java | 13 ++++++++ .../model/SearchDepartmentBoundaryRS.java | 6 ---- .../service/ComnCoordinateService.java | 30 +++++++++++++------ 3 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/BoundaryModel.java diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/BoundaryModel.java b/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/BoundaryModel.java new file mode 100644 index 00000000..235e77f0 --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/BoundaryModel.java @@ -0,0 +1,13 @@ +package com.palnet.biz.api.comn.coordinate.model; + +import com.palnet.comn.utils.CoordUtils; +import lombok.Data; + +import java.util.List; + +@Data +public class BoundaryModel { + private String location; + + private List coordinates; +} diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/SearchDepartmentBoundaryRS.java b/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/SearchDepartmentBoundaryRS.java index e1856fb3..ffe2b0e6 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/SearchDepartmentBoundaryRS.java +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/model/SearchDepartmentBoundaryRS.java @@ -11,10 +11,4 @@ public class SearchDepartmentBoundaryRS { private List boundaryModels; - @Data - public static class BoundaryModel{ - private String location; - - private List coordinates; - } } diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/service/ComnCoordinateService.java b/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/service/ComnCoordinateService.java index 333f93fd..c714d19f 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/service/ComnCoordinateService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/service/ComnCoordinateService.java @@ -147,26 +147,39 @@ public class ComnCoordinateService { return regexp; } + /** + * TestRQ 용 + * @return + */ + public SearchDepartmentBoundaryRS getDepartmentBoundary(){ + + String cptAuthCode = jwtTokenUtil.getCptAuthCodeByToken(); + + List boundaryModels = this.getDepartmentBoundary(cptAuthCode); + + SearchDepartmentBoundaryRS result = new SearchDepartmentBoundaryRS(); + result.setBoundaryModels(boundaryModels); + + return result; + } + /** * 부서가 관제하는 바운더리 좌표 반환하는 코드 * @return 부서에 해당하는 좌표 반환 */ - public SearchDepartmentBoundaryRS getDepartmentBoundary() { - - String cptAuthCode = jwtTokenUtil.getCptAuthCodeByToken(); + public List getDepartmentBoundary(String cptAuthCode) { List addressList = fltCptAuthAdminDistrictBasQueryRepository.findAddressByCptAuthCode(cptAuthCode); log.warn("===> {}", addressList); - List boundaryModels = new ArrayList<>(); + List boundaryModels = new ArrayList<>(); for(LocationCdAddressModel model : addressList){ try { String scope = CoordUtils.getInstance().getScope(model.getAddress()); - List locationCoordinateModelList = null; Boolean accurateSearch = false; try { @@ -191,14 +204,14 @@ public class ComnCoordinateService { for(ComAdmDistrictBas entity : entityList){ List coordModelList = CoordUtils.getInstance().getCoordinateByAddress(entity.getAdmCd(), scope); - SearchDepartmentBoundaryRS.BoundaryModel boundaryModel = new SearchDepartmentBoundaryRS.BoundaryModel(); + BoundaryModel boundaryModel = new BoundaryModel(); boundaryModel.setCoordinates(coordModelList); boundaryModel.setLocation(entity.getAdmSectNm()); boundaryModels.add(boundaryModel); } } else { - SearchDepartmentBoundaryRS.BoundaryModel boundaryModel = new SearchDepartmentBoundaryRS.BoundaryModel(); + BoundaryModel boundaryModel = new BoundaryModel(); boundaryModel.setCoordinates(locationCoordinateModelList); boundaryModel.setLocation(model.getAddress()); @@ -215,12 +228,11 @@ public class ComnCoordinateService { SearchDepartmentBoundaryRS result = new SearchDepartmentBoundaryRS(); result.setBoundaryModels(boundaryModels); - return result; + return boundaryModels; } public Boolean accurateSearchValidation(String address){ - return Pattern.matches("^[^ ]+도 [^ ]+시$", address); } }