diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index acf9c9b6f..d9287fdaf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1765,13 +1765,14 @@ public class AddressController { dto.append("township", address.getTownship()); 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()); } + }else{ + dto.append("name", building.getSuggestName()); } if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ String addr = building.getAddress(); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java index aec6c11b2..6015a13ea 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserPatterns.java @@ -7,14 +7,14 @@ import java.util.regex.Pattern; */ public interface AddressParserPatterns { - Pattern FULL_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([甲乙]?[一二三四五六七八九十百千\\d]+甲?号?)(?!楼)[~\\-~、,-])?([甲乙]?[一二三四五六七八九十百千\\d])+甲?(号)(?!楼))"); - Pattern STREET = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?"); - Pattern STREET_NUMBER = Pattern.compile(".*([甲乙]?[一二三四五六七八九十百千\\d]+甲?(号)(?!楼)?[~\\--~、,])?([甲乙]?[一二三四五六七八九十百千\\d]+甲?(号)(?!楼))"); - Pattern STAGE_PATTERN = Pattern.compile("(([一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([一二三四五六七八九十百千\\d]+)期"); - Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); + Pattern FULL_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([甲乙]?[零一二三四五六七八九十百千\\d]+甲?号?)(?!楼)[~\\-~、,-])?([甲乙]?[零一二三四五六七八九十百千\\d])+甲?(号)(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); + Pattern STREET = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?"); + Pattern STREET_NUMBER = Pattern.compile(".*([甲乙]?[零|一三四五六七八九十百千\\d]+甲?(号)(?!楼)?[~\\--~、,])?([甲乙]?[零一二三四五六七八九十百千\\d]+甲?(号)(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); + Pattern STAGE_PATTERN = Pattern.compile("(([零一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([零一二三四五六七八九十百千\\d]+)期"); + Pattern PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|零|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); Pattern TOWN = Pattern.compile("^.+?(乡|镇|街道)+"); Pattern NUMBER = Pattern.compile("\\d+"); - Pattern STANDARD_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([一二三四五六七八九十百千\\d])+弄)|([甲乙]?([一二三四五六七八九十百千\\d]))+号(?!楼))"); + Pattern STANDARD_ADDRESS = Pattern.compile("^.{2,}(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?([零一二三四五六七八九十百千\\d]))+号(?!楼)+([付附]+[零一二三四五六七八九十百千\\d]+(号)?)?)"); Pattern DISTRICT = Pattern.compile("^.{2,}?(区|县)"); } 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 d323f797b..47d32dc97 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 @@ -169,7 +169,9 @@ public class AddressParserServiceImpl implements AddressParserService { aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity()); if(aliyunBo != null){ String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", ""); - addr.setKeywords(poi); + if(StringUtils.isNotBlank(poi)){ + addr.setKeywords(poi); + } if(StringUtils.isNotBlank(aliyunBo.getCity())){ addr.setSuggestCity(aliyunBo.getCity()); } @@ -222,15 +224,13 @@ public class AddressParserServiceImpl implements AddressParserService { if(StringUtils.isBlank(addr.getTownship())){ addr.setTownship(aliyunBo.getTown()); } - if(StringUtils.isBlank(addr.getBuildingNumber())){ - addr.setBuildingNumber(aliyunBo.getHouseno()); - } - if(StringUtils.isBlank(addr.getUnitNumber())){ - addr.setUnitNumber(aliyunBo.getCellno()); - } - if(StringUtils.isBlank(addr.getRoomNumber())){ - addr.setRoomNumber(aliyunBo.getRoomno()); - } + addr.setOrgBuildingNumber(aliyunBo.getHouseno()); + addr.setBuildingNumber(aliyunBo.getHouseno()); + addr.setOrgUnitNumber(aliyunBo.getCellno()); + addr.setUnitNumber(aliyunBo.getCellno()); + addr.setOrgRoomNumber(aliyunBo.getRoomno()); + addr.setRoomNumber(aliyunBo.getRoomno()); + if(StringUtils.isBlank(addr.getStreet())){ addr.setStreet(aliyunBo.getRoad()); } @@ -440,17 +440,37 @@ public class AddressParserServiceImpl implements AddressParserService { if (connStreetNumber != null) { int index = address.indexOf(connStreetNumber); String remain = address.substring(0, index); - String unit = "号"; - String[] split = connStreetNumber.substring(0, connStreetNumber.length() - 1).split("-"); - if (split.length > 1 && remain.length() > 1) { - int start = Integer.parseInt(split[0]); - int end = Integer.parseInt(split[1]); - if(start < end){ - String addr; - for (int i = start; i <= end; i++) { - addr = remain + i + unit; - if (!addrAlias.contains(addr)) { - addrAlias.add(addr); + String[] split = connStreetNumber.split("(~|-|~)"); + String[] splitComma = connStreetNumber.split("(,|,|、)"); +// String unit = "号"; +// String[] split = connStreetNumber.substring(0, connStreetNumber.length() - 1).split("-"); + if(remain.length() > 1){ + if (split.length > 1) { + List unitList = getSplitUnit(split); + String regularStr = "(" + StringUtils.join(unitList, "|") + ")"; + int start = Integer.parseInt(split[0].replaceAll(regularStr, "")); + int end = Integer.parseInt(split[1].replaceAll(regularStr, "")); + for(String unit:unitList){ + if(start < end){ + String addr; + for (int i = start; i <= end; i++) { + addr = remain + i + unit; + if (!addrAlias.contains(addr)) { + addrAlias.add(addr); + } + } + } + } + } + if(splitComma.length > 1){ + List unitList = getSplitUnit(splitComma); + for(String unit:unitList){ + for(String value:splitComma){ + int num = Integer.parseInt(value.replaceAll(StringUtils.join(Collections.singleton("(" + StringUtils.join(unitList, "|") + ")"), "|"), "")); + String addr = remain + num + unit; + if (!addrAlias.contains(addr)) { + addrAlias.add(addr); + } } } } @@ -473,6 +493,16 @@ public class AddressParserServiceImpl implements AddressParserService { } } + private List getSplitUnit(String[] split){ + List unitList = new ArrayList(); + for(String value:split){ + String unit = StringUtils.join(DataUtil.getHanzi(value), ""); + if(StringUtils.isNotBlank(unit)){ + unitList.add(unit); + } + } + return unitList; + } /** * 在CPDB库中查询匹配到的数据 * @@ -955,15 +985,18 @@ public class AddressParserServiceImpl implements AddressParserService { && address.getStreetNumber().endsWith(address.getOrgBuildingNumber())){ }else{ - formattedAddressBuilder.append(address.getBuildingNumber() + "栋"); + formattedAddressBuilder.append(address.getBuildingNumber()); +// formattedAddressBuilder.append(address.getBuildingNumber() + "栋"); } } if(StringUtils.isNotBlank(address.getOrgUnitNumber())){ - formattedAddressBuilder.append(address.getUnitNumber() + "单元"); + formattedAddressBuilder.append(address.getUnitNumber()); +// formattedAddressBuilder.append(address.getUnitNumber() + "单元"); } if(StringUtils.isNotBlank(address.getOrgRoomNumber())){ - 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/address/AddressParserUtil.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java index e1f4b1338..490c3dbb4 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserUtil.java @@ -23,7 +23,7 @@ public class AddressParserUtil { static final Pattern STREET_PATTERN = Pattern.compile("^.+(路|街道|弄|街|道|巷)"); static final Pattern CONNECTOR_PATTERN = Pattern.compile("~|-|~"); - public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("\\d+(~|-|~)\\d+号"); + public static final Pattern STREET_NUMBER_CONNECTOR_PATTERN = Pattern.compile("(\\d+)(支弄|号|弄)?(~|-|~|,|,|、)\\d+(支弄|号|弄)"); static final Pattern SEPARATOR_PATTERN = Pattern.compile("、|,"); static final Pattern STREET_NUMBER_PATTERN = Pattern.compile("(\\d+(~|-|~|、|,))*\\d+(号|栋|幢)"); static final Pattern UNIT_NUMBER_PATTERN = Pattern.compile("(\\w+室)|(\\w+(号|栋|幢|单元))\\w+(室)*"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java index 4cfc89037..cc1334533 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/format/AddressFormatterFactory.java @@ -250,6 +250,19 @@ public class AddressFormatterFactory { } }); + /** + * 一环路东二段162 + */ + formatters.add(new AbstractAddressFormatter(Pattern.compile(".*(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?\\d+$))")) { + final Pattern TARGET = Pattern.compile("(路|街|大道|巷|道|((零|一|二|三|四|五|六|七|八|九|十|东|南|西|北|复)[线环条甲])|(胡同))(交汇|.{0,3}段|.*弄)?((([零一二三四五六七八九十百千\\d])+弄)|([甲乙]?\\d+$))"); + + @Override + protected String doFormat(String address) { + String matchStr = DataUtil.match(address, TARGET); + String formatStr = matchStr + "号"; + return address.replace(matchStr,formatStr); + } + }); } public List getFormatters(){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 21a79a722..2e286a5ed 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -427,12 +427,12 @@ public class Address { } public void setOrgRoomNumber(String orgRoomNumber) { - if(orgRoomNumber.length() > 2){ - orgRoomNumber = orgRoomNumber.replaceFirst("^0+", ""); - } if(StringUtils.isNotBlank(orgRoomNumber)){ - this.orgRoomNumber = orgRoomNumber; + if(orgRoomNumber.length() > 2){ + orgRoomNumber = orgRoomNumber.replaceFirst("^0+", ""); + } } + this.orgRoomNumber = orgRoomNumber; } public String getKeywords() { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java index ab21931c7..8225e00c0 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/CityData.java @@ -14,8 +14,8 @@ public class CityData { put("文山州", Arrays.asList("文山壮族苗族自治州")); put("凉山州", Arrays.asList("凉山彝族自治州")); - put("呼和浩特", Arrays.asList("呼市")); - put("乌鲁木齐", Arrays.asList("乌市")); +// put("呼和浩特", Arrays.asList("呼市")); +// put("乌鲁木齐", Arrays.asList("乌市")); put("阿里", Arrays.asList("阿里地区")); put("红河", Arrays.asList("红河哈尼族彝族自治州")); put("克孜勒苏", Arrays.asList("克孜勒苏柯尔克孜自治州", "克州")); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index f8ebb93bf..2dd886f8b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -58,9 +58,6 @@ public class CityProcessor extends AbstractAddressProcessor { List possibleCities = speculateCityNameByRegion(address, city); if(isUnique(possibleCities)){ formatCity = getFirst(possibleCities); - if(StringUtils.isBlank(address.getSuggestDistrict())){ - address.setSuggestDistrict(city); - } } } if(null != formatCity){