改造匹配代理

This commit is contained in:
沈健
2025-04-15 10:55:40 +08:00
parent eb782694ad
commit 9b5038e9e0
2 changed files with 221 additions and 3 deletions
@@ -9,6 +9,7 @@ import com.fangjia.service.bo.CheckMatchDistrictCorrectParam;
import com.fangjia.service.bo.MatchAddressScore;
import com.fangjia.service.bo.MatchDistrictResult;
import com.fangjia.service.datastore.EvaluationService;
import com.fangjia.service.dto.UniversalDto;
import com.fangjia.service.mongo.bkoff.HouseLoudongService;
import com.fangjia.service.open.WaitCrawlKeywordsService;
import com.fangjia.service.sql.FjtEvaluationService;
@@ -186,11 +187,25 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme
return null;
}
public String cleanCache(final Map<String, Object> paramsMap) {
new Thread() {
@Override
public void run() {
addressParserService.clearCache((String) paramsMap.get("city"));
}
}.start();
JSONObject baseModel = new JSONObject();
baseModel.put("code", 200);
baseModel.put("msg", "开始刷新缓存");
return baseModel.toString();
}
@Override
public String cacheFlush(Map<String, Object> params){
params.put("token", TOKEN);
try {
String result = this.invoke("address/cleanCache", params, "UTF-8");
String result = cleanCache(params);
return result;
} catch (JSONException e) {
LOGGER.error("", e);
@@ -198,11 +213,85 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme
return null;
}
public String realStandard(Map<String, Object> paramsMap) {
JSONObject baseModel = new JSONObject();
if (!paramsMap.containsKey("address") || paramsMap.get("address") == null || paramsMap.get("address").toString().trim().isEmpty()) {
baseModel.put("code", 400);
baseModel.put("msg", "地址不能为空");
return baseModel.toString();
}
MatchParams matchParams = new MatchParams();
if (paramsMap.containsKey("city") && paramsMap.get("city") != null) {
matchParams.setCity(paramsMap.get("city").toString());
}
matchParams.setAddress(paramsMap.get("address").toString());
matchParams.setAddressParserGoal(AddressParserGoal.Match);
matchParams.setPreciseLevel(PreciseLevel.STRICT);
if (paramsMap.containsKey("province") && paramsMap.get("province") != null) {
matchParams.setProvince(paramsMap.get("province").toString());
}
matchParams.setUseAliyunApi(false);
matchParams.setContainsLocation("false".equals(paramsMap.get("containsLocation")) ? false : true);
Building building = addressParserService.standard(matchParams);
Address address = building.getSearchAddress();
UniversalDto dto = UniversalDto.newDto();
dto.append("province", address.getProvince());
dto.append("city", address.getCity());
if (address.getDistrict() != null) {
dto.append("district", address.getDistrict());
} else {
dto.append("district", building.getDistrict());
}
dto.append("developmentZone", address.getDevelopmentZone());
dto.append("township", address.getTownship());
dto.append("street", address.getStreet());
dto.append("streetNumber", address.getStreetNumber());
if (StringUtils.isBlank(building.getSuggestName())) {
if (StringUtils.isNotBlank(address.getParsedPropertyName())) {
dto.append("name", address.getParsedPropertyName());
} else if (StringUtils.isNotBlank(address.getOrgKeywords())) {
dto.append("name", address.getOrgKeywords());
}
} else {
dto.append("name", building.getSuggestName());
}
if (StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())) {
String addr = building.getAddress();
String street = AddressParserUtil.extractStreet(addr);
if (street != null) {
dto.append("street", street);
if (addr.length() != street.length()) {
dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr));
}
} else if (StringUtils.isNotBlank(building.getStreet())) {
dto.append("street", building.getStreet());
if (StringUtils.isNotBlank(building.getStreetno())) {
dto.append("streetNumber", building.getStreetno());
}
}
}
dto.append("buildingNumber", address.getBuildingNumber());
dto.append("floor", address.getFloor());
dto.append("unitNumber", address.getUnitNumber());
dto.append("roomNumber", address.getRoomNumber());
dto.append("formattedAddress", address.getFormattedAddress());
if (matchParams.isContainsLocation()) {
dto.append("lat", building.getLat());
dto.append("lng", building.getLng());
}
baseModel.put("code", 200);
baseModel.put("msg", "ok");
baseModel.put("result", dto);
return baseModel.toString();
}
@Override
public String standard(Map<String, Object> params) {
params.put("token", TOKEN);
try {
String result = this.invoke("address/realStandard", params, "UTF-8");
String result = realStandard(params);
return result;
} catch (JSONException e) {
LOGGER.error("", e);
@@ -210,6 +299,48 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme
return null;
}
public String realCertificateAction(Map<String, Object> paramsMap) {
JSONObject baseModel = new JSONObject();
if (!paramsMap.containsKey("address") || paramsMap.get("address") == null || paramsMap.get("address").toString().trim().isEmpty()) {
baseModel.put("code", 400);
baseModel.put("msg", "地址不能为空");
return baseModel.toString();
}
MatchParams matchParams = new MatchParams();
if (paramsMap.containsKey("city") && paramsMap.get("city") != null) {
matchParams.setCity(paramsMap.get("city").toString());
}
matchParams.setAddress(paramsMap.get("address").toString());
matchParams.setAddressParserGoal(AddressParserGoal.Certificate);
matchParams.setPreciseLevel(PreciseLevel.STRICT);
Building building = addressParserService.certificate(matchParams);
Address address = building.getSearchAddress();
UniversalDto dto = UniversalDto.newDto();
dto.append("province", address.getProvince());
dto.append("city", address.getCity());
if (address.getDistrict() != null) {
dto.append("district", address.getDistrict());
} else {
dto.append("district", building.getDistrict());
}
dto.append("developmentZone", address.getDevelopmentZone());
dto.append("township", address.getTownship());
dto.append("street", address.getStreet());
dto.append("streetNumber", address.getStreetNumber());
dto.append("name", building.getSuggestName());
dto.append("buildingNumber", address.getBuildingNumber());
dto.append("unitNumber", address.getUnitNumber());
dto.append("roomNumber", address.getRoomNumber());
dto.append("formattedAddress", address.getFormattedAddress());
dto.append("certified", address.getCertified());
dto.append("floor", address.getFloor());
baseModel.put("code", 200);
baseModel.put("msg", "ok");
baseModel.put("result", dto);
return baseModel.toString();
}
@Override
public String certificate(Map<String, Object> params) {
params.put("token", TOKEN);
@@ -222,11 +353,75 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme
return null;
}
public String realAuth(Map<String, Object> paramsMap) {
JSONObject baseModel = new JSONObject();
if (!paramsMap.containsKey("address") || paramsMap.get("address") == null || paramsMap.get("address").toString().trim().isEmpty()) {
baseModel.put("code", 400);
baseModel.put("msg", "地址不能为空");
return baseModel.toString();
}
MatchParams matchParams = new MatchParams();
if (paramsMap.containsKey("city") && paramsMap.get("city") != null) {
matchParams.setCity((String) paramsMap.get("city"));
}
matchParams.setAddress((String) paramsMap.get("address"));
matchParams.setAddressParserGoal(AddressParserGoal.Certificate);
matchParams.setUseMap(true);
Building building = addressParserService.certificate(matchParams);
Address address = building.getSearchAddress();
UniversalDto dto = UniversalDto.newDto();
if (StringUtils.isNotBlank(address.getProvince())) {
dto.append("province", address.getProvince());
}
if (StringUtils.isNotBlank(address.getCity())) {
dto.append("city", address.getCity());
}
if (StringUtils.isNotBlank(address.getCity())) {
dto.append("district", address.getDistrict());
}
if (StringUtils.isNotBlank(address.getDevelopmentZone())) {
dto.append("developmentZone", address.getDevelopmentZone());
}
if (StringUtils.isNotBlank(address.getTownship())) {
dto.append("township", address.getTownship());
}
if (StringUtils.isNotBlank(address.getStreet())) {
dto.append("street", address.getStreet());
}
if (StringUtils.isNotBlank(address.getStreetNumber())) {
dto.append("streetNumber", address.getStreetNumber());
}
if (StringUtils.isNotBlank(address.getBuildingNumber())) {
dto.append("buildingNumber", address.getBuildingNumber());
}
if (StringUtils.isNotBlank(address.getUnitNumber())) {
dto.append("unitNumber", address.getUnitNumber());
}
if (StringUtils.isNotBlank(address.getRoomNumber())) {
dto.append("roomNumber", address.getRoomNumber());
}
if (StringUtils.isNotBlank(address.getFormattedAddress())) {
dto.append("formattedAddress", address.getFormattedAddress());
}
List<String> certified = address.getCertified();
if (certified.contains("roomNumber")) {
dto.append("authLevel", "A");
} else if (certified.contains("buildingNumber")) {
dto.append("authLevel", "B");
} else {
dto.append("authLevel", "C");
}
baseModel.put("code", 200);
baseModel.put("msg", "ok");
baseModel.put("result", dto);
return baseModel.toString();
}
@Override
public String auth(Map<String, Object> params) {
params.put("token", TOKEN);
try {
String result = this.invoke("address/realAuth", params, "UTF-8");
String result = realAuth(params);
return result;
} catch (JSONException e) {
LOGGER.error("", e);
@@ -0,0 +1,23 @@
package com.fangjia.service.dto;
import java.util.LinkedHashMap;
/**
* 通用Dto,减少Dto的创建
* @author 王文艳
* @create 2016-10-08
**/
public class UniversalDto extends LinkedHashMap {
public static UniversalDto newDto(){
return new UniversalDto();
}
public UniversalDto append(String key, Object value){
this.put(key, value);
return this;
}
}