地址标准化去bug修改

This commit is contained in:
xuhe
2021-04-01 14:22:46 +08:00
parent 794b386807
commit 65e68e0f2c
@@ -168,7 +168,7 @@ public class AddressParserServiceImpl implements AddressParserService {
if(params.isUseAliyunApi()){
aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity());
if(aliyunBo != null){
String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi());
String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", "");
addr.setKeywords(poi);
if(StringUtils.isNotBlank(aliyunBo.getCity())){
addr.setSuggestCity(aliyunBo.getCity());
@@ -197,7 +197,7 @@ public class AddressParserServiceImpl implements AddressParserService {
* @return
*/
void completBuildingField(Building matchedBuilding, AliyunBo aliyunBo, MatchParams params){
String poi = (aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi());
String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", "");
if(StringUtils.isBlank(matchedBuilding.getSuggestName())){
matchedBuilding.setSuggestName(poi);
}else if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){
@@ -205,16 +205,14 @@ public class AddressParserServiceImpl implements AddressParserService {
matchedBuilding.setSuggestName(poi);
}
}
if(StringUtils.isBlank(matchedBuilding.getProvince())){
matchedBuilding.setProvince(formatProvince(aliyunBo.getProv()));
}
if(StringUtils.isBlank(matchedBuilding.getCity())){
matchedBuilding.setCity(RegionData.formatCity(aliyunBo.getCity()));
}
matchedBuilding.setStreet(aliyunBo.getRoad());
matchedBuilding.setStreetno(aliyunBo.getRoadno());
Address addr = matchedBuilding.getSearchAddress();
if(StringUtils.isBlank(addr.getProvince())){
addr.setProvince(formatProvince(aliyunBo.getProv()));
}
if(StringUtils.isBlank(addr.getCity())){
addr.setCity(RegionData.formatCity(aliyunBo.getCity()));
}
if(StringUtils.isBlank(addr.getDevelopmentZone())){
addr.setDevelopmentZone(aliyunBo.getDevzone());
}
@@ -233,10 +231,19 @@ public class AddressParserServiceImpl implements AddressParserService {
if(StringUtils.isBlank(addr.getRoomNumber())){
addr.setRoomNumber(aliyunBo.getRoomno());
}
if(StringUtils.isBlank(addr.getStreet())){
addr.setStreet(aliyunBo.getRoad());
}
if(StringUtils.isBlank(addr.getStreetNumber())){
addr.setStreetNumber(aliyunBo.getRoadno());
}
matchedBuilding.setSearchAddress(addr);
}
String formatProvince(String province){
if(StringUtils.isBlank(province)){
return province;
}
Map<String, List<String>> provinceData = ProvinceData.getAllProvince();
for (String name : provinceData.keySet()) {
if(province.contains(name)){