From 0202bb66e98f6fd2f9b7983f866c5bd3a9acddb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 15 Jun 2022 22:35:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9C=AC=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/AbstractAddressProcessor.java | 2 +- .../fangjia/service/cnAnalyzer/KeywordEnum.java | 1 + .../service/cnAnalyzer/PatternTokenizer.java | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AbstractAddressProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AbstractAddressProcessor.java index f8e262112..a7e546f8d 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AbstractAddressProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/AbstractAddressProcessor.java @@ -176,7 +176,7 @@ public abstract class AbstractAddressProcessor { }else if(token.getKeywordTypes().equals("district") && i != tokens.size() - 1){ for(int j = i +1; j < tokens.size(); j++){ Token nextToken = tokens.get(j); - if("partition".equals(nextToken.getKeywordTypes()) || "stage".equals(nextToken.getKeywordTypes())){ + if("partition".equals(nextToken.getKeywordTypes()) || "stage".equals(nextToken.getKeywordTypes()) || "hao_yuan".equals(nextToken.getKeywordTypes())){ token.setEnd(nextToken.getEnd()); token.setName(token.getName() + nextToken.getName()); i++; diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/KeywordEnum.java b/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/KeywordEnum.java index fc6b7bf5f..c7fd58315 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/KeywordEnum.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/KeywordEnum.java @@ -22,6 +22,7 @@ public enum KeywordEnum { partition, // 分区 town,//乡镇 village,//居委会 + hao_yuan, number_cn, total_price, room, area, hall, toilet, alpha; public static KeywordEnum parse(String val) { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/PatternTokenizer.java b/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/PatternTokenizer.java index b9d18029c..ca4d2176f 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/PatternTokenizer.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/cnAnalyzer/PatternTokenizer.java @@ -16,6 +16,7 @@ public class PatternTokenizer { private static Pattern REG_NUMBER_CN; // 匹配面积 private static Pattern STAGE_PATTERN;// 分期 private static Pattern PARTITION_PATTERN;// 分区 + private static Pattern HAO_YUAN_PATTERN;// 分区 private static final String REG_NUM = "(((,|\\.|\\d| )*\\d)|(一|二|三|四|五|六|七|八|九|十|零|两|个|十|百|千|万|亿| )+)"; private static final String REG_RANGE_SPLITTER = "(-|~|~|-|到|至| )"; @@ -35,6 +36,7 @@ public class PatternTokenizer { REG_NUMBER_CN = Pattern.compile(REG_NUM + "(弄|号|栋|厅|卫)"); STAGE_PATTERN = Pattern.compile("(([零一二三四五六七八九十百千\\d]+)期?[,、至到]?)?([零一二三四五六七八九十百千\\d]+)期"); PARTITION_PATTERN = Pattern.compile("(\\w|东|南|北|中|西|甲|乙|丙|丁|零|一|二|三|四|五|六|七|八|九|十)+(区|坊)"); + HAO_YUAN_PATTERN = Pattern.compile("\\d+号((小区)|院)"); } public static void main(String[] args) { @@ -58,6 +60,7 @@ public class PatternTokenizer { public static String tokenizers(List tokens, String k) { k = parsePartition(tokens, k); k = parseStage(tokens, k); + k = parseHaoYuan(tokens, k); // 面积 k = parseArea(tokens, k); // 房型 @@ -83,6 +86,17 @@ public class PatternTokenizer { } return t; } + private static String parseHaoYuan(List ret, String t) { + String value = null; + Matcher m = HAO_YUAN_PATTERN.matcher(t); + while (m.find()) { + value = m.group(); + t = disableValue(t, value); + ret.add(new Token(value, m.start(), m.end(), KeywordEnum.hao_yuan.name())); + m = HAO_YUAN_PATTERN.matcher(t); + } + return t; + } private static String parseStage(List ret, String t) { String value = null; Matcher m = STAGE_PATTERN.matcher(t);