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 f31580327..e75123689 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 @@ -4960,7 +4960,7 @@ public class PropertyController { } /*** - * 小区租金估值报告 + * 小区租金估值报告(上半部分) * @param model * @param request * @return @@ -5060,6 +5060,153 @@ public class PropertyController { Integer startPrice = (int)(evaluation.getTotalPrice() - evaluation.getTotalPrice()*0.2); Integer endPrice = (int)(evaluation.getTotalPrice() + evaluation.getTotalPrice()*0.2); + //周边相似小区 +// if (null == model.getRadius()) {// 设置默认值 +// model.setRadius(1000); +// } +// String[] fields = { "city", "region", "name", "estateType2", "id","finishBuildingDate"}; +// List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); +// //按条件过滤相似小区 +// Integer buildYear = null; +// List districts = new ArrayList(); +// if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ +// buildYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); +// if(buildYear!=null){ +// districts = new ArrayList(); +// int startYear = buildYear -7; +// int endYear = buildYear + 7; +// for(District dist : allDistricts){ +// if(StringUtils.isNotBlank(dist.getFinishBuildingDate())){ +// int simlarDistYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); +// if(simlarDistYear>=startYear && simlarDistYear<=endYear && StringUtils.isNotBlank(district.getEstateType2()) && StringUtils.isNotBlank(dist.getEstateType2()) && district.getEstateType2().equals(dist.getEstateType2())){ +// districts.add(dist); +// } +// } +// } +// } +// } + + //相似房源 +// Double startArea = model.getSize() - model.getSize()*0.1; +// Double endArea = model.getSize() + model.getSize()*0.1; +// Integer startDate = Integer.parseInt(org.apache.tools.ant.util.DateUtils.format(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); +// List houses = seawaterService.findSeawatersFromEs2("rent", district.getCity(), district.getRegion(), district.getName(), null, null, startDate, null, +// startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); +// //无评估小区房源用周边相似小区的房源 +// if(null == houses || houses.size()==0){ +// for (District dist : districts) { +// houses = seawaterService.findSeawatersFromEs2("rent", dist.getCity(), dist.getRegion(), dist.getName(), null, null, startDate, null, +// startArea, endArea, startPrice, endPrice, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc"); +// if(houses!=null && houses.size()>0){ +// break; +// } +// } +// } +// districtPriceMap.put("houses", houses); + +// //周边相似小区租金 +// Integer room = null; +// if(model.getRoom()!=0){ +// room = model.getRoom(); +// }else{ +// room = houseService.getDistrictRoomType((float)model.getSize()); +// } +// if (null != districts) { +// if (null != room) { +// List dtos = new ArrayList(); +// Date weekend = DateUtil.getFirstDayOfWeek(new Date()); +// for (District dist : districts) { +// +// List districtRoomSqmetreRents = districtRoomSqmetreRentService.findDistrictRoomSqmetreRents(dist, 1, room); +// +// ///List districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room); +// if (null != districtRoomSqmetreRents && districtRoomSqmetreRents.size() > 0) { +// DistrictRoomSqmetreRent districtRoomSqmetreRent = districtRoomSqmetreRents.get(0); +// if (districtRoomSqmetreRent.getAvgPrice() > 0) { +// +// int startSqPrice = (int)(evaluation.getAvgPrice() - evaluation.getAvgPrice()*0.1); +// int endSqPrice = (int)(evaluation.getAvgPrice() + evaluation.getAvgPrice()*0.1); +//// SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district"); +// if(districtRoomSqmetreRent.getAvgPrice()>=startSqPrice && districtRoomSqmetreRent.getAvgPrice()<=endSqPrice){ +// DistrictHouseDtao dto = new DistrictHouseDtao(); +// dto.setCity(dist.getCity()); +// dto.setRegion(dist.getRegion()); +// dto.setDistrictName(dist.getName()); +// dto.setSqAvgPrice(districtRoomSqmetreRent.getAvgPrice()); +// dto.setRoom(room); +// dtos.add(dto); +// if(dtos.size()>=5){ +// break; +// } +// } +// } +// } +// } +// districtPriceMap.put("districts", dtos); +// } +// } +// +// +// //近一年户型租金走势 +// Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); +//// Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); +// if (MapUtils.isNotEmpty(trendsMap)) { +// Map distMap = (Map) trendsMap.get("distMap"); +// Map trendMap = (Map) distMap.get(String.valueOf(trendsMap.get("room"))); +// if (MapUtils.isNotEmpty(trendMap)) { +// for (String key : trendMap.keySet()) { +// Double totalPrice = (trendMap.get(key) * evaluation.getArea()); +// trendMap.put(key, totalPrice.intValue()); +// } +// } +// } +// districtPriceMap.put("trends", trendsMap); +// +// +// //成交的租房房源 +// List rentTrades = rentDealPriceService.getRentDealPrices(district.getCity(), district.getRegion(), district.getName(), 5); +// districtPriceMap.put("trades", rentTrades); + + mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); + return mav; + } else { + + mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); + return mav; + } + } + + /*** + * 小区租金估值报告(下半部分) + * @param model + * @param request + * @return + * @throws NumberFormatException + * @throws IllegalAccessException + */ + @Authority(role = Role.NONE) + public Object rentReport2Action(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + /* 先到CPDB库中查找小区 */ + District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district"); + model.setRegion(district.getRegion()); + model.setDistrictName(district.getName()); + if (StringUtils.isBlank(model.getPropertyType())) { + if (district.getEstateType2() != null && district.getEstateType2().contains("别墅")) { + model.setPropertyType("1"); + } + } + 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) { + evaluation.setAvgPrice((int)(evaluation.getTotalPrice()/evaluation.getArea())); + Map districtPriceMap = new HashMap(); + Integer startPrice = (int)(evaluation.getTotalPrice() - evaluation.getTotalPrice()*0.2); + Integer endPrice = (int)(evaluation.getTotalPrice() + evaluation.getTotalPrice()*0.2); + //周边相似小区 if (null == model.getRadius()) {// 设置默认值 model.setRadius(1000); @@ -5170,7 +5317,6 @@ public class PropertyController { mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); return mav; } else { - mav.setModel(BasicModel.buildOKModel().setMsg("暂时不支持该小区的租金估价").markNoData()); return mav; } diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl index 29bff8e79..a3d233ead 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl @@ -201,6 +201,7 @@