地址相似度评级
This commit is contained in:
+19
@@ -1698,6 +1698,25 @@ public class AddressController {
|
||||
return mav;
|
||||
}
|
||||
|
||||
public Object addressSimilarityAction(AddesssMatchModel model) {
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空"));
|
||||
return mav;
|
||||
}
|
||||
model.setAddress(model.getAddress_1());
|
||||
String result1 = addressMatchProxyService.standard(convertModelToMap(model));
|
||||
model.setAddress(model.getAddress_2());
|
||||
String result2 = addressMatchProxyService.standard(convertModelToMap(model));
|
||||
if (result1 != null && result2 != null) {
|
||||
Map<String, Object> resultMap = addressService.addressSimilarity(result1, result2);
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(resultMap));
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
public Object parseCityAction(AddressModel model) {
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getProvince())) {
|
||||
|
||||
@@ -19,7 +19,24 @@ public class AddesssMatchModel extends FangjiaApiModel {
|
||||
private String province;
|
||||
private String debugName;
|
||||
private boolean useMap;
|
||||
private String address_1;
|
||||
private String address_2;
|
||||
|
||||
public String getAddress_1() {
|
||||
return address_1;
|
||||
}
|
||||
|
||||
public void setAddress_1(String address_1) {
|
||||
this.address_1 = address_1;
|
||||
}
|
||||
|
||||
public String getAddress_2() {
|
||||
return address_2;
|
||||
}
|
||||
|
||||
public void setAddress_2(String address_2) {
|
||||
this.address_2 = address_2;
|
||||
}
|
||||
public boolean isContainsLocation() {
|
||||
return containsLocation;
|
||||
}
|
||||
|
||||
+44
-35
@@ -192,6 +192,16 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
}
|
||||
}
|
||||
}
|
||||
AddressMatchMetaData meta = null;
|
||||
if(StringUtils.isBlank(addr.getCity())){
|
||||
addr.addKeyword(addr.getOrgAddress());
|
||||
meta = getMapMeta(addr);
|
||||
if(meta != null){
|
||||
addr.setProvince(meta.getMapProvince());
|
||||
addr.setCity(meta.getMapCity());
|
||||
addr.setDistrict(meta.getDistrict());
|
||||
}
|
||||
}
|
||||
if(params.isUseMap()){
|
||||
matchedBuilding = findMatchedBuilding(addr, params.getBuildingType(), MetaDataType.MAP);
|
||||
}else{
|
||||
@@ -205,47 +215,46 @@ public class AddressParserServiceImpl implements AddressParserService {
|
||||
completBuildingField(matchedBuilding, aliyunBo, params);
|
||||
}
|
||||
Address tempAddr = matchedBuilding.getSearchAddress();
|
||||
if((StringUtils.isBlank(tempAddr.getProvince()) || StringUtils.isBlank(tempAddr.getCity()) || StringUtils.isBlank(tempAddr.getDistrict())|| StringUtils.isBlank(tempAddr.getStreet())) && AddressParserGoal.Match.equals(addr.getAddressParserGoal())){
|
||||
// List<AddressMatchMetaData> metaDatas = addressRepoService.findAllByKeyword(null, params.getBuildingType(), new ArrayList<String>() {{add(tempAddr.getOrgAddress());}}, tempAddr.getLng(), tempAddr.getLat(), 100, false);
|
||||
tempAddr.addKeyword(tempAddr.getOrgAddress());
|
||||
List<AddressMatchMetaData> metaDatas = findMatchMetaData(tempAddr, params.getBuildingType(), MetaDataType.MAP, false);
|
||||
// String addressStr = (StringUtils.isBlank(tempAddr.getStreet())?"":tempAddr.getStreet()) + (StringUtils.isBlank(tempAddr.getStreetNumber())?"":tempAddr.getStreetNumber());
|
||||
Map<String,List<AddressMatchMetaData>> metaDataMap = new HashMap<String, List<AddressMatchMetaData>>();
|
||||
if(StringUtils.isBlank(tempAddr.getDistrict()) && !metaDatas.isEmpty()){
|
||||
for(AddressMatchMetaData metaData:metaDatas){
|
||||
if(StringUtils.isNotBlank(metaData.getMapCity())){
|
||||
List<AddressMatchMetaData> metaList = metaDataMap.containsKey(metaData.getMapCity()) ? metaDataMap.get(metaData.getMapCity()) : new ArrayList<AddressMatchMetaData>();
|
||||
metaList.add(metaData);
|
||||
metaDataMap.put(metaData.getMapCity(),metaList);
|
||||
}
|
||||
}
|
||||
String tempCity = "";
|
||||
if(StringUtils.isNotBlank(tempAddr.getCity()) && metaDataMap.containsKey(tempAddr.getCity())){
|
||||
tempCity = tempAddr.getCity();
|
||||
}else{
|
||||
int size = 0;
|
||||
for(String key:metaDataMap.keySet()){
|
||||
if(metaDataMap.get(key).size() > size){
|
||||
size = metaDataMap.get(key).size();
|
||||
tempCity = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(tempCity)){
|
||||
AddressMatchMetaData meta = metaDataMap.get(tempCity).get(0);
|
||||
tempAddr.setProvince(meta.getMapProvince());
|
||||
tempAddr.setCity(meta.getMapCity());
|
||||
tempAddr.setDistrict(meta.getDistrict());
|
||||
if((tempAddr.getKeywords()!=null && tempAddr.getKeywords().equals(meta.getMainName()))){
|
||||
matchedBuilding.setAddress(meta.getAddress());
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(tempAddr.getStreet()) && AddressParserGoal.Match.equals(addr.getAddressParserGoal())){
|
||||
if(meta != null && (tempAddr.getKeywords()!=null && tempAddr.getKeywords().equals(meta.getMainName()))){
|
||||
matchedBuilding.setAddress(meta.getAddress());
|
||||
}
|
||||
}
|
||||
matchedBuilding.setSearchAddress(tempAddr);
|
||||
return matchedBuilding;
|
||||
}
|
||||
|
||||
private AddressMatchMetaData getMapMeta(Address tempAddr){
|
||||
tempAddr.addKeyword(tempAddr.getOrgAddress());
|
||||
List<AddressMatchMetaData> metaDatas = findMatchMetaData(tempAddr, null, MetaDataType.MAP, false);
|
||||
Map<String,List<AddressMatchMetaData>> metaDataMap = new HashMap<String,List<AddressMatchMetaData>>();
|
||||
if(StringUtils.isBlank(tempAddr.getDistrict()) && !metaDatas.isEmpty()){
|
||||
for(AddressMatchMetaData metaData:metaDatas){
|
||||
if(StringUtils.isNotBlank(metaData.getMapCity())){
|
||||
List<AddressMatchMetaData> metaList = metaDataMap.containsKey(metaData.getMapCity()) ? metaDataMap.get(metaData.getMapCity()) : new ArrayList<AddressMatchMetaData>();
|
||||
metaList.add(metaData);
|
||||
metaDataMap.put(metaData.getMapCity(),metaList);
|
||||
}
|
||||
}
|
||||
String tempCity = "";
|
||||
if(StringUtils.isNotBlank(tempAddr.getCity()) && metaDataMap.containsKey(tempAddr.getCity())){
|
||||
tempCity = tempAddr.getCity();
|
||||
}else{
|
||||
int size = 0;
|
||||
for(String key:metaDataMap.keySet()){
|
||||
if(metaDataMap.get(key).size() > size){
|
||||
size = metaDataMap.get(key).size();
|
||||
tempCity = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(tempCity)){
|
||||
AddressMatchMetaData meta = metaDataMap.get(tempCity).get(0);
|
||||
return meta;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* 信息不全时使用阿里接口补全数据
|
||||
* @param matchedBuilding
|
||||
|
||||
@@ -284,5 +284,12 @@ public interface AddressService {
|
||||
* @return
|
||||
*/
|
||||
AddressCheckTruth aroundConsumeGrade(String city, String address);
|
||||
|
||||
|
||||
/**
|
||||
* 量地址相似度评级
|
||||
* @param result1
|
||||
* @param result2
|
||||
* @return 返回是否同一地址、输出级别(哪一级),相似度得分
|
||||
*/
|
||||
Map<String,Object> addressSimilarity(String result1, String result2);
|
||||
}
|
||||
|
||||
+159
-11
@@ -25,6 +25,9 @@ import java.util.concurrent.Future;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import com.fangjia.core.util.*;
|
||||
import com.fangjia.service.address.AddressParserUtil;
|
||||
import com.fangjia.service.address.mode.MatchResult;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
@@ -49,18 +52,8 @@ import org.sothis.core.util.Closure;
|
||||
|
||||
import com.fangjia.core.BlockData;
|
||||
import com.fangjia.core.RegionData;
|
||||
import com.fangjia.core.util.AddressParser;
|
||||
import com.fangjia.core.util.AddressParserUtils;
|
||||
import com.fangjia.core.util.AddressResult;
|
||||
import com.fangjia.core.util.BeanUtils;
|
||||
import com.fangjia.core.util.CacheUtils;
|
||||
import com.fangjia.core.util.CacheUtils.CachePolicyEnum;
|
||||
import com.fangjia.core.util.DataUtil;
|
||||
import com.fangjia.core.util.DateUtil;
|
||||
import com.fangjia.core.util.GeoUtils;
|
||||
import com.fangjia.core.util.GeoUtils.GaussSphere;
|
||||
import com.fangjia.core.util.HttpRequest;
|
||||
import com.fangjia.core.util.LoggerFactory;
|
||||
import com.fangjia.dal.QueryParam;
|
||||
import com.fangjia.dal.SdQuery;
|
||||
import com.fangjia.dal.SrQuery;
|
||||
@@ -5074,7 +5067,162 @@ public class AddressServiceImpl implements AddressService {
|
||||
}
|
||||
return checkTr;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> addressSimilarity(String result1, String result2) {
|
||||
JSONObject json1 = (JSONObject) JSONObject.fromObject(result1).get("result");
|
||||
JSONObject json2 = (JSONObject) JSONObject.fromObject(result2).get("result");
|
||||
Map<String,Object> resultMap = new HashMap<String, Object>();
|
||||
//判断是否同一地址
|
||||
boolean sameAddress = validSameAddress(json1, json2);
|
||||
String formatAddress1_pinyin = AddressParserUtil.toHanYuPinYin(getFromJson(json1, "formattedAddress"));
|
||||
String formatAddress2_pinyin = AddressParserUtil.toHanYuPinYin(getFromJson(json2,"formattedAddress"));
|
||||
double similar = AddressParserUtil.getSimilarityRatio(formatAddress1_pinyin, formatAddress2_pinyin);
|
||||
String level = getAddressSimilarityLevel(json1, json2);
|
||||
resultMap.put("isSameAddress", sameAddress);
|
||||
resultMap.put("score", similar);
|
||||
resultMap.put("level", level);
|
||||
resultMap.put("formattedAddress_1", getFromJson(json1,"formattedAddress"));
|
||||
resultMap.put("formattedAddress_2", getFromJson(json2,"formattedAddress"));
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
private boolean validSameAddress(JSONObject json1, JSONObject json2){
|
||||
//标准化后地址完全一样
|
||||
if(getFromJson(json1, "formattedAddress").equals(getFromJson(json2, "formattedAddress"))){
|
||||
return true;
|
||||
}
|
||||
//判断判断省、市、区、乡镇、楼栋、单元、室号是否相同
|
||||
if(!verifySameField(getFromJson(json1,"province"), getFromJson(json2,"province"), false)
|
||||
|| !verifySameField(getFromJson(json1,"city"), getFromJson(json2,"city"), false)
|
||||
|| !verifySameField(getFromJson(json1,"district"), getFromJson(json2,"district"), false)
|
||||
|| !verifySameField(getFromJson(json1,"township"), getFromJson(json2,"township"), false)
|
||||
|| !verifySameField(getFromJson(json1,"buildingNumber"), getFromJson(json2,"buildingNumber"), true)
|
||||
|| !verifySameField(getFromJson(json1,"unitNumber"), getFromJson(json2,"unitNumber"), true)
|
||||
|| !verifySameField(getFromJson(json1,"roomNumber"), getFromJson(json2,"roomNumber"), true)){
|
||||
return false;
|
||||
}
|
||||
|
||||
String street1 = (StringUtils.isNotBlank(getFromJson(json1,"street")) ? getFromJson(json1,"street") : "") + (StringUtils.isNotBlank(getFromJson(json1,"streetNumber")) ? getFromJson(json1,"streetNumber") : "");
|
||||
String street2 = (StringUtils.isNotBlank(getFromJson(json2,"street")) ? getFromJson(json2,"street") : "") + (StringUtils.isNotBlank(getFromJson(json2,"streetNumber")) ? getFromJson(json2,"streetNumber") : "");
|
||||
String name1 = StringUtils.isNotBlank(getFromJson(json1,"name")) ? getFromJson(json1,"name") : "";
|
||||
String name2 = StringUtils.isNotBlank(getFromJson(json2,"name")) ? getFromJson(json2,"name") : "";
|
||||
//两个地址中路名+路号和poi全部为空时返回true
|
||||
if(StringUtils.isBlank(street1) && StringUtils.isBlank(street2) && StringUtils.isBlank(name1) && StringUtils.isBlank(name2)){
|
||||
return true;
|
||||
}
|
||||
//同一条地址里路名和poi不能全为空而另一条至少有一项有值
|
||||
if((StringUtils.isBlank(street1) && StringUtils.isBlank(name1)) || (StringUtils.isBlank(street2) && StringUtils.isBlank(name2))){
|
||||
return false;
|
||||
}
|
||||
//poi有任意一个为空则路名、路号必须完全一致
|
||||
if(StringUtils.isBlank(name1) || StringUtils.isBlank(name2)){
|
||||
if(StringUtils.isNotBlank(getFromJson(json1,"street")) && getFromJson(json1,"street").equals(getFromJson(json2,"street"))
|
||||
&& StringUtils.isNotBlank(getFromJson(json1,"streetNumber")) && getFromJson(json1,"streetNumber").equals(getFromJson(json2,"streetNumber"))){
|
||||
return true;
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
//poi全不为空时,路名+路号一致(可为空),poi处理后一致
|
||||
if(verifySameField(street1, street2, false) && verifySamePoi(name1, name2)){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private String getFromJson(JSONObject json, String key){
|
||||
if(json.containsKey(key)){
|
||||
return json.getString(key);
|
||||
}
|
||||
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";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* 判断省、市、区、乡镇、楼栋、单元、室号是否相同(两者全为空时返回true)
|
||||
* @param str1
|
||||
* @param str2
|
||||
* @param flag true时严格判断 两者完全一致返回true(全为空或者全部有值并且值一致)
|
||||
* false时 两者完全一致或一方为空返回true(全为空或者全部有值并且值一致或任一方值为空)
|
||||
* @return
|
||||
*/
|
||||
private boolean verifySameField(String str1, String str2,boolean flag){
|
||||
if(flag){
|
||||
if(StringUtils.isBlank(str1) && StringUtils.isBlank(str2)){
|
||||
return true;
|
||||
}
|
||||
return StringUtils.isNotBlank(str1) ? str1.equals(str2) : false;
|
||||
}else{
|
||||
if(StringUtils.isBlank(str1) || StringUtils.isBlank(str2)){
|
||||
return true;
|
||||
}
|
||||
return str1.equals(str2);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* //判断是否同一个poi(全部有数据时)
|
||||
* @param name1
|
||||
* @param name2
|
||||
* @return
|
||||
*/
|
||||
private boolean verifySamePoi(String name1, String name2){
|
||||
if(StringUtils.isBlank(name1) && StringUtils.isBlank(name2)){
|
||||
return false;
|
||||
}
|
||||
if(name1.equals(name2)){
|
||||
return true;
|
||||
}
|
||||
//分期
|
||||
String name1_stage = AddressParserUtil.match(AddressParserPatterns.STAGE_PATTERN,name1);
|
||||
String name2_stage = AddressParserUtil.match(AddressParserPatterns.STAGE_PATTERN,name2);
|
||||
//分区
|
||||
String name1_partition = AddressParserUtil.match(AddressParserPatterns.PARTITION_PATTERN,name1);
|
||||
String name2_partition = AddressParserUtil.match(AddressParserPatterns.PARTITION_PATTERN,name2);
|
||||
//数字
|
||||
String name1_number = AddressParserUtil.match(Pattern.compile("[\\d一二三四五六七八九十千百万]+"),name1);
|
||||
String name2_number = AddressParserUtil.match(Pattern.compile("[\\d一二三四五六七八九十千百万]+"),name2);
|
||||
if(!verifySameField(name1_stage, name2_stage, true) || !verifySameField(name1_partition, name2_partition, true)|| !verifySameField(name1_number, name2_number, true)){
|
||||
return false;
|
||||
}
|
||||
String name_1_pinyin = AddressParserUtil.toHanYuPinYin(name1);
|
||||
String name_2_pinyin = AddressParserUtil.toHanYuPinYin(name2);
|
||||
//拼音或文本数据包含并且
|
||||
boolean pinYinContains = (name_1_pinyin.contains(name_2_pinyin) || name_2_pinyin.contains(name_1_pinyin));
|
||||
if(pinYinContains){
|
||||
double similar = AddressParserUtil.getSimilarityRatio(name_1_pinyin, name_2_pinyin);
|
||||
if(similar > 0.5){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置区域消费指数
|
||||
* @param checkTr
|
||||
|
||||
Reference in New Issue
Block a user