From 7739232f1d74d318137a41e052427f171c67fa33 Mon Sep 17 00:00:00 2001 From: xuhe Date: Sat, 17 Apr 2021 18:18:03 +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=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/address/AddressParserServiceImpl.java | 11 +++++++++++ .../address/format/AddressFormatterFactory.java | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) 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 da76b0bc4..4926d96d1 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 @@ -176,6 +176,17 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setKeywords(poi); } } + if(StringUtils.isNotBlank(addr.getKeywords()) && addr.getOrgAddress().indexOf(addr.getKeywords())>-1){ + String str = AddressParserUtil.match(Pattern.compile(".*村(.*(组|队))?\\d+(号)?$"), addr.getOrgAddress().substring(addr.getOrgAddress().indexOf(addr.getKeywords()),addr.getOrgAddress().length())); + if(StringUtils.isNotBlank(str)){ + String newKeywords = AddressParserUtil.match(Pattern.compile(".*村(.*(组|队))?"), str); + if(StringUtils.isNotBlank(newKeywords)){ + addr.setKeywords(newKeywords); + addr.setParsedPropertyName(newKeywords); + aliyunBo.setRoomno(str.replace(newKeywords,"")); + } + } + } if(StringUtils.isNotBlank(aliyunBo.getCity())){ addr.setSuggestCity(aliyunBo.getCity()); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java index 5f61f7dfa..ea95695e8 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java @@ -63,14 +63,18 @@ public class AddressFormatterFactory { }); - /*人民中路123-3501 -->人民中路123号3501室*/ - formatters.add(new AbstractAddressFormatter(Pattern.compile(".*[路|弄]\\d+-\\d{3,4}$")) { + /*人民中路123-128 -->人民中路123号-3501号*/ + formatters.add(new AbstractAddressFormatter(Pattern.compile(".*(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?\\d+-\\d{3,4}(号)?$")) { - final Pattern TARGET_PATTERN = Pattern.compile("(?<=(路|号))\\d+-\\d{3,4}$"); + final Pattern TARGET_PATTERN = Pattern.compile("(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?\\d+-\\d{3,4}(号)?$"); @Override protected String doFormat(String address) { String targetStr = DataUtil.match(address, TARGET_PATTERN); - return address.replace(targetStr, targetStr.replace("-", "号") + "室"); + if(targetStr.endsWith("号")){ + return address.replace(targetStr, targetStr.replace("-", "号-")); + }else{ + return address.replace(targetStr, targetStr.replace("-", "号-") + "号"); + } } });