From 5466ba78ef7cc83345fca3491e117e766d38068c Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 13:51:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86=E5=8C=96?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 4 ++-- .../fangjia/open/model/AddesssMatchModel.java | 10 ++++++++++ .../com/fangjia/open/model/AddressModel.java | 8 ++++++++ .../service/address/mode/MatchParams.java | 19 ++++++++++--------- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 483f228fc..1ee37e675 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1743,7 +1743,7 @@ public class AddressController { // matchParams.setUseMap(true); matchParams.setUseAliyunApi(true); - matchParams.setExportLatAndLng(true); + matchParams.setContainsLocation(model.isContainsLocation()); Building building = addressParserService.standard(matchParams); Address address = building.getSearchAddress(); UniversalDto dto = UniversalDto.newDto(); @@ -1785,7 +1785,7 @@ public class AddressController { dto.append("unitNumber", address.getUnitNumber()); dto.append("roomNumber", address.getRoomNumber()); dto.append("formattedAddress", address.getFormattedAddress()); - if(matchParams.isExportLatAndLng()){ + if(matchParams.isContainsLocation()){ dto.append("lat", building.getLat()); dto.append("lng", building.getLng()); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index 92345873e..3d362bbb9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -19,6 +19,16 @@ public class AddesssMatchModel extends FangjiaApiModel { private String province; private String debugName; private boolean useMap; + + public boolean isContainsLocation() { + return containsLocation; + } + + public void setContainsLocation(boolean containsLocation) { + this.containsLocation = containsLocation; + } + + private boolean containsLocation; private boolean debug; public String getCity() { return city; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java index adf25301a..8c41c06ab 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java @@ -36,7 +36,15 @@ public class AddressModel extends FangjiaApiModel { private Integer pageNo; // 是否用于检查 private String dataLevel; + public boolean isContainsLocation() { + return containsLocation; + } + public void setContainsLocation(boolean containsLocation) { + this.containsLocation = containsLocation; + } + + private boolean containsLocation; public boolean isIncludeMaps() { return includeMaps; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java index 22ff23d07..498b12052 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/MatchParams.java @@ -25,8 +25,17 @@ public class MatchParams { private boolean useMap; /**是否使用阿里云接口*/ private boolean useAliyunApi; + + public boolean isContainsLocation() { + return containsLocation; + } + + public void setContainsLocation(boolean containsLocation) { + this.containsLocation = containsLocation; + } + /**是否输出经纬度*/ - private boolean exportLatAndLng; + private boolean containsLocation; /**地址解析目的*/ private AddressParserGoal addressParserGoal; @@ -95,14 +104,6 @@ public class MatchParams { this.useAliyunApi = useAliyunApi; } - public boolean isExportLatAndLng() { - return exportLatAndLng; - } - - public void setExportLatAndLng(boolean exportLatAndLng) { - this.exportLatAndLng = exportLatAndLng; - } - public AddressParserGoal getAddressParserGoal() { return addressParserGoal; }