From a925eb6a0ed2905bbbd4534e3f92bb311960750a Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 18 Sep 2025 18:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/core/util/AvmUrls.java | 15 ++++ .../controllers/CommercialController.java | 68 +++++++++++++++++-- 2 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java new file mode 100644 index 000000000..58a46b2bf --- /dev/null +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/AvmUrls.java @@ -0,0 +1,15 @@ +package com.fangjia.core.util; + +public class AvmUrls { + /** + * 商铺出售评估及样例房源 + */ + public static final String SHOPSELL_EVALUATE = "/avmWeb/shopSell"; + + + /** + * 商铺出租评估及样例房源 + */ + public static final String SHOPRENT_EVALUATE = "/avmWeb/shopRent"; + +} 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 b3d5f1c71..4557ec6c8 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 @@ -1,5 +1,6 @@ package com.fangjia.open.controllers; +import com.fangjia.core.util.AvmUrls; import com.fangjia.core.util.GeoUtils; import com.fangjia.core.util.HttpRequest; import com.fangjia.core.util.HttpRequestException; @@ -33,7 +34,7 @@ public class CommercialController { return mav; } - JSONObject json = locationEvaluateApi(model); + JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { HashMap resultMap = new HashMap(); @@ -63,7 +64,7 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - JSONObject json = locationEvaluateApi(model); + JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPSELL_EVALUATE); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { List> list = new ArrayList>(); @@ -78,6 +79,63 @@ public class CommercialController { return mav; } + + public Object shopRentEvaluateAction(CommercialModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + mav = checkParmas(model, mav); + if(mav.model()!=null){ + return mav; + } + + JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); + 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"))); + + if (model.getShowSample()!=null && model.getShowSample()==1 && json.containsKey("case")) { + resultMap.put("samples", json.get("case")); + } + + mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); + } else { + mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + + return mav; + } + + public Object shopRentSampleAction(CommercialModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + mav = checkParmas(model, mav); + if(mav.model()!=null){ + return mav; + } + JSONObject json = locationEvaluateApi(model, AvmUrls.SHOPRENT_EVALUATE); + if (json != null) { + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + List> list = new ArrayList>(); + if (json.containsKey("case")) { + mav.setModel(BasicModel.buildOKModel().setResult(json.get("case"))); + } + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + + return mav; + } + + + private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){ if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getLocation())) { mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或经纬度不为空")); @@ -125,7 +183,7 @@ public class CommercialController { } - private JSONObject locationEvaluateApi(CommercialModel model){ + private JSONObject locationEvaluateApi(CommercialModel model, String uri){ //商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 HttpRequest request = new HttpRequest(); JSONObject json = null; @@ -140,10 +198,10 @@ public class CommercialController { params.put("area", String.valueOf(model.getSize())); params.put("estateType", String.valueOf(model.getEstateType())); try { - json = request.getJsonContent("http://192.168.0.100:30020/avmWeb/shopSell", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:30020"+ uri, params, "UTF-8"); } catch (Exception e) { try { - json = request.getJsonContent("http://192.168.0.100:30020/avmWeb/shopSell", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:30020"+ uri, params, "UTF-8"); } catch (Exception ex) { ex.printStackTrace(); }