From 87e1886849376aa2cca1b9a334537ef51ef8ae77 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 12 Sep 2025 17:08:43 +0800 Subject: [PATCH 1/9] update --- .../open/controllers/PropertyController.java | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 9960a1d18..16fb7f26f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1211,15 +1211,6 @@ public class PropertyController { evaluation.setAvgPrice(avgPrice); evaluation.setBigTotalPrice((long) (avgPrice * evaluation.getArea())); } - if (StringUtils.isNotBlank(evaluation.getFromUserId())) { - // 1007839 广州市慧合信息科技有限公司 huihe_test 价格向上2%-10% 向下 2%-5% - if (evaluation.getFromUserId().equals("1007839")) { - int round = DataUtil.generateRandomNumber(district.getCity() + model.getAddress()); - int newAvgPrice = (int) (evaluation.getAvgPrice() + evaluation.getAvgPrice() * round / 100); - evaluation.setAvgPrice(newAvgPrice); - evaluation.setBigTotalPrice((long) (newAvgPrice * evaluation.getArea())); - } - } } } catch (Exception ex) { @@ -1661,16 +1652,15 @@ public class PropertyController { } } - ApiUser apiUser = checkNewAuthorized(model.getToken()); - String userName = null; - if (apiUser != null) { - User user = userService.findById(apiUser.getId()); - if (user != null) { - userName = user.getUserName(); - } - } - - if (district == null && userName!=null && !userName.equals("huihe_test")) { +// ApiUser apiUser = checkNewAuthorized(model.getToken()); +// String userName = null; +// if (apiUser != null) { +// User user = userService.findById(apiUser.getId()); +// if (user != null) { +// userName = user.getUserName(); +// } +// } + if (district == null) { //加上高德获取经纬度 和 根据经纬度估值 Map map = GeoUtils.parserByGaode(model.getCity(), model.getAddress()); if(map != null && (!map.containsKey("lng") || map.containsKey("level") && !GAODE_LEVEL.contains(map.get("level")))){ @@ -1690,15 +1680,6 @@ public class PropertyController { HashMap resultMap = new HashMap(); resultMap.put("avgPrice", Long.valueOf(json.getString("unitPrice"))); resultMap.put("totalPrice", Long.valueOf(json.getString("totalPrice"))); - - if (apiUser.getId() == 1007839) { - int round = DataUtil.generateRandomNumber(model.getCity() + model.getAddress()); - Long newAvgPrice = (Long) (json.getLong("unitPrice") + json.getLong("unitPrice") * round / 100); - resultMap.put("avgPrice", newAvgPrice); - double totalPrice = newAvgPrice * model.getSize(); - resultMap.put("totalPrice", (long) totalPrice); - } - mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); } else { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); From 50275c3a6a5f95e9bf3fdeacbfd885e3396faa13 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 12 Sep 2025 17:35:56 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=AB=98=E5=BE=B7key=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fangjia/core/util/GeoUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java index 858508625..202bae448 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java @@ -318,8 +318,8 @@ public class GeoUtils { private static String getGaodeKey(String endpoint) { // 实现获取高德 API key 的逻辑 -// return "8796b9dfb3889b57c38e2fff1b7e51bd"; - return "7516b8e9436de903eef85fb156cbc3cf";//临时2天 + return "8796b9dfb3889b57c38e2fff1b7e51bd"; + } public static void main(String[] args) { From a9a48a19b737393e65b8278c631438ee6ffd2429 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 12 Sep 2025 18:32:15 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/PropertyController.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 16fb7f26f..fdec48ff0 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1652,14 +1652,7 @@ public class PropertyController { } } -// ApiUser apiUser = checkNewAuthorized(model.getToken()); -// String userName = null; -// if (apiUser != null) { -// User user = userService.findById(apiUser.getId()); -// if (user != null) { -// userName = user.getUserName(); -// } -// } + if (district == null) { //加上高德获取经纬度 和 根据经纬度估值 Map map = GeoUtils.parserByGaode(model.getCity(), model.getAddress()); From 8ff5a7ca2c2d0673915a0f1baab69e66dc035f37 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 17 Sep 2025 14:40:33 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E6=88=BF=E6=BA=90bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 2c49399a8..824d8cf80 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -776,7 +776,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i jsonList.add(temp); } - if (StringUtils.isNotBlank(query.getSortField())) { + if (reqBody.size()==0 && StringUtils.isNotBlank(query.getSortField())) { JSONObject jsonOrder = new JSONObject(); if (query.getOrder()) { jsonOrder.put("order", "asc"); From 33281a1fa922e3b9166a532389e87cbe4b6096cb Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 17 Sep 2025 14:41:11 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=95=86=E9=93=BA=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=8F=8A=E6=88=BF=E6=BA=90=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/core/util/GeoUtils.java | 5 +- .../controllers/CommercialController.java | 160 ++++++++++++++++++ .../fangjia/open/model/CommercialModel.java | 111 ++++++++++++ 3 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java index 202bae448..4de1dc719 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/GeoUtils.java @@ -1,5 +1,6 @@ package com.fangjia.core.util; +import org.apache.commons.lang.StringUtils; import org.json.JSONArray; import org.json.JSONObject; @@ -261,7 +262,9 @@ public class GeoUtils { public static Map parserByGaode(String city, String address) { Map params = new HashMap(); - params.put("city", city); + if(StringUtils.isNotBlank(city)){ + params.put("city", city); + } params.put("address", address); String content; 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 new file mode 100644 index 000000000..d57a8d192 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/CommercialController.java @@ -0,0 +1,160 @@ +package com.fangjia.open.controllers; + +import com.fangjia.core.util.GeoUtils; +import com.fangjia.core.util.HttpRequest; +import com.fangjia.core.util.HttpRequestException; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; +import com.fangjia.open.model.AddesssMatchModel; +import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.CommercialModel; +import com.fangjia.open.model.RestfulModelAndView; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 商业地产 + * + * @since 2025/9/16 + */ +@Authority(role = Role.USER) +public class CommercialController { + + private static final List GAODE_LEVEL = Arrays.asList("兴趣点", "门牌号", "单元号", "楼层", "房间", "门址", "住宅区","村庄"); + + public Object shopSellEvaluateAction(CommercialModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + mav = checkParmas(model, mav); + 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"))) { + 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("该地址不支持估价!")); + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } else { + mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); + } + return mav; + } + + public Object shopSellSampleAction(CommercialModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + mav = checkParmas(model, mav); + 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)); + } + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + } else { + mav.setModel(BasicModel.buildBadRequestModel("该地址不支持样本输出!")); + } + return mav; + } + + private RestfulModelAndView checkParmas(CommercialModel model, RestfulModelAndView mav){ + if (StringUtils.isBlank(model.getAddress()) || model.getSize()==null || model.getEstateType()==null ) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址,面积,商铺类型为必填项")); + return mav; + } + + if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); + return mav; + } + + if (model.getFloor() != null && (model.getFloor() <= 0 || model.getFloor() > 59)) { + mav.setModel(BasicModel.buildBadRequestModel("floor取值非法,正确范围[1,60)")); + return mav; + } + if (model.getMaxFloor() != null && model.getFloor() != null && model.getFloor() > model.getMaxFloor()) { + mav.setModel(BasicModel.buildBadRequestModel("所在楼层不能大于总楼层")); + return mav; + } + + if (model.getPassengerFlow() != null && (model.getPassengerFlow() <0 || model.getPassengerFlow() > 2)) { + mav.setModel(BasicModel.buildBadRequestModel("客流量取值非法,正确范围[0,2]")); + return mav; + } + + if (model.getPassengerFlow() != null && (model.getLeaseStability() <0 || model.getLeaseStability() > 3)) { + mav.setModel(BasicModel.buildBadRequestModel("租约稳定性取值非法,正确范围[0,3]")); + return mav; + } + + if (model.getSellType()!= null && (model.getSellType() <0 || model.getSellType() > 1)) { + mav.setModel(BasicModel.buildBadRequestModel("出售方式取值非法,正确范围[0,1]")); + return mav; + } + + if (model.getEstateType()!= null && (model.getEstateType() <0 || model.getEstateType() > 7)) { + mav.setModel(BasicModel.buildBadRequestModel("商铺类型取值非法,正确范围[0,7]")); + return mav; + } + return mav; + } + + + private JSONObject locationEvaluateApi(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); + params.put("area", area); + params.put("estateType", estateType); + try { + json = request.getJsonContent("http://192.168.0.100:30020/avmWeb/shopSell", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:30020/avmWeb/shopSell", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + return json; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java new file mode 100644 index 000000000..38446c746 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java @@ -0,0 +1,111 @@ +package com.fangjia.open.model; + +import org.hibernate.validator.constraints.NotBlank; + +public class CommercialModel extends FangjiaApiModel{ + + @NotBlank + private String address; + private Double size; + private String location; + + + private Integer floor;//所在楼层 + private Integer maxFloor;//总楼层 + + private Integer passengerFlow;//客流量---0:高 1:中 2:低 + private Integer LeaseStability;//租约稳定性---0:持续稳定出租 1:阶段性出租 2:偶尔出租 3:未出租 + private Integer sellType;//出售/转让---0:出售 1:转让 + private Integer decorationCost;//装修成本(单位:万元) + private Integer decorationYear;//装修年限(单位:年) + @NotBlank + private Integer estateType;//商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Double getSize() { + return size; + } + + public void setSize(Double size) { + this.size = size; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public Integer getFloor() { + return floor; + } + + public void setFloor(Integer floor) { + this.floor = floor; + } + + public Integer getMaxFloor() { + return maxFloor; + } + + public void setMaxFloor(Integer maxFloor) { + this.maxFloor = maxFloor; + } + + public Integer getPassengerFlow() { + return passengerFlow; + } + + public void setPassengerFlow(Integer passengerFlow) { + this.passengerFlow = passengerFlow; + } + + public Integer getLeaseStability() { + return LeaseStability; + } + + public void setLeaseStability(Integer leaseStability) { + LeaseStability = leaseStability; + } + + public Integer getSellType() { + return sellType; + } + + public void setSellType(Integer sellType) { + this.sellType = sellType; + } + + public Integer getDecorationCost() { + return decorationCost; + } + + public void setDecorationCost(Integer decorationCost) { + this.decorationCost = decorationCost; + } + + public Integer getDecorationYear() { + return decorationYear; + } + + public void setDecorationYear(Integer decorationYear) { + this.decorationYear = decorationYear; + } + + public Integer getEstateType() { + return estateType; + } + + public void setEstateType(Integer estateType) { + this.estateType = estateType; + } +} From 1829530dcc6f447377738b48e0078a935b077df5 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 17 Sep 2025 15:27:38 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E9=80=86=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 { From 10603dcb1f8bf4b2bd3a261834ddbe8a06af51fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 17 Sep 2025 17:12:12 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=90=9E=E5=BE=97KEy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 22 +++++++- .../StructureAndCompleteDto.java | 51 +++++++++++++++++++ 2 files changed, 72 insertions(+), 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 b768c8052..29403f61a 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 @@ -185,7 +185,27 @@ public class AddrSvcController { String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { - basicModel.setResult(CommonDtoUtils.transformV(StructureAndCompleteDto.class, json.get("result"))); + StructureAndCompleteDto structureAndCompleteDto = CommonDtoUtils.transformV(StructureAndCompleteDto.class, json.get("result")); + if("1".equals(model.getShowCode())){ + if(StringUtils.isNotBlank(structureAndCompleteDto.getProvinceCode())){ + structureAndCompleteDto.setProvinceCode(structureAndCompleteDto.getProvinceCode().substring(0, 6)); + } + if(StringUtils.isNotBlank(structureAndCompleteDto.getCityCode())){ + structureAndCompleteDto.setCityCode(structureAndCompleteDto.getCityCode().substring(0, 6)); + } + if(StringUtils.isNotBlank(structureAndCompleteDto.getDistrictCode())){ + structureAndCompleteDto.setDistrictCode(structureAndCompleteDto.getDistrictCode().substring(0, 6)); + } + if(StringUtils.isNotBlank(structureAndCompleteDto.getTownshipCode())){ + structureAndCompleteDto.setTownshipCode(structureAndCompleteDto.getTownshipCode().substring(0, 9)); + } + }else{ + structureAndCompleteDto.setProvinceCode(null); + structureAndCompleteDto.setCityCode(null); + structureAndCompleteDto.setDistrictCode(null); + structureAndCompleteDto.setTownshipCode(null); + } + basicModel.setResult(structureAndCompleteDto); } mav.setModel(basicModel); } else { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java index 6407c8ce9..786b6d995 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java @@ -12,14 +12,26 @@ public class StructureAndCompleteDto { * 省份 */ private String province; + /** + * 省份编码 + */ + private String provinceCode; /** * 城市 */ private String city; + /** + * city编码 + */ + private String cityCode; /** * 区域 */ private String district; + /** + * 区域编码 + */ + private String districtCode; /** * 开发区 */ @@ -28,6 +40,11 @@ public class StructureAndCompleteDto { * 乡镇街道 */ private String township; + + /** + * 乡镇街道编码 + */ + private String townshipCode; /** * 道路 */ @@ -200,4 +217,38 @@ public class StructureAndCompleteDto { public void setAddrVerify(String addrVerify) { this.addrVerify = addrVerify; } + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getDistrictCode() { + return districtCode; + } + + public void setDistrictCode(String districtCode) { + this.districtCode = districtCode; + } + + public String getTownshipCode() { + return townshipCode; + } + + public void setTownshipCode(String townshipCode) { + this.townshipCode = townshipCode; + } + + } From c4d184743b2649e634a96a80b3eb8575a332c8d8 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 18 Sep 2025 14:30:55 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=95=86=E9=93=BA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/CommercialController.java | 36 +++++++++---------- .../fangjia/open/model/CommercialModel.java | 10 ++++++ 2 files changed, 28 insertions(+), 18 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 c39cea43a..b3d5f1c71 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 @@ -12,10 +12,7 @@ import com.fangjia.open.model.RestfulModelAndView; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 商业地产 @@ -36,12 +33,17 @@ public class CommercialController { return mav; } - JSONObject json = locationEvaluateApi(model.getAddress(), model.getLocation(), String.valueOf(model.getSize()), String.valueOf(model.getEstateType())); + JSONObject json = locationEvaluateApi(model); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - HashMap resultMap = new HashMap(); + 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("该地址不支持估价!")); @@ -61,15 +63,13 @@ public class CommercialController { if(mav.model()!=null){ return mav; } - JSONObject json = locationEvaluateApi(model.getAddress(), model.getLocation(), String.valueOf(model.getSize()), String.valueOf(model.getEstateType())); + JSONObject json = locationEvaluateApi(model); if (json != null) { if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(200, "ok"); + List> list = new ArrayList>(); if (json.containsKey("case")) { - basicModel.setResult(json.get("case")); + mav.setModel(BasicModel.buildOKModel().setResult(json.get("case"))); } - mav.setModel(BasicModel.buildOKModel().setResult(basicModel)); } } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); @@ -125,20 +125,20 @@ public class CommercialController { } - private JSONObject locationEvaluateApi(String address, String location, String area, String estateType){ + private JSONObject locationEvaluateApi(CommercialModel model){ //商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 HttpRequest request = new HttpRequest(); JSONObject json = null; Map params = new HashMap(); - if(StringUtils.isNotBlank(address)){ - params.put("address", address); + if(StringUtils.isNotBlank(model.getAddress())){ + params.put("address", model.getAddress()); } - if(StringUtils.isNotBlank(location)){ - params.put("location", location); + if(StringUtils.isNotBlank(model.getLocation())){ + params.put("location", model.getLocation()); } - params.put("area", area); - params.put("estateType", estateType); + 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"); } catch (Exception e) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java index 38446c746..0a91d3da7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommercialModel.java @@ -21,6 +21,8 @@ public class CommercialModel extends FangjiaApiModel{ @NotBlank private Integer estateType;//商铺类型---0:临街商铺 1:住宅底商 2:购物百货中心 3:写字楼商铺 4:档口摊位 5:市场类商铺 6:交通设施商铺 7:旅游商铺 + private Integer showSample;//是否显示样本 1:显示 + public String getAddress() { return address; } @@ -108,4 +110,12 @@ public class CommercialModel extends FangjiaApiModel{ public void setEstateType(Integer estateType) { this.estateType = estateType; } + + public Integer getShowSample() { + return showSample; + } + + public void setShowSample(Integer showSample) { + this.showSample = showSample; + } } From a925eb6a0ed2905bbbd4534e3f92bb311960750a Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 18 Sep 2025 18:20:46 +0800 Subject: [PATCH 9/9] =?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(); }