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("、|,");