From db495f649623f794f183ed2a69fe867dcc69466d Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Thu, 15 Jan 2026 11:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 68 +++---------------- 1 file changed, 10 insertions(+), 58 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 e434610fe..c6e1862bb 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 @@ -6007,47 +6007,6 @@ public class PropertyController { } District district = null; - if(StringUtils.isNotBlank(model.getCity()) && StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ - /* 先到CPDB库中查找小区 */ - district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), - "district"); - } - boolean villaFlag = DataUtil.isVilla(model.getSize(), model.getName(), model.getHeight(), model.getRoom()); - -// 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"); -// } -// -// } -// } -// } - String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ @@ -6059,6 +6018,10 @@ public class PropertyController { } } + if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + } + if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) { JSONObject resultObject = null; if(StringUtils.isNotBlank(model.getAddress())){ @@ -6077,16 +6040,10 @@ public class PropertyController { district = districtService.findById(id); } } -// if (district == null) { -// //使用新匹配再配一遍,不加类型,有结果,类型为district则走小区估值,其它类型也走经纬度估值 -// JSONObject resultObject = addressMatchProxyService.newMatch(model.getCity(), model.getAddress(), 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"); -// district = districtService.findById(id); -// } -// } -// } + if(district == null){ + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; + } if(district != null){ model.setRegion(district.getRegion()); @@ -6175,6 +6132,7 @@ public class PropertyController { return mav; } + District district = null; String estateType = null; if(StringUtils.isNotBlank(model.getPropertyType())){ if(model.getPropertyType().equals("0")){ @@ -6186,14 +6144,8 @@ public class PropertyController { } } - District district = null; - if(StringUtils.isNotBlank(model.getDistrict()) && StringUtils.isNotBlank(model.getName())){ - if(StringUtils.isNotBlank(model.getEstateType()) && model.getEstateType().equals("别墅") && !model.getName().contains("别墅")){ - district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName()+"别墅","district"); - }else{ - district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); - } + district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); } if (district == null && (StringUtils.isNotBlank(model.getName()) || StringUtils.isNotBlank(model.getAddress()))) {