|
@@ -159,8 +159,8 @@ public class ScheduledTasks {
|
|
|
AddressResult.ContentBean contentBean = new AddressResult.ContentBean();
|
|
|
AddressResult addressResult = AddressQueryEngine.getInstance().sj_szxSearchByName(addr, 3);
|
|
|
if (addressResult != null && addressResult.getData() != null && addressResult.getData().size() > 0) {
|
|
|
- for(AddressResult.ContentBean itemc: addressResult.getData()){
|
|
|
- if(itemc.getScore().contains("rule_") || Float.parseFloat(itemc.getScore()) > 2.0){
|
|
|
+ for (AddressResult.ContentBean itemc : addressResult.getData()) {
|
|
|
+ if (itemc.getScore().contains("rule_") || Float.parseFloat(itemc.getScore()) > 2.0) {
|
|
|
contentBean = addressResult.getData().get(0);
|
|
|
break;
|
|
|
}
|
|
@@ -276,7 +276,7 @@ public class ScheduledTasks {
|
|
|
return yyskDmdzAddressStandardization;
|
|
|
}
|
|
|
|
|
|
- public static void yyskDmdzAddressStandardizationPutDmdz(YyskDmdzAddressStandardization yyskDmdzAddressStandardization){
|
|
|
+ public static void yyskDmdzAddressStandardizationPutDmdz(YyskDmdzAddressStandardization yyskDmdzAddressStandardization) {
|
|
|
if (yyskDmdzAddressStandardization.getSourceaddress() != null && StringUtils.hasText(yyskDmdzAddressStandardization.getSourceaddress())) {
|
|
|
SplitAddress splitAddress = ShanghaiAddressSplitUtil.splitBestAddress(yyskDmdzAddressStandardization.getSourceaddress());
|
|
|
if (splitAddress.getAddr().length() > 2) {
|
|
@@ -284,7 +284,7 @@ public class ScheduledTasks {
|
|
|
} else {
|
|
|
putAllDmdzData(yyskDmdzAddressStandardization.getSourceaddress(), yyskDmdzAddressStandardization);
|
|
|
}
|
|
|
- if (yyskDmdzAddressStandardization.getAddress() != null && StringUtils.hasText(yyskDmdzAddressStandardization.getAddress()) && !yyskDmdzAddressStandardization.getSourceaddress().contains(yyskDmdzAddressStandardization.getAddress())) {
|
|
|
+ if (yyskDmdzAddressStandardization.getAddress() != null && yyskDmdzAddressStandardization.getAddress().length() > 2 && StringUtils.hasText(yyskDmdzAddressStandardization.getAddress()) && !yyskDmdzAddressStandardization.getSourceaddress().contains(yyskDmdzAddressStandardization.getAddress())) {
|
|
|
SplitAddress splitAddress2 = ShanghaiAddressSplitUtil.splitBestAddress(yyskDmdzAddressStandardization.getAddress());
|
|
|
if (splitAddress2.getAddr().length() > 2) {
|
|
|
putAllDmdzData(splitAddress2.getAddr(), yyskDmdzAddressStandardization);
|