|
|
|
@ -147,26 +147,39 @@ public class ComnCoordinateService {
|
|
|
|
|
return regexp; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* TestRQ 용 |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public SearchDepartmentBoundaryRS getDepartmentBoundary(){ |
|
|
|
|
|
|
|
|
|
String cptAuthCode = jwtTokenUtil.getCptAuthCodeByToken(); |
|
|
|
|
|
|
|
|
|
List<BoundaryModel> boundaryModels = this.getDepartmentBoundary(cptAuthCode); |
|
|
|
|
|
|
|
|
|
SearchDepartmentBoundaryRS result = new SearchDepartmentBoundaryRS(); |
|
|
|
|
result.setBoundaryModels(boundaryModels); |
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 부서가 관제하는 바운더리 좌표 반환하는 코드 |
|
|
|
|
* @return 부서에 해당하는 좌표 반환 |
|
|
|
|
*/ |
|
|
|
|
public SearchDepartmentBoundaryRS getDepartmentBoundary() { |
|
|
|
|
|
|
|
|
|
String cptAuthCode = jwtTokenUtil.getCptAuthCodeByToken(); |
|
|
|
|
public List<BoundaryModel> getDepartmentBoundary(String cptAuthCode) { |
|
|
|
|
|
|
|
|
|
List<LocationCdAddressModel> addressList = fltCptAuthAdminDistrictBasQueryRepository.findAddressByCptAuthCode(cptAuthCode); |
|
|
|
|
|
|
|
|
|
log.warn("===> {}", addressList); |
|
|
|
|
|
|
|
|
|
List<SearchDepartmentBoundaryRS.BoundaryModel> boundaryModels = new ArrayList<>(); |
|
|
|
|
List<BoundaryModel> boundaryModels = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
for(LocationCdAddressModel model : addressList){ |
|
|
|
|
try { |
|
|
|
|
String scope = CoordUtils.getInstance().getScope(model.getAddress()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<CoordUtils.LocationCoordinateModel> locationCoordinateModelList = null; |
|
|
|
|
Boolean accurateSearch = false; |
|
|
|
|
try { |
|
|
|
@ -191,14 +204,14 @@ public class ComnCoordinateService {
|
|
|
|
|
for(ComAdmDistrictBas entity : entityList){ |
|
|
|
|
List<CoordUtils.LocationCoordinateModel> 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); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|