五级地址标准化完善

This commit is contained in:
mjt
2024-02-20 10:11:24 +08:00
parent 9f53a72dd7
commit 96a2dbda49
2 changed files with 47 additions and 47 deletions
@@ -309,6 +309,53 @@ public class AddrSvcController {
return mav;
}
/**
*五级地址标准化
*
* @param model
* @return
*/
public Object fiveDivisionAction(AddesssMatchModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getAddress())) {
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
return mav;
}
HttpRequest request = new HttpRequest();
JSONObject json = null;
Map<String, String> params = new HashMap<String, String>();
params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : null);
params.put("refCity", StringUtils.isNotBlank(model.getRefCity()) ? model.getRefCity() : null);
params.put("address", model.getAddress());
// 默认不输出省市区的代码
params.put("showCode", StringUtils.isNotBlank(model.getShowCode()) ? model.getShowCode() : "0");
params.put("complete", "true");
params.put("addressAssessment", "true");
try {
json = request.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v3/structure", params, "UTF-8");
} catch (Exception e) {
try {
json = request.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v3/structure", params, "UTF-8");
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (json != null) {
int code = json.getInt("msgCode");
String msg = json.getString("msg");
BasicModel basicModel = new BasicModel(code, msg);
if (json.containsKey("result")) {
basicModel.setResult(json.get("result"));
}
mav.setModel(basicModel);
} else {
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
}
return mav;
}
public void setDistrictStatService(DistrictStatService districtStatService) {
this.districtStatService = districtStatService;
@@ -1989,53 +1989,6 @@ public class AddressController {
return mav;
}
/**
* 杭银消金四级地址标准化
*
* @param model
* @return
*/
public Object fourDivisionAction(AddesssMatchModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getAddress())) {
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
return mav;
}
HttpRequest request = new HttpRequest();
JSONObject json = null;
Map<String, String> params = new HashMap<String, String>();
params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : null);
params.put("refCity", StringUtils.isNotBlank(model.getRefCity()) ? model.getRefCity() : null);
params.put("address", model.getAddress());
// 默认不输出省市区的代码
params.put("showCode", StringUtils.isNotBlank(model.getShowCode()) ? model.getShowCode() : "0");
params.put("complete", "true");
params.put("addressAssessment", "true");
try {
json = request.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v3/structure", params, "UTF-8");
} catch (Exception e) {
try {
json = request.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v3/structure", params, "UTF-8");
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (json != null) {
int code = json.getInt("msgCode");
String msg = json.getString("msg");
BasicModel basicModel = new BasicModel(code, msg);
if (json.containsKey("result")) {
basicModel.setResult(json.get("result"));
}
mav.setModel(basicModel);
} else {
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
}
return mav;
}
/**
* 详细地址标准化接口