优化相似度评级
This commit is contained in:
+3
-3
@@ -193,7 +193,7 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(aliyunBo.getCity())){
|
||||
addr.setCity(aliyunBo.getCity());
|
||||
addr.setCity(RegionData.formatCity(aliyunBo.getCity()));
|
||||
}
|
||||
if(StringUtils.isNotBlank(addr.getKeywords()) && addr.getOrgAddress().indexOf(addr.getKeywords())>-1){
|
||||
String str = AddressParserUtil.match(Pattern.compile(".*村(.*(组|队))?\\d+(号)?$"), addr.getOrgAddress().substring(addr.getOrgAddress().indexOf(addr.getKeywords()),addr.getOrgAddress().length()));
|
||||
@@ -1185,8 +1185,8 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
formattedAddressBuilder.append(address.getUnitNumber() + "单元");
|
||||
}
|
||||
if(StringUtils.isNotBlank(address.getRoomNumber())){
|
||||
// formattedAddressBuilder.append(address.getRoomNumber());
|
||||
formattedAddressBuilder.append(address.getRoomNumber() + "室");
|
||||
formattedAddressBuilder.append(address.getRoomNumber());
|
||||
// formattedAddressBuilder.append(address.getRoomNumber() + "室");
|
||||
}
|
||||
address.setFormattedAddress(formattedAddressBuilder.toString());
|
||||
|
||||
|
||||
+19
-3
@@ -110,7 +110,23 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
}
|
||||
}
|
||||
public static void main(String[] args) throws ClientException {
|
||||
DefaultProfile profile = DefaultProfile.getProfile(
|
||||
String value = "";
|
||||
String[] array = value.replace("\t", ";").split(";");
|
||||
if(array.length > 4){
|
||||
List<String> tmp = new ArrayList<String>();
|
||||
for(String str:array){
|
||||
if(str!=null && str.length()!=0){
|
||||
tmp.add(str);
|
||||
}
|
||||
}
|
||||
array= tmp.toArray(new String[4]);
|
||||
}
|
||||
System.out.println(array[0]);
|
||||
System.out.println(array[1]);
|
||||
System.out.println(array[2]);
|
||||
System.out.println(array[3]);
|
||||
|
||||
/*DefaultProfile profile = DefaultProfile.getProfile(
|
||||
REGIONID,
|
||||
ACCESSKEYID,
|
||||
SECRET);
|
||||
@@ -119,7 +135,7 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
GetAddressDivisionCodeRequest request = new GetAddressDivisionCodeRequest();
|
||||
request.setServiceCode("addrp");
|
||||
request.setAppKey(APPKEY);
|
||||
request.setText("北郭乡东草亭村一号路2号");
|
||||
request.setText("天青路260号");
|
||||
// request.setDefaultProvince("浙江省");
|
||||
// request.setDefaultCity("杭州市");
|
||||
// request.setDefaultDistrict("余杭区");
|
||||
@@ -141,7 +157,7 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
System.out.println(array[0]);
|
||||
System.out.println(array[1]);
|
||||
System.out.println(array[2]);
|
||||
System.out.println(array[3]);
|
||||
System.out.println(array[3]);*/
|
||||
/*JSONObject json = new JSONObject();
|
||||
for (String key:value.split("\t")){
|
||||
String[] arry = key.split("=");
|
||||
|
||||
+12
-5
@@ -5069,7 +5069,7 @@ public class AddressServiceImpl implements AddressService {
|
||||
double similar = AddressParserUtil.getSimilarityRatio(formatAddress1_pinyin, formatAddress2_pinyin);
|
||||
String level = getAddressSimilarityLevel(json1, json2);
|
||||
resultMap.put("isSameAddress", sameAddress);
|
||||
resultMap.put("score", similar);
|
||||
// resultMap.put("score", similar);
|
||||
resultMap.put("level", level);
|
||||
resultMap.put("formattedAddress_1", getFromJson(json1,"formattedAddress"));
|
||||
resultMap.put("formattedAddress_2", getFromJson(json2,"formattedAddress"));
|
||||
@@ -5153,10 +5153,14 @@ public class AddressServiceImpl implements AddressService {
|
||||
*/
|
||||
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;
|
||||
if("name".equals(key)){
|
||||
return verifySamePoi(getFromJson(json1,key),getFromJson(json2,key)) ? 1 : 3;
|
||||
}else{
|
||||
return 3;
|
||||
if(getFromJson(json1,key).equals(getFromJson(json2,key))){
|
||||
return 1;
|
||||
}else{
|
||||
return 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 2;
|
||||
@@ -5208,6 +5212,10 @@ public class AddressServiceImpl implements AddressService {
|
||||
if(!verifySameField(name1_stage, name2_stage, true) || !verifySameField(name1_partition, name2_partition, true)|| !verifySameField(name1_number, name2_number, true)){
|
||||
return false;
|
||||
}
|
||||
return isSameName(name1, name2);
|
||||
}
|
||||
|
||||
private boolean isSameName(String name1, String name2){
|
||||
String name_1_pinyin = AddressParserUtil.toHanYuPinYin(name1);
|
||||
String name_2_pinyin = AddressParserUtil.toHanYuPinYin(name2);
|
||||
//拼音或文本数据包含并且
|
||||
@@ -5220,7 +5228,6 @@ public class AddressServiceImpl implements AddressService {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置区域消费指数
|
||||
* @param checkTr
|
||||
|
||||
Reference in New Issue
Block a user