From 3a5e73267e61bf9d14d3e03784e7756af3808bfe Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 4 Apr 2022 14:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/service/address/mode/Address.java | 1 + .../service/address/processor/KeywordProcessor.java | 4 ++-- .../address/processor/StageAndPartitionProcessor.java | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) 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 1c8f2d004..720da51bb 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 @@ -397,6 +397,7 @@ public class Address { } public void setOrgAddress(String orgAddress) { + orgAddress = orgAddress.toUpperCase(); setAddress(orgAddress); if(this.orgAddress != null){ throw new UnsupportedOperationException("原始地址不能被修改"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java index 547d8d2cb..24ff62e1f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/KeywordProcessor.java @@ -70,9 +70,9 @@ public class KeywordProcessor extends AbstractAddressProcessor { if(StringUtils.isNotBlank(address.getAddress())){ if(address.getOrgAddress().indexOf(sb.toString()) >= address.getOrgAddress().indexOf(address.getAddress())){ - sb.insert(0, address.getAddress()); - }else{ sb.append(address.getAddress()); + }else{ + sb.insert(0, address.getAddress()); } String kw = fetchKeywords(address.getAddress()); if(StringUtils.isNotBlank(kw)){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java index ab5c929b3..7e4be0d63 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/StageAndPartitionProcessor.java @@ -23,11 +23,17 @@ public class StageAndPartitionProcessor extends AbstractAddressProcessor { addr = addr.replaceAll(matchResult.matchContent, formatStage); address.setAddress(addr); } - address.setStage(matchResult.matchContent); + address.setStage(formatStage); } matchResult = matchFirst(AddressParserPatterns.PARTITION_PATTERN, orgAddr); if (matchResult != null) { - address.setPartition(matchResult.matchContent); + String formatPartition = CNNMFilter.convertArabicToCnNumeric(matchResult.matchContent); + if(!formatPartition.equals(matchResult.matchContent)){ + String addr = address.getAddress(); + addr = addr.replaceAll(matchResult.matchContent, formatPartition); + address.setAddress(addr); + } + address.setStage(formatPartition); } return RepeatStatus.NEXT; }