From 39ff1bca75d8394b1386b6c4df610d24fc18ddb2 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Tue, 13 Jan 2026 21:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 134 ++++++++++++------ 1 file changed, 89 insertions(+), 45 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 45b884011..7b4698a2a 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 @@ -5970,9 +5970,8 @@ public class PropertyController { public Object evaluateRentAction(PropertyEvaluationModel model, HttpServletRequest request) throws NumberFormatException, IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); - if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) - || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); + if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getAddress()) || model.getSize() <= 0) { + mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,地址,面积(size)为必填项")); return mav; } if (model.getCity().endsWith("市")) { @@ -5992,15 +5991,6 @@ public class PropertyController { model.setCalDate(calDate); } } - /* 先到CPDB库中查找小区 */ - District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(), - "district"); - if (district == null) { - mav.setModel(BasicModel.buildBadRequestModel("该小区不存在")); - return mav; - } - model.setName(district.getName()); - if (model.getMaxFloor() != null && (model.getMaxFloor() <= 0 || model.getMaxFloor() > 59)) { mav.setModel(BasicModel.buildBadRequestModel("maxFloor取值非法,正确范围[1,60)")); @@ -6016,45 +6006,99 @@ public class PropertyController { return mav; } - model.setRegion(district.getRegion()); - model.setDistrictName(district.getName()); - if (StringUtils.isBlank(model.getPropertyType())) { - if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { - model.setPropertyType("1"); + 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"); + } + + } + } + } + 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 (model.getCalDate() != null) { - if (new Date().before(model.getCalDate())) { - model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + if(district != null){ + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + if (StringUtils.isBlank(model.getPropertyType())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + model.setPropertyType("1"); + } + } + + if (model.getCalDate() != null) { + if (new Date().before(model.getCalDate())) { + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } else { + model.setCalDate(DateUtil.getFirstDayOfWeek(model.getCalDate())); + } } else { - model.setCalDate(DateUtil.getFirstDayOfWeek(model.getCalDate())); + model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); + } + + Evaluation evaluation = buildEvaluation(model, request); + evaluation.setSource("api_property_evaluate_rent"); + evaluation = evaluationService.evaluateRent(district, evaluation, model.getCalDate()); + + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0) { + Map districtPriceMap = new HashMap(); + districtPriceMap.put("city", district.getCity()); + districtPriceMap.put("district", district.getRegion()); + districtPriceMap.put("name", district.getName()); + districtPriceMap.put("address", district.getAddress()); + districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); + //districtPriceMap.put("cal_date", model.getCalDate()); + districtPriceMap.put("unitPrice", new BigDecimal(evaluation.getTotalPrice() / evaluation.getArea()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue()); + mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); + return mav; + }else{ + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; } - } else { - model.setCalDate(DateUtil.getFirstDayOfWeek(new Date())); - } - - Evaluation evaluation = buildEvaluation(model, request); - evaluation.setSource("api_property_evaluate_rent"); - evaluation = evaluationService.evaluateRent(district, evaluation, model.getCalDate()); - - - if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0) { - Map districtPriceMap = new HashMap(); - districtPriceMap.put("city", district.getCity()); - districtPriceMap.put("district", district.getRegion()); - districtPriceMap.put("name", district.getName()); - districtPriceMap.put("address", district.getAddress()); - districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); - //districtPriceMap.put("cal_date", model.getCalDate()); - districtPriceMap.put("unitPrice", new BigDecimal(evaluation.getTotalPrice() / evaluation.getArea()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue()); - mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); - return mav; - } else { - - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); - return mav; } + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; } public Object searchHouseLoudongAction(PropertyEvaluationModel model, HttpServletRequest request) throws NumberFormatException, IllegalAccessException {