diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index 2caa0b7a3..1512e2e7e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -395,13 +395,13 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setBuildingNumber(aliyunBo.getHouseno()); addr.setOrgUnitNumber(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.setRoomNumber(aliyunBo.getRoomno()); }else{ addr.setRoomNumber(null); addr.setRoomNumber(null); - } + }*/ /*String aliRoom = aliyunBo.getRoomno() == null ? null : aliyunBo.getRoomno().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() + "单元"); } 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()); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java index de2a772b2..21ab2139d 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java @@ -5152,6 +5152,14 @@ public class AddressServiceImpl implements AddressService { * @return 1 继续判断并且level有值 2继续判断level没值 3 停止 */ 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("name".equals(key)){ return verifySamePoi(getFromJson(json1,key),getFromJson(json2,key)) ? 1 : 3;