From 83359e83bf75406a35e3c71a50e6624c22e41923 Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 18:17:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E8=A1=A5=E5=85=85=E5=9F=8E=E5=B8=82=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddressController.java | 4 ++-- .../service/address/AddressParserServiceImpl.java | 4 ++++ .../java/com/fangjia/service/address/mode/Address.java | 9 +++++++++ .../fangjia/service/address/processor/CityProcessor.java | 3 +++ 4 files changed, 18 insertions(+), 2 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 1ee37e675..bd9daa20a 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 @@ -1722,10 +1722,10 @@ public class AddressController { public Object realStandardAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { + /*if (!OpenConfig.getConfig().addressMatchEnabled()) { mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); return mav; - } + }*/ if (StringUtils.isBlank(model.getAddress())) { mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); return mav; diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index 5531c7669..aba3d131b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -3,6 +3,7 @@ package com.fangjia.service.address; import com.fangjia.core.RegionData; import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.GeoUtils; +import com.fangjia.core.util.StringUtil; import com.fangjia.dal.QueryParam; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.common.ServerAreaData; @@ -169,6 +170,9 @@ public class AddressParserServiceImpl implements AddressParserService { if(aliyunBo != null){ String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi()); addr.setKeywords(poi); + if(StringUtils.isNotBlank(aliyunBo.getCity())){ + addr.setSuggestCity(aliyunBo.getCity()); + } } } if(params.isUseMap()){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index dff641cf0..21a79a722 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -57,6 +57,7 @@ public class Address { private String effectiveAddressPinYin; private String offset; private String miniAddress; + private String suggestCity; private String suggestDistrict; private String suggestName; private String suggestNamePinYin; @@ -302,6 +303,14 @@ public class Address { this.floor = floor; } + public String getSuggestCity() { + return suggestCity; + } + + public void setSuggestCity(String suggestCity) { + this.suggestCity = suggestCity; + } + public String getLoopLine() { return loopLine; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 21faa5322..f8ebb93bf 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -121,6 +121,9 @@ public class CityProcessor extends AbstractAddressProcessor { } } } + if(StringUtils.isBlank(address.getCity())){ + address.setCity(address.getSuggestCity()); + } return RepeatStatus.NEXT; } From b32e8a77c31e2baabc686fc19db3a73625d38a85 Mon Sep 17 00:00:00 2001 From: xuhe Date: Tue, 30 Mar 2021 18:19:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8E=BB=E6=8E=89=E5=9F=8E=E5=B8=82=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddressController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 bd9daa20a..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 @@ -1722,10 +1722,10 @@ public class AddressController { public Object realStandardAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - /*if (!OpenConfig.getConfig().addressMatchEnabled()) { + if (!OpenConfig.getConfig().addressMatchEnabled()) { mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); return mav; - }*/ + } if (StringUtils.isBlank(model.getAddress())) { mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); return mav;