Merge branch 'feature_master_xh_standard' into 'master'
Feature master xh standard See merge request !7
This commit is contained in:
+32
-22
@@ -168,7 +168,7 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
if(params.isUseAliyunApi()){
|
if(params.isUseAliyunApi()){
|
||||||
aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity());
|
aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity());
|
||||||
if(aliyunBo != null){
|
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);
|
addr.setKeywords(poi);
|
||||||
if(StringUtils.isNotBlank(aliyunBo.getCity())){
|
if(StringUtils.isNotBlank(aliyunBo.getCity())){
|
||||||
addr.setSuggestCity(aliyunBo.getCity());
|
addr.setSuggestCity(aliyunBo.getCity());
|
||||||
@@ -197,7 +197,7 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void completBuildingField(Building matchedBuilding, AliyunBo aliyunBo, MatchParams params){
|
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())){
|
if(StringUtils.isBlank(matchedBuilding.getSuggestName())){
|
||||||
matchedBuilding.setSuggestName(poi);
|
matchedBuilding.setSuggestName(poi);
|
||||||
}else if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){
|
}else if(matchedBuilding.getSuggestName()!=null && StringUtils.isNotBlank(poi) && params.getAddress().contains(poi)){
|
||||||
@@ -205,21 +205,19 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
matchedBuilding.setSuggestName(poi);
|
matchedBuilding.setSuggestName(poi);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(matchedBuilding.getProvince())){
|
|
||||||
matchedBuilding.setProvince(aliyunBo.getProv());
|
|
||||||
}
|
|
||||||
if(StringUtils.isBlank(matchedBuilding.getCity())){
|
|
||||||
matchedBuilding.setCity(aliyunBo.getCity());
|
|
||||||
}
|
|
||||||
matchedBuilding.setStreet(aliyunBo.getRoad());
|
|
||||||
matchedBuilding.setStreetno(aliyunBo.getRoadno());
|
|
||||||
|
|
||||||
Address addr = matchedBuilding.getSearchAddress();
|
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())){
|
if(StringUtils.isBlank(addr.getDevelopmentZone())){
|
||||||
addr.setDevelopmentZone(aliyunBo.getDevzone());
|
addr.setDevelopmentZone(aliyunBo.getDevzone());
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(addr.getDistrict())){
|
if(StringUtils.isBlank(addr.getDistrict())){
|
||||||
addr.setDistrict(aliyunBo.getDistrict());
|
addr.setDistrict(RegionData.formatRegion(aliyunBo.getDistrict()));
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(addr.getTownship())){
|
if(StringUtils.isBlank(addr.getTownship())){
|
||||||
addr.setTownship(aliyunBo.getTown());
|
addr.setTownship(aliyunBo.getTown());
|
||||||
@@ -233,9 +231,28 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
if(StringUtils.isBlank(addr.getRoomNumber())){
|
if(StringUtils.isBlank(addr.getRoomNumber())){
|
||||||
addr.setRoomNumber(aliyunBo.getRoomno());
|
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);
|
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)){
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){
|
Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){
|
||||||
|
|
||||||
AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType);
|
AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType);
|
||||||
@@ -916,15 +933,13 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
if(StringUtils.isNotBlank(address.getStreet())){
|
if(StringUtils.isNotBlank(address.getStreet())){
|
||||||
formattedAddressBuilder.append(address.getStreet());
|
formattedAddressBuilder.append(address.getStreet());
|
||||||
}
|
}
|
||||||
if("上海".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && !address.getStreet().endsWith("弄")){
|
if(StringUtils.isNotBlank(address.getStreet()) && StringUtils.isNotBlank(address.getStreetNumber())){
|
||||||
if(StringUtils.isNotBlank(address.getStreetNumber())){
|
formattedAddressBuilder.append(address.getStreetNumber());
|
||||||
formattedAddressBuilder.append(address.getStreetNumber());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){
|
if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){
|
||||||
formattedAddressBuilder.append(building.getAddress());
|
formattedAddressBuilder.append(building.getAddress());
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotBlank(building.getSuggestName()) && building.getSuggestName().equals(address.getOrgKeywords())){
|
if(StringUtils.isNotBlank(building.getSuggestName())){
|
||||||
formattedAddressBuilder.append(building.getSuggestName());
|
formattedAddressBuilder.append(building.getSuggestName());
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(building.getSuggestName())){
|
if(StringUtils.isBlank(building.getSuggestName())){
|
||||||
@@ -934,11 +949,6 @@ public class AddressParserServiceImpl implements AddressParserService {
|
|||||||
formattedAddressBuilder.append(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());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotBlank(address.getOrgBuildingNumber())){
|
if(StringUtils.isNotBlank(address.getOrgBuildingNumber())){
|
||||||
if(StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")
|
if(StringUtils.isNotBlank(address.getStreet()) && address.getStreet().endsWith("弄")
|
||||||
&& StringUtils.isNotBlank(address.getStreetNumber())
|
&& StringUtils.isNotBlank(address.getStreetNumber())
|
||||||
|
|||||||
Reference in New Issue
Block a user