Merge branch 'feature_master_xh_standard' into 'master'

地址相似度评级优化

See merge request !30
This commit is contained in:
2021-05-10 22:32:24 +08:00
2 changed files with 12 additions and 4 deletions
@@ -395,13 +395,13 @@ public class AddressParserServiceImpl implements AddressParserService {
addr.setBuildingNumber(aliyunBo.getHouseno()); addr.setBuildingNumber(aliyunBo.getHouseno());
addr.setOrgUnitNumber(aliyunBo.getCellno()); addr.setOrgUnitNumber(aliyunBo.getCellno());
addr.setUnitNumber(aliyunBo.getCellno());*/ addr.setUnitNumber(aliyunBo.getCellno());*/
if(aliyunBo.getRoomno()!=null && !aliyunBo.getRoomno().matches(".*(层|楼)$")){ /*if(aliyunBo.getRoomno()!=null && !aliyunBo.getRoomno().matches(".*(层|楼)$")){
addr.setOrgRoomNumber(aliyunBo.getRoomno()); addr.setOrgRoomNumber(aliyunBo.getRoomno());
addr.setRoomNumber(aliyunBo.getRoomno()); addr.setRoomNumber(aliyunBo.getRoomno());
}else{ }else{
addr.setRoomNumber(null); addr.setRoomNumber(null);
addr.setRoomNumber(null); addr.setRoomNumber(null);
} }*/
/*String aliRoom = aliyunBo.getRoomno() == null ? null : aliyunBo.getRoomno().replaceAll("[\u4E00-\u9FA5]", ""); /*String aliRoom = aliyunBo.getRoomno() == null ? null : aliyunBo.getRoomno().replaceAll("[\u4E00-\u9FA5]", "");
String orgRoom = addr.getOrgRoomNumber() == null ? null : addr.getOrgRoomNumber().replaceAll("[\u4E00-\u9FA5]", ""); String orgRoom = addr.getOrgRoomNumber() == null ? null : addr.getOrgRoomNumber().replaceAll("[\u4E00-\u9FA5]", "");
@@ -1185,8 +1185,8 @@ public class AddressParserServiceImpl implements AddressParserService {
formattedAddressBuilder.append(address.getUnitNumber() + "单元"); formattedAddressBuilder.append(address.getUnitNumber() + "单元");
} }
if(StringUtils.isNotBlank(address.getRoomNumber())){ if(StringUtils.isNotBlank(address.getRoomNumber())){
formattedAddressBuilder.append(address.getRoomNumber()); // formattedAddressBuilder.append(address.getRoomNumber());
// formattedAddressBuilder.append(address.getRoomNumber() + "室"); formattedAddressBuilder.append(address.getRoomNumber() + "室");
} }
address.setFormattedAddress(formattedAddressBuilder.toString()); address.setFormattedAddress(formattedAddressBuilder.toString());
@@ -5152,6 +5152,14 @@ public class AddressServiceImpl implements AddressService {
* @return 1 继续判断并且level有值 2继续判断level没值 3 停止 * @return 1 继续判断并且level有值 2继续判断level没值 3 停止
*/ */
private Integer continueJudgeValue(JSONObject json1, JSONObject json2, String key){ private Integer continueJudgeValue(JSONObject json1, JSONObject json2, String key){
if("buildingNumber".equals(key) || "unitNumber".equals(key) || "roomNumber".equals(key)){
if(StringUtils.isNotBlank(getFromJson(json1,key)) && StringUtils.isNotBlank(getFromJson(json2,key))
&& getFromJson(json1,key).equals(getFromJson(json2,key))){
return 1;
}else{
return 3;
}
}
if(StringUtils.isNotBlank(getFromJson(json1,key)) && StringUtils.isNotBlank(getFromJson(json2,key))){ if(StringUtils.isNotBlank(getFromJson(json1,key)) && StringUtils.isNotBlank(getFromJson(json2,key))){
if("name".equals(key)){ if("name".equals(key)){
return verifySamePoi(getFromJson(json1,key),getFromJson(json2,key)) ? 1 : 3; return verifySamePoi(getFromJson(json1,key),getFromJson(json2,key)) ? 1 : 3;