优化报告加载速率
This commit is contained in:
+148
-2
@@ -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<District> allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE);
|
||||
// //按条件过滤相似小区
|
||||
// Integer buildYear = null;
|
||||
// List<District> districts = new ArrayList<District>();
|
||||
// if(StringUtils.isNotBlank(district.getFinishBuildingDate())){
|
||||
// buildYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate());
|
||||
// if(buildYear!=null){
|
||||
// districts = new ArrayList<District>();
|
||||
// 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<Seawater> 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<DistrictHouseDtao> dtos = new ArrayList<DistrictHouseDtao>();
|
||||
// Date weekend = DateUtil.getFirstDayOfWeek(new Date());
|
||||
// for (District dist : districts) {
|
||||
//
|
||||
// List<DistrictRoomSqmetreRent> districtRoomSqmetreRents = districtRoomSqmetreRentService.findDistrictRoomSqmetreRents(dist, 1, room);
|
||||
//
|
||||
// ///List<DistrictStatRent> 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<String, Object> trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12);
|
||||
//// Map<String, Object> trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12);
|
||||
// if (MapUtils.isNotEmpty(trendsMap)) {
|
||||
// Map distMap = (Map) trendsMap.get("distMap");
|
||||
// Map<String, Integer> 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<RentDealPrice> 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<String, Object> districtPriceMap = new HashMap<String, Object>();
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -201,6 +201,7 @@
|
||||
<script type="text/javascript">
|
||||
let chart;
|
||||
$("#download").bind('click', function(){
|
||||
$.toast("报告下载中,请耐心等待");
|
||||
$("#download").css('color', 'blue')
|
||||
let chartImgUrl = $('#chartImgUrl').val();
|
||||
window.location.href = "download?city="+params.city+"&district="+params.district+"&name="+params.name+"&address="+params.address+"&size="+params.size+"&floor="+params.floor
|
||||
@@ -253,91 +254,103 @@
|
||||
$('span[name="height"]').text(result.height)
|
||||
$('span[name="fitment"]').text(result.fitment)
|
||||
|
||||
// 历史租金
|
||||
var charts = {}
|
||||
// charts.series = [{
|
||||
// name: '1居室',
|
||||
// data: [3800, 3900, 4000, 4100, 4200, 4200, 4200, 4200]
|
||||
// }];
|
||||
if (result.trends.distMap[params.room] == undefined) {
|
||||
console.log("返回历史租金,不存在" + params.room + "居室数据")
|
||||
$('#districtRentTrendsChart').empty();
|
||||
$('#districtRentTrendsChart').removeClass("charts");
|
||||
$('#districtRentTrendsChart').addClass("p table");
|
||||
$('#districtRentTrendsChart').append('<table style="width: 300px"><tr colspan="6">暂无数据<td></tr></table>');
|
||||
} else {
|
||||
var arr = [];
|
||||
result.trends.times.forEach(function (d) {
|
||||
var price = result.trends.distMap[params.room][d];
|
||||
if (price != undefined) {
|
||||
arr.push(price);
|
||||
} else {
|
||||
arr.push('');
|
||||
$.ajax({
|
||||
// 注意需要加..
|
||||
url: '../property/rentReport2',
|
||||
data: params,
|
||||
dataType: "json",
|
||||
type: "post",
|
||||
success: function (data) {
|
||||
if (data.code == 200) {
|
||||
let result = data.result;
|
||||
//历史租金
|
||||
var charts = {}
|
||||
// charts.series = [{
|
||||
// name: '1居室',
|
||||
// data: [3800, 3900, 4000, 4100, 4200, 4200, 4200, 4200]
|
||||
// }];
|
||||
if (result.trends.distMap[params.room] == undefined) {
|
||||
console.log("返回历史租金,不存在" + params.room + "居室数据")
|
||||
$('#districtRentTrendsChart').empty();
|
||||
$('#districtRentTrendsChart').removeClass("charts");
|
||||
$('#districtRentTrendsChart').addClass("p table");
|
||||
$('#districtRentTrendsChart').append('<table style="width: 300px"><tr colspan="6">暂无数据<td></tr></table>');
|
||||
} else {
|
||||
var arr = [];
|
||||
result.trends.times.forEach(function (d) {
|
||||
var price = result.trends.distMap[params.room][d];
|
||||
if (price != undefined) {
|
||||
arr.push(price);
|
||||
} else {
|
||||
arr.push('');
|
||||
}
|
||||
})
|
||||
charts.series = [{'name': params.room + '居室', 'data': arr}]; // 纵坐标
|
||||
charts.xData = result.trends.times; // 横坐标值
|
||||
createChartNow('districtRentTrendsChart', charts, true);
|
||||
}
|
||||
|
||||
//已租房源
|
||||
var trades = result.trades;
|
||||
if (trades && trades.length > 0) {
|
||||
$('#trades').empty();
|
||||
trades.forEach(function(d){
|
||||
var fitment = d.fitment != undefined ? d.fitment : '';
|
||||
var hall = d.hall != undefined ? d.hall : '';
|
||||
$('#trades').append('<tr class="bg"> \
|
||||
<td class="td01">' + d.city + '</td> \
|
||||
<td class="td02">' + d.region + '</td> \
|
||||
<td>' + d.districtName + '</td> \
|
||||
<td>' + (d.totalPrice != undefined ? d.totalPrice : '') + '</td> \
|
||||
<td>' + (d.area != undefined ? d.area : '') + '</td> \
|
||||
<td>' + (d.room != undefined ? d.room : '') + '</td> \
|
||||
<td>' + hall + '</td> \
|
||||
<td>' + fitment + '</td> \
|
||||
<td>' + formatDate(d.tradeDate) + '</td> \
|
||||
</tr>');
|
||||
})
|
||||
}
|
||||
|
||||
// 样本参考
|
||||
var referenceHouses = result.houses;
|
||||
if (referenceHouses && referenceHouses.length > 0) {
|
||||
$('#referenceHouses').empty();
|
||||
referenceHouses.forEach(function(d){
|
||||
var fitment = d.fitment != undefined ? d.fitment : '';
|
||||
var date = (d.pDate + '').substring(0, 4) + "-" + (d.pDate + '').substring(4, 6) + "-" + (d.pDate + '').substring(6, 8)
|
||||
$('#referenceHouses').append('<tr class="bg"> \
|
||||
<td class="td01">' + d.city + '</td> \
|
||||
<td class="td02">' + d.region + '</td> \
|
||||
<td>' + d.districtName + '</td> \
|
||||
<td>' + (d.totalPrice != undefined ? d.totalPrice : '') + '</td> \
|
||||
<td>' + (d.area != undefined ? d.area : '') + '</td> \
|
||||
<td>' + (d.room != undefined ? d.room : '') + '</td> \
|
||||
<td>' + (d.hall != undefined ? d.hall : '')+ '</td> \
|
||||
<td>' + fitment + '</td> \
|
||||
<td>' + date + '</td> \
|
||||
</tr>');
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
// 同类小区租金
|
||||
var sameDistricts = result.districts;
|
||||
if (sameDistricts && sameDistricts.length > 0) {
|
||||
$('#sameDistricts').empty()
|
||||
sameDistricts.forEach(function(d){
|
||||
$('#sameDistricts').append('<tr class="bg"> \
|
||||
<td class="td01">' + d.city + '</td> \
|
||||
<td class="td02">' + d.region + '</td> \
|
||||
<td>' + (d.districtName != undefined ? d.districtName:'' ) + '</td> \
|
||||
<td>' + (d.sqAvgPrice != undefined ? d.sqAvgPrice:'') + '</td> \
|
||||
<td>' + (d.room != undefined ? d.room:'') + '</td> \
|
||||
<td>1</td> \
|
||||
</tr>');
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
charts.series = [{'name': params.room + '居室', 'data': arr}]; // 纵坐标
|
||||
charts.xData = result.trends.times; // 横坐标值
|
||||
createChartNow('districtRentTrendsChart', charts, true);
|
||||
}
|
||||
|
||||
// 已租房源
|
||||
var trades = result.trades;
|
||||
if (trades && trades.length > 0) {
|
||||
$('#trades').empty();
|
||||
trades.forEach(function(d){
|
||||
var fitment = d.fitment != undefined ? d.fitment : '';
|
||||
var hall = d.hall != undefined ? d.hall : '';
|
||||
$('#trades').append('<tr class="bg"> \
|
||||
<td class="td01">' + d.city + '</td> \
|
||||
<td class="td02">' + d.region + '</td> \
|
||||
<td>' + d.districtName + '</td> \
|
||||
<td>' + (d.totalPrice != undefined ? d.totalPrice : '') + '</td> \
|
||||
<td>' + (d.area != undefined ? d.area : '') + '</td> \
|
||||
<td>' + (d.room != undefined ? d.room : '') + '</td> \
|
||||
<td>' + hall + '</td> \
|
||||
<td>' + fitment + '</td> \
|
||||
<td>' + formatDate(d.tradeDate) + '</td> \
|
||||
</tr>');
|
||||
})
|
||||
}
|
||||
|
||||
// 样本参考
|
||||
var referenceHouses = result.houses;
|
||||
if (referenceHouses && referenceHouses.length > 0) {
|
||||
$('#referenceHouses').empty();
|
||||
referenceHouses.forEach(function(d){
|
||||
var fitment = d.fitment != undefined ? d.fitment : '';
|
||||
var date = (d.pDate + '').substring(0, 4) + "-" + (d.pDate + '').substring(4, 6) + "-" + (d.pDate + '').substring(6, 8)
|
||||
$('#referenceHouses').append('<tr class="bg"> \
|
||||
<td class="td01">' + d.city + '</td> \
|
||||
<td class="td02">' + d.region + '</td> \
|
||||
<td>' + d.districtName + '</td> \
|
||||
<td>' + (d.totalPrice != undefined ? d.totalPrice : '') + '</td> \
|
||||
<td>' + (d.area != undefined ? d.area : '') + '</td> \
|
||||
<td>' + (d.room != undefined ? d.room : '') + '</td> \
|
||||
<td>' + (d.hall != undefined ? d.hall : '')+ '</td> \
|
||||
<td>' + fitment + '</td> \
|
||||
<td>' + date + '</td> \
|
||||
</tr>');
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
// 同类小区租金
|
||||
var sameDistricts = result.districts;
|
||||
if (sameDistricts && sameDistricts.length > 0) {
|
||||
$('#sameDistricts').empty()
|
||||
sameDistricts.forEach(function(d){
|
||||
$('#sameDistricts').append('<tr class="bg"> \
|
||||
<td class="td01">' + d.city + '</td> \
|
||||
<td class="td02">' + d.region + '</td> \
|
||||
<td>' + (d.districtName != undefined ? d.districtName:'' ) + '</td> \
|
||||
<td>' + (d.sqAvgPrice != undefined ? d.sqAvgPrice:'') + '</td> \
|
||||
<td>' + (d.room != undefined ? d.room:'') + '</td> \
|
||||
<td>1</td> \
|
||||
</tr>');
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
}else{
|
||||
$.toast(data.msg);
|
||||
}
|
||||
|
||||
@@ -260,6 +260,25 @@
|
||||
return
|
||||
}
|
||||
$("#evaluateBtn").prop("disabled", true)
|
||||
|
||||
// 用户输入可能为地址,需要匹配,在估价
|
||||
// let city = $('input[name="city"]').val()
|
||||
// let address = $('input[name="address"]').val()
|
||||
//
|
||||
// $.ajax({
|
||||
// // 注意需要加..
|
||||
// url: '../address/match',
|
||||
// data: {'city': city, 'address': address},
|
||||
// dataType: "json",
|
||||
// type: "post",
|
||||
// success: function (data) {
|
||||
// debugger
|
||||
// if (data.code == 200) {
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
|
||||
$.ajax({
|
||||
// 注意需要加..
|
||||
url: '../ccbRent/evaluateRent',
|
||||
|
||||
Reference in New Issue
Block a user