优化地址标准化接口

This commit is contained in:
2021-03-25 17:12:05 +08:00
parent f0a99e73ae
commit a3ae325941
2 changed files with 6 additions and 4 deletions
@@ -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());
@@ -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("、|,");