From 1829530dcc6f447377738b48e0078a935b077df5 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 17 Sep 2025 15:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AB=98=E5=BE=B7=E9=80=86?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 73 +++++++++---------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java index d57a8d192..c39cea43a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -36,28 +36,20 @@ public class CommercialController { return mav; } - //加上高德获取经纬度 和 根据经纬度估值 - Map map = GeoUtils.parserByGaode(null, model.getAddress()); - if (map != null && map.containsKey("level") && GAODE_LEVEL.contains(map.get("level")) - && map.containsKey("lng") && map.containsKey("lat")) { - String location = map.get("lng") + "," + map.get("lat"); - - JSONObject json = locationEvaluateApi(location, String.valueOf(model.getSize()), String.valueOf(model.getEstateType())); - if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - HashMap resultMap = new HashMap(); - resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice"))); - resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice"))); - mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); - } else { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); - } + JSONObject json = locationEvaluateApi(model.getAddress(), model.getLocation(), String.valueOf(model.getSize()), String.valueOf(model.getEstateType())); + if (json != null) { + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + HashMap resultMap = new HashMap(); + resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice"))); + resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice"))); + mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); } } else { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } + return mav; } @@ -69,34 +61,29 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - - //加上高德获取经纬度 和 根据经纬度估值 - Map map = GeoUtils.parserByGaode(null, model.getAddress()); - if (map != null && map.containsKey("level") && GAODE_LEVEL.contains(map.get("level")) - && map.containsKey("lng") && map.containsKey("lat")) { - String location = map.get("lng") + "," + map.get("lat"); - - JSONObject json = locationEvaluateApi(location, String.valueOf(model.getSize()), String.valueOf(model.getEstateType())); - if (json != null) { - if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(200, "ok"); - if (json.containsKey("case")) { - basicModel.setResult(json.get("case")); - } - mav.setModel(BasicModel.buildOKModel().setResult(basicModel)); + JSONObject json = locationEvaluateApi(model.getAddress(), model.getLocation(), String.valueOf(model.getSize()), String.valueOf(model.getEstateType())); + if (json != null) { + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(200, "ok"); + if (json.containsKey("case")) { + basicModel.setResult(json.get("case")); } - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + mav.setModel(BasicModel.buildOKModel().setResult(basicModel)); } } else { - mav.setModel(BasicModel.buildBadRequestModel("该地址不支持样本输出!")); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } + return mav; } private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){ - if (StringUtils.isBlank(model.getAddress()) || model.getSize()==null || model.getEstateType()==null ) { + if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getLocation())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或经纬度不为空")); + return mav; + } + if (model.getSize()==null || model.getEstateType()==null ) { mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址,面积,商铺类型为必填项")); return mav; } @@ -138,12 +125,18 @@ public class CommercialController { } - private JSONObject locationEvaluateApi(String location, String area, String estateType){ + private JSONObject locationEvaluateApi(String address, String location, String area, String estateType){ //商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); - params.put("location", location); + if(StringUtils.isNotBlank(address)){ + params.put("address", address); + } + if(StringUtils.isNotBlank(location)){ + params.put("location", location); + } + params.put("area", area); params.put("estateType", estateType); try {