Merge branch 'feature_master_xh_standard' into 'master'

地址相似度评级

See merge request !22
This commit is contained in:
2021-05-07 10:59:43 +08:00
5 changed files with 247 additions and 47 deletions
@@ -1705,6 +1705,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;
}