相似度评级代码修改

This commit is contained in:
xuhe
2021-05-09 12:34:36 +08:00
parent a5c8c633a8
commit f69c8bd028
@@ -5,18 +5,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -5138,30 +5127,39 @@ public class AddressServiceImpl implements AddressService {
return null;
}
/**
* 获取两地址的相似度评级(最小颗粒度)
* 获取两地址的相似度评级(相同数据的最小颗粒度)
* @return
*/
private String getAddressSimilarityLevel(JSONObject json1, JSONObject json2){
if(StringUtils.isNotBlank(getFromJson(json1,"roomNumber")) || StringUtils.isNotBlank(getFromJson(json2,"roomNumber"))){
return "roomNumber";
}else if(StringUtils.isNotBlank(getFromJson(json1,"unitNumber")) || StringUtils.isNotBlank(getFromJson(json2,"unitNumber"))){
return "unitNumber";
}else if(StringUtils.isNotBlank(getFromJson(json1,"buildingNumber")) || StringUtils.isNotBlank(getFromJson(json2,"buildingNumber"))){
return "buildingNumber";
}else if(StringUtils.isNotBlank(getFromJson(json1,"name")) || StringUtils.isNotBlank(getFromJson(json2,"name"))){
return "name";
}else if(StringUtils.isNotBlank(getFromJson(json1,"street")) || StringUtils.isNotBlank(getFromJson(json2,"street"))){
return "street";
}else if(StringUtils.isNotBlank(getFromJson(json1,"township")) || StringUtils.isNotBlank(getFromJson(json2,"township"))){
return "township";
}else if(StringUtils.isNotBlank(getFromJson(json1,"district")) || StringUtils.isNotBlank(getFromJson(json2,"district"))){
return "district";
}else if(StringUtils.isNotBlank(getFromJson(json1,"city")) || StringUtils.isNotBlank(getFromJson(json2,"city"))){
return "city";
}else if(StringUtils.isNotBlank(getFromJson(json1,"province")) || StringUtils.isNotBlank(getFromJson(json2,"province"))){
return "province";
String level = null;
LinkedList<String> list = new LinkedList<>(Arrays.asList("province", "city", "district", "township", "street"
, "name", "buildingNumber", "unitNumber", "roomNumber"));
for(String key:list){
if(continueJudgeValue(json1, json2, key) == 3){
return level;
}else{
level = continueJudgeValue(json1, json2, key) == 1 ? key : (level == null ? null : level);
}
}
return null;
return level;
}
/**
* 判断level时是否继续往下判断
* @param json1
* @param json2
* @param key
* @return 1 继续判断并且level有值 2继续判断level没值 3 停止
*/
private Integer continueJudgeValue(JSONObject json1, JSONObject json2, String key){
if(StringUtils.isNotBlank(getFromJson(json1,key)) && StringUtils.isNotBlank(getFromJson(json2,key))){
if(getFromJson(json1,key).equals(getFromJson(json2,key))){
return 1;
}else{
return 3;
}
}
return 2;
}
/**
* 判断省、市、区、乡镇、楼栋、单元、室号是否相同(两者全为空时返回true)