From f0a99e73aea5d06ebcfbaca0fd808e5810f3830c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 25 Mar 2021 14:20:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9D=80=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 15 +++++++++++++++ .../service/address/AddressParserServiceImpl.java | 10 ++++++++++ 2 files changed, 25 insertions(+) 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 0bbf5149c..39f92dbbb 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 @@ -1755,6 +1755,21 @@ public class AddressController { 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()); + } + } + if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ + String addr = building.getAddress(); + String street = AddressParserUtil.extractStreet(addr); + dto.append("street", street); + if(addr.length() != street.length()){ + dto.append("streetNumber", addr.replaceFirst(street, "")); + } + } dto.append("buildingNumber", address.getBuildingNumber()); dto.append("unitNumber", address.getUnitNumber()); dto.append("roomNumber", address.getRoomNumber()); 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 f9205e4b0..a586a0c66 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 @@ -860,9 +860,19 @@ public class AddressParserServiceImpl implements AddressParserService { 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())){ formattedAddressBuilder.append(building.getSuggestName()); } + if(StringUtils.isBlank(building.getSuggestName())){ + if(StringUtils.isNotBlank(address.getParsedPropertyName())){ + formattedAddressBuilder.append(address.getParsedPropertyName()); + }else if(StringUtils.isNotBlank(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());