From a3ae325941fc635a1ec96b5b2b358010cfc7f923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 25 Mar 2021 17:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9D=80=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddressController.java | 8 +++++--- .../com/fangjia/service/address/AddressParserUtil.java | 2 +- 2 files changed, 6 insertions(+), 4 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 39f92dbbb..67dad1951 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 @@ -1765,9 +1765,11 @@ public class AddressController { if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ String addr = building.getAddress(); String street = AddressParserUtil.extractStreet(addr); - dto.append("street", street); - if(addr.length() != street.length()){ - dto.append("streetNumber", addr.replaceFirst(street, "")); + if(street != null){ + dto.append("street", street); + if(addr.length() != street.length()){ + dto.append("streetNumber", addr.replaceFirst(street, "")); + } } } dto.append("buildingNumber", address.getBuildingNumber()); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java index dbc230c2d..e1f4b1338 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java @@ -21,7 +21,7 @@ import java.util.regex.Pattern; */ public class AddressParserUtil { - static final Pattern STREET_PATTERN = Pattern.compile("^.+(路|街道|弄|街)"); + static final Pattern STREET_PATTERN = Pattern.compile("^.+(路|街道|弄|街|道|巷)"); static final Pattern CONNECTOR_PATTERN = Pattern.compile("~|-|~"); public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("\\d+(~|-|~)\\d+号"); static final Pattern SEPARATOR_PATTERN = Pattern.compile("、|,");