|
@@ -492,10 +492,10 @@ public class AddressTools {
|
|
|
JSONObject obj = array.getJSONObject(i);
|
|
|
obj.put("searchAddress", address);
|
|
|
if (obj.containsKey(param) && obj.get(param) != null) {
|
|
|
-// 得到返回的地址
|
|
|
+// 得到返回的地址
|
|
|
String addr = obj.getString(param);
|
|
|
-// 规则4判断
|
|
|
-// TODO 添加校验逻辑(首先使用第4校验规则匹配,匹配不到使用第二规则,还匹配不到的话就使用打分规则)
|
|
|
+// 规则4判断
|
|
|
+// TODO 添加校验逻辑(首先使用第4校验规则匹配,匹配不到使用第二规则,还匹配不到的话就使用打分规则)
|
|
|
Set<String> addressString = AddressQueryEngine.tokenizeString(addr).get(0);
|
|
|
Set<String> addressNumber = AddressQueryEngine.tokenizeString(addr).get(1);
|
|
|
Set<String> address2String = AddressQueryEngine.tokenizeString(address).get(0);
|
|
@@ -520,7 +520,7 @@ public class AddressTools {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-// 规则2判断
|
|
|
+// 规则2判断
|
|
|
String role2address = AddressQueryEngine.townReplaceAll(AddressQueryEngine.addressReplaceAll(addr));
|
|
|
String role2address2 = AddressQueryEngine.townReplaceAll(AddressQueryEngine.addressReplaceAll(address));
|
|
|
if (AddressQueryEngine.isNotEmptyOrBlank(role2address) && role2address.contains(role2address2)) {
|