From 9f53a72dd7bc37d1b447765780d4cd8ef331ed88 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Mon, 19 Feb 2024 10:30:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9B=E7=BA=A7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddressController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bd1aea25a..5cec14e94 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 @@ -2006,8 +2006,8 @@ public class AddressController { 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("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"); From 96a2dbda4993035a6a61675c5e167dd6279a0ad5 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Tue, 20 Feb 2024 10:11:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=94=E7=BA=A7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 47 +++++++++++++++++++ .../open/controllers/AddressController.java | 47 ------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 07d036ae8..635678e69 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -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 params = new HashMap(); + 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; 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 5cec14e94..c50eb7af6 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,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 params = new HashMap(); - 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; - } /** * 详细地址标准化接口 From 77b7362ee42e5ae71a451a947ae13e8c6b72fe3a Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Tue, 20 Feb 2024 10:13:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=94=E7=BA=A7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=9B=B4=E6=94=B9=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E4=B8=BA/addrSvc/fiveLevelStructure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddrSvcController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 635678e69..cc78fa58c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -315,7 +315,7 @@ public class AddrSvcController { * @param model * @return */ - public Object fiveDivisionAction(AddesssMatchModel model) { + public Object fiveLevelStructureAction(AddesssMatchModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) {