|
@@ -191,6 +191,7 @@ public class AreaService {
|
|
if (addr.contains("弄")) {
|
|
if (addr.contains("弄")) {
|
|
addr = addr.substring(0, addr.indexOf("弄"));
|
|
addr = addr.substring(0, addr.indexOf("弄"));
|
|
}
|
|
}
|
|
|
|
+ addr = addr.replaceAll("(?<=[^\\d])\\d+$", "");
|
|
if (!ScheduledTasks.allDmdzData.containsKey(addr)) {
|
|
if (!ScheduledTasks.allDmdzData.containsKey(addr)) {
|
|
List<YyskDmdzAddressStandardization> datas = new ArrayList<>();
|
|
List<YyskDmdzAddressStandardization> datas = new ArrayList<>();
|
|
datas.add(item);
|
|
datas.add(item);
|
|
@@ -450,13 +451,15 @@ public class AreaService {
|
|
if (splitAddress.getAddr().contains("号")) {
|
|
if (splitAddress.getAddr().contains("号")) {
|
|
splitAddress.setSearchAddr(splitAddress.getAddr().substring(0, splitAddress.getAddr().indexOf("号")));
|
|
splitAddress.setSearchAddr(splitAddress.getAddr().substring(0, splitAddress.getAddr().indexOf("号")));
|
|
}
|
|
}
|
|
|
|
+
|
|
if (splitAddress.getAddr().contains("弄")) {
|
|
if (splitAddress.getAddr().contains("弄")) {
|
|
splitAddress.setSearchAddr(splitAddress.getAddr().substring(0, splitAddress.getAddr().indexOf("弄")));
|
|
splitAddress.setSearchAddr(splitAddress.getAddr().substring(0, splitAddress.getAddr().indexOf("弄")));
|
|
}
|
|
}
|
|
|
|
|
|
if (splitAddress.getSearchAddr() == null) {
|
|
if (splitAddress.getSearchAddr() == null) {
|
|
- splitAddress.setSearchAddr(splitAddress.getAddr());
|
|
|
|
|
|
+ splitAddress.setSearchAddr(splitAddress.getAddr().replaceAll("(?<=[^\\d])\\d+$", ""));
|
|
}
|
|
}
|
|
|
|
+
|
|
List<YyskDmdzAddressStandardization> list = new ArrayList<>();
|
|
List<YyskDmdzAddressStandardization> list = new ArrayList<>();
|
|
if (StringUtils.hasText(splitAddress.getDistrict())) {
|
|
if (StringUtils.hasText(splitAddress.getDistrict())) {
|
|
// TODO 数据库查询逻辑调整为内存处理的方式
|
|
// TODO 数据库查询逻辑调整为内存处理的方式
|
|
@@ -496,6 +499,7 @@ public class AreaService {
|
|
if (addr.contains("弄")) {
|
|
if (addr.contains("弄")) {
|
|
addr = addr.substring(0, addr.indexOf("弄"));
|
|
addr = addr.substring(0, addr.indexOf("弄"));
|
|
}
|
|
}
|
|
|
|
+ addr = addr.replaceAll("(?<=[^\\d])\\d+$", "");
|
|
List<YyskDmdzAddressStandardization> returnDatas = new ArrayList<>();
|
|
List<YyskDmdzAddressStandardization> returnDatas = new ArrayList<>();
|
|
if (ScheduledTasks.allDmdzData.containsKey(addr)) {
|
|
if (ScheduledTasks.allDmdzData.containsKey(addr)) {
|
|
returnDatas = ScheduledTasks.allDmdzData.get(addr);
|
|
returnDatas = ScheduledTasks.allDmdzData.get(addr);
|