Merge remote-tracking branch 'origin/open_gj' into open_gj

This commit is contained in:
沈健
2021-04-08 19:02:02 +08:00
16 changed files with 748 additions and 105 deletions
@@ -34,9 +34,10 @@ import com.fangjia.dal.mongo.model.*;
import com.fangjia.dal.seawater.dao.SeawaterDao;
import com.fangjia.dal.seawater.model.Seawater;
import com.fangjia.open.dto.*;
import com.fangjia.service.district.SqmetreRentService;
import com.fangjia.service.district.*;
import com.fangjia.service.mongo.fangjia.*;
import com.fangjia.service.open.*;
import com.fangjia.service.util.DistrictScoreUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -116,8 +117,6 @@ import com.fangjia.service.datastore.FieldFilterService;
import com.fangjia.service.datastore.HouseService;
import com.fangjia.service.datastore.NoHouseDistrictService;
import com.fangjia.service.datastore.OpenApiLogService;
import com.fangjia.service.district.DistrictStatRentService;
import com.fangjia.service.district.DistrictStatService;
import com.fangjia.service.mongo.bkoff.HouseAuctionService;
import com.fangjia.service.mongo.bkoff.HouseLoudongService;
import com.fangjia.service.mongo.bkoff.LoudongService;
@@ -185,6 +184,10 @@ public class PropertyController {
private AutoCompleteService autoCompleteService;
private DistrictRoomSqmetreRentService districtRoomSqmetreRentService;
private RentDealPriceService rentDealPriceService;
private static final int EVALUATE_SHOW_DETAIL = 1;
private static final Map<String, String> PROPERTY_TYPES = new HashMap<String, String>() {
{
@@ -5036,6 +5039,7 @@ public class PropertyController {
if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() != 0) {
evaluation.setAvgPrice((int)(evaluation.getTotalPrice()/evaluation.getArea()));
Map<String, Object> districtPriceMap = new HashMap<String, Object>();
districtPriceMap.put("city", district.getCity());
districtPriceMap.put("district", district.getRegion());
@@ -5053,46 +5057,79 @@ 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 = null;
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);
//周边同类小区租金
if (null == model.getRadius()) {// 设置默认值
model.setRadius(2000);
//周边相似小区租金
Integer room = null;
if(model.getHouseType()!=null){
room = model.getHouseType();
}else{
room = houseService.getDistrictRoomType((float)model.getSize());
}
List<District> districts = districtService.findNearestDistrict(district, model.getRadius(), 50);
if (null != districts) {
Integer room = null;
if(model.getHouseType()!=null){
room = model.getHouseType();
}else{
room = houseService.getDistrictRoomType((float)model.getSize());
}
if (null != room) {
List<DistrictHouseDtao> dtos = new ArrayList<DistrictHouseDtao>();
Date weekend = DateUtil.getFirstDayOfWeek(new Date());
for (District dist : districts) {
if(StringUtils.isNotBlank(district.getEstateType2()) && StringUtils.isNotBlank(dist.getEstateType2()) && !district.getEstateType2().equals(dist.getEstateType2())){
continue;
}
List<DistrictStatRent> districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room);
if (null != districtStatRents && districtStatRents.size() > 0) {
DistrictStatRent districtStatRent = districtStatRents.get(0);
if (districtStatRent.getAvgPrice() > 0) {
SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district");
if(sqmetreRent != null){
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.setRoomPrice(districtStatRent.getAvgPrice());
dto.setSqAvgPrice(sqmetreRent.getAvgPrice());
dto.setSqAvgPrice(districtRoomSqmetreRent.getAvgPrice());
dto.setRoom(room);
dtos.add(dto);
if(dtos.size()>=5){
@@ -5108,10 +5145,15 @@ public class PropertyController {
//近一年户型租金走势
Map<String, Object> trendsMap = districtStatRentService.getRentTrend(model.getCity(), model.getDistrict(), model.getName(), -12);
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);
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 {
@@ -5400,4 +5442,12 @@ public class PropertyController {
public void setSqmetreRentService(SqmetreRentService sqmetreRentService) {
this.sqmetreRentService = sqmetreRentService;
}
public void setDistrictRoomSqmetreRentService(DistrictRoomSqmetreRentService districtRoomSqmetreRentService) {
this.districtRoomSqmetreRentService = districtRoomSqmetreRentService;
}
public void setRentDealPriceService(RentDealPriceService rentDealPriceService) {
this.rentDealPriceService = rentDealPriceService;
}
}
@@ -316,82 +316,81 @@ public class RentController {
return mav;
}
public Object evaluateRentAction(RentModel model, HttpServletRequest request){
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName())
|| StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) {
mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项"));
return mav;
}
District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district");
if (null == district) {
mav.setModel(BasicModel.buildBadRequestModel("小区不存在"));
return mav;
}
Double startArea = model.getSize() - model.getSize()*0.1;
Double endArea = model.getSize() + model.getSize()*0.1;
Integer startDate = Integer.parseInt(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, null, null, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc");
Map<String, Object> retMap = new HashMap<String, Object>();
retMap.put("houses", houses);
if (null == model.getRadius()) {// 设置默认值
model.setRadius(2000);
}
//相近小区
List<District> districts = districtService.findNearestDistrict(district, model.getRadius(), 50);
if (null != districts) {
Integer room = null;
if(model.getHouseType()!=null){
room = model.getHouseType();
}else{
room = houseService.getDistrictRoomType(model.getSize());
}
if (null != room) {
List<DistrictHouseDtao> dtos = new ArrayList<DistrictHouseDtao>();
List<Integer> prices = new ArrayList<Integer>();
Date weekend = DateUtil.getFirstDayOfWeek(new Date());
for (District dist : districts) {
List<DistrictStatRent> districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room);
if (null != districtStatRents && districtStatRents.size() > 0) {
DistrictStatRent districtStatRent = districtStatRents.get(0);
if (districtStatRent.getAvgPrice() > 0) {
SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district");
if(sqmetreRent != null){
DistrictHouseDtao dto = new DistrictHouseDtao();
dto.setCity(dist.getCity());
dto.setRegion(dist.getRegion());
dto.setDistrictName(dist.getName());
dto.setRoomPrice(districtStatRent.getAvgPrice());
dto.setSqAvgPrice(sqmetreRent.getAvgPrice());
dto.setRoom(room);
dtos.add(dto);
if(dtos.size()>=5){
break;
}
}
}
}
}
retMap.put("districts", dtos);
}
}
Map<String, Object> trendsMap = districtStatRentService.getRentTrend(model.getCity(), model.getDistrict(), model.getName(), -12);
retMap.put("trends", trendsMap);
mav.setModel(BasicModel.buildOKModel().setResult(retMap));
return mav;
}
// public Object evaluateRentAction(RentModel model, HttpServletRequest request){
// RestfulModelAndView mav = new RestfulModelAndView();
//
// if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName())
// || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) {
// mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项"));
// return mav;
// }
//
// District district = districtService.findByNameAndAlias(model.getCity(), model.getDistrict(), model.getName(),"district");
// if (null == district) {
// mav.setModel(BasicModel.buildBadRequestModel("小区不存在"));
// return mav;
// }
//
// Double startArea = model.getSize() - model.getSize()*0.1;
// Double endArea = model.getSize() + model.getSize()*0.1;
//
// Integer startDate = Integer.parseInt(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, null, null, null, null, "p_date", false, 1, 5 , null,"seawater-20*/_doc");
// Map<String, Object> retMap = new HashMap<String, Object>();
// retMap.put("houses", houses);
//
// if (null == model.getRadius()) {// 设置默认值
// model.setRadius(2000);
// }
//
// //相近小区
// List<District> districts = districtService.findNearestDistrict(district, model.getRadius(), 50);
// if (null != districts) {
// Integer room = null;
// if(model.getHouseType()!=null){
// room = model.getHouseType();
// }else{
// room = houseService.getDistrictRoomType(model.getSize());
// }
//
// if (null != room) {
// List<DistrictHouseDtao> dtos = new ArrayList<DistrictHouseDtao>();
// List<Integer> prices = new ArrayList<Integer>();
// Date weekend = DateUtil.getFirstDayOfWeek(new Date());
// for (District dist : districts) {
// List<DistrictStatRent> districtStatRents = districtStatRentService.findLatestDistrictStatRent(dist, 1, room);
// if (null != districtStatRents && districtStatRents.size() > 0) {
// DistrictStatRent districtStatRent = districtStatRents.get(0);
// if (districtStatRent.getAvgPrice() > 0) {
// SqmetreRent sqmetreRent = sqmetreRentService.findNearestSqmetreRent(dist.getCity(), dist.getRegion(), dist.getName(), DateUtil.formatToYYYYMMDD(weekend), "district");
// if(sqmetreRent != null){
// DistrictHouseDtao dto = new DistrictHouseDtao();
// dto.setCity(dist.getCity());
// dto.setRegion(dist.getRegion());
// dto.setDistrictName(dist.getName());
// dto.setSqAvgPrice(sqmetreRent.getAvgPrice());
// dto.setRoom(room);
// dtos.add(dto);
// if(dtos.size()>=5){
// break;
// }
// }
// }
// }
// }
// retMap.put("districts", dtos);
// }
// }
//
//
// Map<String, Object> trendsMap = districtStatRentService.getRentTrend(model.getCity(), model.getDistrict(), model.getName(), -12);
// retMap.put("trends", trendsMap);
// mav.setModel(BasicModel.buildOKModel().setResult(retMap));
// return mav;
// }
@@ -8,7 +8,7 @@ public class DistrictHouseDtao implements Serializable {
private String region;
private String districtName;
private Integer roomPrice;
private Double sqAvgPrice;
private Integer sqAvgPrice;
private Integer room;
private Integer hall;
private Integer toilet;
@@ -45,11 +45,11 @@ public class DistrictHouseDtao implements Serializable {
this.roomPrice = roomPrice;
}
public Double getSqAvgPrice() {
public Integer getSqAvgPrice() {
return sqAvgPrice;
}
public void setSqAvgPrice(Double sqAvgPrice) {
public void setSqAvgPrice(Integer sqAvgPrice) {
this.sqAvgPrice = sqAvgPrice;
}