From 794b386807ff01582e10e681d7b036ebe27b8a75 Mon Sep 17 00:00:00 2001 From: xuhe Date: Thu, 1 Apr 2021 09:21:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/AddressParserServiceImpl.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) 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 d0a36dc4e..9d82ac44a 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 @@ -206,10 +206,10 @@ public class AddressParserServiceImpl implements AddressParserService { } } if(StringUtils.isBlank(matchedBuilding.getProvince())){ - matchedBuilding.setProvince(aliyunBo.getProv()); + matchedBuilding.setProvince(formatProvince(aliyunBo.getProv())); } if(StringUtils.isBlank(matchedBuilding.getCity())){ - matchedBuilding.setCity(aliyunBo.getCity()); + matchedBuilding.setCity(RegionData.formatCity(aliyunBo.getCity())); } matchedBuilding.setStreet(aliyunBo.getRoad()); matchedBuilding.setStreetno(aliyunBo.getRoadno()); @@ -219,7 +219,7 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setDevelopmentZone(aliyunBo.getDevzone()); } if(StringUtils.isBlank(addr.getDistrict())){ - addr.setDistrict(aliyunBo.getDistrict()); + addr.setDistrict(RegionData.formatRegion(aliyunBo.getDistrict())); } if(StringUtils.isBlank(addr.getTownship())){ addr.setTownship(aliyunBo.getTown()); @@ -236,6 +236,16 @@ public class AddressParserServiceImpl implements AddressParserService { matchedBuilding.setSearchAddress(addr); } + String formatProvince(String province){ + Map> provinceData = ProvinceData.getAllProvince(); + for (String name : provinceData.keySet()) { + if(province.contains(name)){ + return name; + } + } + return null; + } + Building findMatchedBuilding(Address addr,BuildingType buildingType, MetaDataType metaDataType){ AddressScoreResult scoreResult = findMatchedMetaData(addr, buildingType, metaDataType); @@ -916,15 +926,13 @@ public class AddressParserServiceImpl implements AddressParserService { if(StringUtils.isNotBlank(address.getStreet())){ formattedAddressBuilder.append(address.getStreet()); } - if("貧今".equals(address.getCity()) && StringUtils.isNotBlank(address.getStreet()) && !address.getStreet().endsWith("的")){ - if(StringUtils.isNotBlank(address.getStreetNumber())){ - formattedAddressBuilder.append(address.getStreetNumber()); - } + if(StringUtils.isNotBlank(address.getStreet()) && StringUtils.isNotBlank(address.getStreetNumber())){ + formattedAddressBuilder.append(address.getStreetNumber()); } if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(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()); } if(StringUtils.isBlank(building.getSuggestName())){ @@ -934,11 +942,6 @@ public class AddressParserServiceImpl implements AddressParserService { 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.getStreet()) && address.getStreet().endsWith("的") && StringUtils.isNotBlank(address.getStreetNumber()) From 65e68e0f2c499f524a5c6f955ccc60145ff0250a Mon Sep 17 00:00:00 2001 From: xuhe Date: Thu, 1 Apr 2021 14:22:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8E=BBbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/AddressParserServiceImpl.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) 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 9d82ac44a..d323f797b 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 @@ -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> provinceData = ProvinceData.getAllProvince(); for (String name : provinceData.keySet()) { if(province.contains(name)){