优化地址标准化接口
This commit is contained in:
+15
@@ -1755,6 +1755,21 @@ public class AddressController {
|
||||
dto.append("street", address.getStreet());
|
||||
dto.append("streetNumber", address.getStreetNumber());
|
||||
dto.append("name", building.getSuggestName());
|
||||
if(StringUtils.isBlank(building.getSuggestName())){
|
||||
if(StringUtils.isNotBlank(address.getParsedPropertyName())){
|
||||
dto.append("name", address.getParsedPropertyName());
|
||||
}else if(StringUtils.isNotBlank(address.getOrgKeywords())){
|
||||
dto.append("name", address.getOrgKeywords());
|
||||
}
|
||||
}
|
||||
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, ""));
|
||||
}
|
||||
}
|
||||
dto.append("buildingNumber", address.getBuildingNumber());
|
||||
dto.append("unitNumber", address.getUnitNumber());
|
||||
dto.append("roomNumber", address.getRoomNumber());
|
||||
|
||||
+10
@@ -860,9 +860,19 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){
|
||||
formattedAddressBuilder.append(building.getAddress());
|
||||
}
|
||||
if(StringUtils.isNotBlank(building.getSuggestName()) && building.getSuggestName().equals(address.getOrgKeywords())){
|
||||
formattedAddressBuilder.append(building.getSuggestName());
|
||||
}
|
||||
if(StringUtils.isBlank(building.getSuggestName())){
|
||||
if(StringUtils.isNotBlank(address.getParsedPropertyName())){
|
||||
formattedAddressBuilder.append(address.getParsedPropertyName());
|
||||
}else if(StringUtils.isNotBlank(address.getOrgKeywords())){
|
||||
formattedAddressBuilder.append(address.getOrgKeywords());
|
||||
}
|
||||
}
|
||||
if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")){
|
||||
if(StringUtils.isNotBlank(address.getStreetNumber())){
|
||||
formattedAddressBuilder.append(address.getStreetNumber());
|
||||
|
||||
Reference in New Issue
Block a user