diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index 4c6a40e59..bd1aea25a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1989,6 +1989,54 @@ 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 params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("refCity", StringUtils.isNotBlank(model.getCity()) ? model.getRefCity() : CONFIG.getDefaultCity()); + 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; + } + /** * 详细地址标准化接口 * diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index ea10ab2f4..1a8907341 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.NotBlank; public class AddesssMatchModel extends FangjiaApiModel { private String city; + private String refCity; @NotBlank private String address; private String suggestDistrict; @@ -24,6 +25,14 @@ public class AddesssMatchModel extends FangjiaApiModel { private String showCode; + public String getRefCity() { + return refCity; + } + + public void setRefCity(String refCity) { + this.refCity = refCity; + } + public String getAddress_1() { return address_1; }