From e346591035cc9cd943f2e4ea16d143f536bcbc56 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 30 Jan 2026 12:49:48 +0800 Subject: [PATCH] update --- .../controllers/CommercialController.java | 2 +- .../open/controllers/PropertyController.java | 101 ++++++++++++------ 2 files changed, 69 insertions(+), 34 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 37d24c31f..d18b9e9b7 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 @@ -124,7 +124,7 @@ public class CommercialController { if (json.containsKey("unitPrice") && json.containsKey("location")) { Double unitPrice = null; if(json.get("unitPrice") != null){ - unitPrice = (Double) json.get("unitPrice"); + unitPrice = Double.valueOf(json.getInt("unitPrice")); if(ratio!=null){ unitPrice = unitPrice * ratio; } 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 78d07e5ea..e78650ab4 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 @@ -1667,10 +1667,18 @@ public class PropertyController { public Object addressEvaluateAction(PropertyEvaluationModel model, HttpServletRequest request) throws IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); + + if (StringUtils.isBlank(model.getCity()) || model.getSize() <= 0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,面积(size)为必填项")); return mav; } + + if (StringUtils.isBlank(model.getAddress()) && StringUtils.isBlank(model.getName())) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址或名称不为空")); + return mav; + } + + if (model.getDistrict() != null) { //区域编码转房价网区域 FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertOfficialCodeToFangjia(model.getDistrict()); @@ -1679,45 +1687,72 @@ public class PropertyController { } } + District district = null; + + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + boolean villaFlag = DataUtil.isVilla(model.getSize(), model.getName(), model.getHeight(), model.getRoom()); - District district = null; - Map params = new HashMap(); - params.put("city", model.getCity()); - if (StringUtils.isNotBlank(model.getDistrict())) { - params.put("suggestDistrict", model.getDistrict()); - } - params.put("address", model.getAddress()); - if (StringUtils.isNotBlank(model.getName())) { - params.put("suggestName", model.getName()); - } - params.put("category", "district"); - params.put("propertyType", model.getPropertyType()); - String result = addressMatchProxyService.parser(params); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - if (json.getInt("code") == 200) { - Map map = (Map) json.get("result"); - if ((Integer) map.get("precise") >= 0) { - String propertyType = (String) map.get("propertyType"); - // 优先使用客户的物业类型,即使面积很大也不进行别墅推断 20241111 - String userPropertyTypeParam = model.getPropertyType(); - if (StringUtils.isNotBlank(userPropertyTypeParam) && ("0,2".contains(userPropertyTypeParam))) { - villaFlag = false; - } - if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { - district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "别墅", "district"); - } - if (null == district) { - district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); - } + if(district == null){ + Map params = new HashMap(); + params.put("city", model.getCity()); + if (StringUtils.isNotBlank(model.getDistrict())) { + params.put("suggestDistrict", model.getDistrict()); + } + if(StringUtils.isNotBlank(model.getAddress())){ + params.put("address", model.getAddress()); + }else{ + if (StringUtils.isNotBlank(model.getName())) { + params.put("address", model.getName()); + } + } + if (StringUtils.isNotBlank(model.getName())) { + params.put("suggestName", model.getName()); + } + params.put("category", "district"); + params.put("propertyType", model.getPropertyType()); + String result = addressMatchProxyService.parser(params); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + if (json.getInt("code") == 200) { + Map map = (Map) json.get("result"); + if ((Integer) map.get("precise") >= 0) { + String propertyType = (String) map.get("propertyType"); + // 优先使用客户的物业类型,即使面积很大也不进行别墅推断 20241111 + String userPropertyTypeParam = model.getPropertyType(); + if (StringUtils.isNotBlank(userPropertyTypeParam) && ("0,2".contains(userPropertyTypeParam))) { + villaFlag = false; + } + if (villaFlag && StringUtils.isNotBlank(propertyType) && !propertyType.equals("别墅")) { + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name") + "别墅", "district"); + } + if (null == district) { + district = districtService.findByNameAndAlias((String) map.get("city"), (String) map.get("district"), (String) map.get("name"), "district"); + } + + } } } } + if (district == null) { //使用新匹配再配一遍,不加类型,有结果,类型为district则走小区估值,其它类型也走经纬度估值 - JSONObject resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); + JSONObject resultObject = null; + if(StringUtils.isNotBlank(model.getAddress())){ + resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), null, false); + }else{ + if(StringUtils.isNotBlank(model.getName())){ + String addr = model.getName(); + if(StringUtils.isNotBlank(model.getDistrict())){ + addr = model.getDistrict() + addr; + } + resultObject = addressMatchProxyService.newMatch(model.getCity(), addr, null, false); + } + } + if (resultObject != null && resultObject.containsKey("category") && resultObject.get("category")!=null) { if(resultObject.containsKey("id") && resultObject.get("category").equals("district")){ String id = (String) resultObject.get("id");