diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java index 4eac9a928..7ce356ffa 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java @@ -37,6 +37,7 @@ public class SeawaterQuery { private Double lng; private Integer radius; + private String level; public String getId() { return id; @@ -269,4 +270,12 @@ public class SeawaterQuery { public void setRadius(Integer radius) { this.radius = radius; } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java index 7b21bbf0a..7c8dd0ca2 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java @@ -142,6 +142,10 @@ public class Evaluation implements MongoEntity { * 物业费(元/m?/月) */ private Double propertyManagementFee; + /** + * 楼层描述 + */ + private String floorDesc; @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "_id") @@ -1054,4 +1058,12 @@ public class Evaluation implements MongoEntity { public void setPropertyManagementFee(Double propertyManagementFee) { this.propertyManagementFee = propertyManagementFee; } + + public String getFloorDesc() { + return floorDesc; + } + + public void setFloorDesc(String floorDesc) { + this.floorDesc = floorDesc; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OfficeRentStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OfficeRentStat.java index 900281731..1173752c8 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OfficeRentStat.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/OfficeRentStat.java @@ -3,7 +3,6 @@ package com.fangjia.dal.mongo.model; import com.fangjia.dal.MongoEntity; import javax.persistence.*; -import java.util.Date; @Entity @Table(name = "fangjia_stat.office_rent_stat") @@ -16,6 +15,7 @@ public class OfficeRentStat implements MongoEntity { private String district; private Integer date; private Double avgPrice; + private String name; @Id @GeneratedValue @@ -72,4 +72,13 @@ public class OfficeRentStat implements MongoEntity { public void setAvgPrice(Double avgPrice) { this.avgPrice = avgPrice; } + + @Column(name = "name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index 39a29c099..1f6270cab 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -1,19 +1,17 @@ package com.fangjia.dal.seawater.dao; -import java.util.*; - -import com.fangjia.dal.SeawaterQuery; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; - import com.fangjia.core.util.HttpRequest; import com.fangjia.core.util.HttpRequestException; +import com.fangjia.dal.SeawaterQuery; import com.fangjia.dal.seawater.model.Seawater; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.StringUtils; import org.sothis.core.util.Pager; +import java.util.*; + public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl implements SeawaterDao { @@ -618,6 +616,20 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i temp.put("term", param); jsonList.add(temp); } + if (StringUtils.isNotBlank(query.getFitment())) { + JSONObject param = new JSONObject(); + param.put("fitment", query.getFitment()); + JSONObject temp = new JSONObject(); + temp.put("term", param); + jsonList.add(temp); + } + if (StringUtils.isNotBlank(query.getDirection())) { + JSONObject param = new JSONObject(); + param.put("direction", query.getDirection()); + JSONObject temp = new JSONObject(); + temp.put("term", param); + jsonList.add(temp); + } Set namesList = new LinkedHashSet(); if (StringUtils.isNotBlank(query.getDistrictName())) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index d60ec8ae1..c1e446844 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -361,9 +361,9 @@ public class OfficeController { evaluation.setRegion(model.getRegion()); evaluation.setDistrictName(model.getName()); evaluation.setAddress(model.getAddress()); - evaluation.setDirection(DIRECTION.get(model.getDirection())); + evaluation.setDirection(model.getDirection()); evaluation.setNoise(NOISE.get(model.getNoise())); - evaluation.setEstateType(PROPERTY_TYPES.get(model.getPropertyType())); + evaluation.setType(model.getType()); evaluation.setSight(SIGHT.get(model.getView())); evaluation.setAtticArea(model.getAtticSize()); evaluation.setTerraceArea(model.getOuterSize()); @@ -476,6 +476,16 @@ public class OfficeController { if (model.isNewDistrict()) { evaluation.setNewDistrict(model.isNewDistrict()); } + String floorDesc = "中"; + if (evaluation.getFloor() != null && evaluation.getHeight() != null) { + Double floorInfo = evaluation.getFloor() * 1.0 / evaluation.getHeight(); + if (floorInfo <= 0.33) { + floorDesc = "低"; + } else if (floorInfo > 0.66) { + floorDesc = "高"; + } + evaluation.setFloorDesc(floorDesc); + } String ip = AnalyticsUtil.getIpAddress(ActionContext.getContext().getRequest()); evaluation.setIp(ip); AuthenticationBean authenticationBean = (AuthenticationBean) request diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java index 393456e10..caa6b566d 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java @@ -41,46 +41,9 @@ public class OfficeServiceImpl implements OfficeService { evaluation.setFloor(null); evaluation.setHeight(null); } - String city = district.getCity(); - String region = district.getRegion(); - String name = district.getName(); - List alias = district.getAlias(); - Integer endDate = Integer.valueOf(DateUtil.formatByPattern(new Date(), "yyyyMMdd")); - Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); - - SeawaterQuery query = new SeawaterQuery(); - query.setCat("office_rent"); - query.setCityDisplay(city); - if (StringUtils.isNotBlank(region)) { - query.setRegion(region); - } - query.setStartDate(startDate); - query.setEndDate(endDate); - query.setDistrictName(name); - query.setDistrictAlias(alias); - if (evaluation.getArea() != null && evaluation.getArea() != 0) { - query.setStartArea(evaluation.getArea() * 0.9); - query.setEndArea(evaluation.getArea() * 1.1); - } - Pager pager = new Pager(); - pager.setStartRow(0); - pager.setPageSize(100); - query.setPager(pager); - query.setTable("latest_seawater"); - List seawaters = seawaterService.findSeawatersByQuery(query); - //List seawaters = seawaterService.findSeawatersByQuery("office_rent", city, region, name, alias, startDate, endDate); - // 有样本 - Double unitPrice = null; - // 如果面积相近查不到,则不限制面积查询一次,如果还是没有查到,则返回null; - if (CollectionUtils.isEmpty(seawaters)) { - query.setStartArea(null); - query.setEndArea(null); - seawaters = seawaterService.findSeawatersByQuery(query); - } - OfficeEvaluationDto officeEvaluationDto = null; - if (seawaters.size() > 0) { - officeEvaluationDto = this.calcRent(seawaters, evaluation); - } else { + OfficeEvaluationDto officeEvaluationDto = this.calcRent(evaluation); + // 如果从基价表中找不到,// 第三步:周边(三公里内最近的10个写字楼)同等级、同类型写字楼的均值*楼层系数*装修系数*朝向系数 + if (officeEvaluationDto == null || officeEvaluationDto.getUnitPrice() == null) { if (StringUtils.isNotBlank(evaluation.getLocation())) { officeEvaluationDto = rentEvaluateByLocation(evaluation); } else if (district != null && district.getLat() != null) { @@ -102,6 +65,21 @@ public class OfficeServiceImpl implements OfficeService { put("4", "豪装"); } }; + + private static final Map DIRECTION_MAP = new HashMap() { + { + put("1", "西南"); + put("2", "东南"); + put("3", "南"); + put("4", "西北"); + put("5", "东北"); + put("6", "东"); + put("7", "西"); + put("8", "北"); + put("9", "东西"); + put("10", "南北"); + } + }; private static final Map LEVEL_MAP = new HashMap() { { put(1, "甲级"); @@ -117,135 +95,213 @@ public class OfficeServiceImpl implements OfficeService { put(4, "综合体"); } }; - public OfficeEvaluationDto calcRent(List seawaters, Evaluation evaluation) { - // 计算平均值 + // 随机森林模型系数计算 + private static final Map FLOOR_FACTOR = new HashMap() { + { + put("中层", 1.0); + put("低层", 0.9940); + put("高层", 1.0185); + put("中", 1.0); + put("低", 0.9940); + put("高", 1.0185); + } + }; + private static final Map FITMENT_FACTOR = new HashMap() { + { + put("毛坯", 0.9983); + put("简装", 1.0); + put("精装", 1.0153); + put("豪装", 1.0199); + } + }; + private static final Map DIRECTION_FACTOR = new HashMap() { + { + put("东", 1.0040); + put("东北", 1.0048); + put("东南", 1.0121); + put("东西", 1.0003); + put("北", 0.9999); + put("南", 1.0000); + put("南北", 1.0080); + put("西", 1.0060); + put("西北", 1.0099); + put("西南", 1.0103); + } + }; + + public OfficeEvaluationDto calcRent(Evaluation evaluation) { + // 第一步:按写字楼同楼层、装修、朝向选取3个,计算平均值作为结果 + // 第二步:基准价*楼层系数*装修系数*朝向系数 + // 第三步:周边(三公里内最近的10个写字楼)同等级、同类型写字楼的均值*楼层系数*装修系数*朝向系数 + String floorDesc = evaluation.getFloorDesc(); + List selectedSeawaters = new ArrayList(); + // 第一步:按写字楼同楼层、装修、朝向选取3个,计算平均值作为结果 + List seawaters; + SeawaterQuery query = new SeawaterQuery(); + query.setRegion(evaluation.getRegion()); + query.setDistrictName(evaluation.getDistrictName()); + query.setFitment(FITMENT_MAP.get(evaluation.getFitment())); + query.setDirection(DIRECTION_MAP.get(evaluation.getDirection())); + query.setCat("office_rent"); + query.setRadius(3000); + + Integer endDate = Integer.valueOf(DateUtil.formatByPattern(new Date(), "yyyyMMdd")); + Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); + query.setStartDate(startDate); + query.setEndDate(endDate); + + query.setCityDisplay(evaluation.getCity()); + Pager pager = new Pager(); + pager.setStartRow(0); + pager.setPageSize(100); + query.setPager(pager); + query.setTable("latest_seawater"); + seawaters = seawaterService.findSeawatersByQuery(query); + for (Seawater seawater : seawaters) { + boolean sameFloorDesc = false; + + if (seawater.getFloorInfo() != null) { + if (seawater.getFloorInfo().contains(floorDesc)) { + sameFloorDesc = true; + } else { + try { + Integer floor = Integer.parseInt(seawater.getFloorInfo()); + if (floor <= 6 && "低".equals(floorDesc)) { + sameFloorDesc = true; + } else if (floor > 6 && floor <= 15 && "中".equals(floorDesc)) { + sameFloorDesc = true; + } else if (floor > 15 && "高".equals(floorDesc)) { + sameFloorDesc = true; + } + } catch (Exception ex) { + + } + } + } + if (sameFloorDesc) { + selectedSeawaters.add(seawater); + } + if (selectedSeawaters.size() == 3) { + return getOfficeEvaluationDto(selectedSeawaters, evaluation); + } + } + // 查找基准价 + List params = new ArrayList(); + params.add(new QueryParam("cat", "office")); + params.add(new QueryParam("city", evaluation.getCity())); + params.add(new QueryParam("district", evaluation.getRegion())); + params.add(new QueryParam("name", evaluation.getDistrictName())); + // 获取上个月yyyyMM日期 + String date = DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -2), "yyyyMM"); + params.add(new QueryParam("date", Integer.parseInt(date))); + + // 按日期降序排序,取最新的数据,可能上月还未更新,则取上上个月的数据 + List sortParams = new ArrayList(); + sortParams.add(new SortParam("date", false)); + + // 第二步:基准价*楼层系数*装修系数*朝向系数 + OfficeRentStat officeRentStat = officeRentStatDao.findFirstByParams(params); + Double avgPrice = officeRentStat.getAvgPrice(); + if (avgPrice != null) { + Double factor = 1.0; + if (evaluation.getFitment() != null) { + factor *= FITMENT_FACTOR.get(FITMENT_MAP.get(evaluation.getFitment())); + } + if (floorDesc != null) { + factor *= FLOOR_FACTOR.get(floorDesc); + } + if (evaluation.getDirection() != null) { + factor *= DIRECTION_FACTOR.get(DIRECTION_MAP.get(evaluation.getDirection())); + } + avgPrice = avgPrice * factor; + return getOfficeEvaluationDtoWithAvgPrice(avgPrice, evaluation); + } + + return null; + } + + /** + * 根据均价查询样本 + * @param avgPrice + * @param evaluation + * @return + */ + private OfficeEvaluationDto getOfficeEvaluationDtoWithAvgPrice(Double avgPrice, Evaluation evaluation) { + SeawaterQuery query = new SeawaterQuery(); + query.setRegion(evaluation.getRegion()); + query.setStartPrice((int) (avgPrice * 30 * 0.9)); + query.setEndPrice((int) (avgPrice * 30 * 1.1)); + query.setCat("office_rent"); + query.setRadius(3000); + + Integer endDate = Integer.valueOf(DateUtil.formatByPattern(new Date(), "yyyyMMdd")); + Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); + query.setStartDate(startDate); + query.setEndDate(endDate); + + query.setCityDisplay(evaluation.getCity()); + Pager pager = new Pager(); + pager.setStartRow(0); + pager.setPageSize(5); + query.setPager(pager); + query.setTable("latest_seawater"); + List seawaters = seawaterService.findSeawatersByQuery(query); + return getOfficeEvaluationDto(seawaters, evaluation); + } + + /** + * 基准价*楼层系数*装修系数*朝向系数 + * @param seawaters + * @param evaluation + * @return + */ + private static OfficeEvaluationDto getOfficeEvaluationDtoWithFactor(List seawaters, Evaluation evaluation) { Double sum = 0.0; Double size = 0.0; - Double unitPrice = null; - Double factor = 1.0; - // 按写字楼类型过滤 - List filterWithType = new ArrayList(); - if (evaluation.getType() != null) { - if (TYPE_MAP.get(evaluation.getFitment()) != null) { - for (Seawater seawater : seawaters) { - if (TYPE_MAP.get(evaluation.getType()).equals(seawater.getEstateType())) { - filterWithType.add(seawater); - } - } - } - // 如果样本数量大于5,则按装修过滤 - if (filterWithType.size() > 5) { - seawaters = filterWithType; - } else { - // TODO 按照写字楼类型进行调整,1:标准写字楼;2:创意园区;3:商住两用;4:综合体 - // 拍脑袋 - if (evaluation.getType() == 1) { - factor *= 1.0; - } else if (evaluation.getType() == 2) { - factor *= 0.98; - } else if (evaluation.getType() == 3) { - factor *= 0.97; - } else if (evaluation.getType() == 4) { - factor *= 0.96; - } - } - } - // 按写字楼等级过滤 - List filterWithGrade = new ArrayList(); - if (evaluation.getLevel() != null) { - if (LEVEL_MAP.get(evaluation.getFitment()) != null) { - for (Seawater seawater : seawaters) { - if (LEVEL_MAP.get(evaluation.getLevel()).equals(seawater.getLevel())) { - filterWithGrade.add(seawater); - } - } - } - // 如果样本数量大于5,则按装修过滤 - if (filterWithGrade.size() > 5) { - seawaters = filterWithGrade; - } else { - // TODO 按照写字楼等级进行调整,1:甲级;2:乙级;3:丙级 - // 拍脑袋 - if (evaluation.getLevel() == 1) { - factor *= 1.2; - } else if (evaluation.getLevel() == 2) { - factor *= 1.0; - } else if (evaluation.getLevel() == 3) { - factor *= 0.9; - } - } - } - // 按楼层过滤 - List filterWithFloor = new ArrayList(); - if (evaluation.getFloor() != null && evaluation.getHeight() != null) { - Double floorInfo = evaluation.getFloor() * 1.0 / evaluation.getHeight(); - String floorDesc = "中层"; - if (floorInfo <= 0.33) { - floorDesc = "低层"; - } else if (floorInfo > 0.66) { - floorDesc = "高层"; - } - if (LEVEL_MAP.get(evaluation.getFitment()) != null) { - for (Seawater seawater : seawaters) { - if (seawater.getFloorInfo() != null && seawater.getFloorInfo().contains(floorDesc)) { - filterWithFloor.add(seawater); - } - } - } - // 如果样本数量大于5,则按装修过滤 - if (filterWithFloor.size() > 5) { - seawaters = filterWithGrade; - } else { - // TODO 按照写字楼楼层进行调整,高层 中层 低层 - // 拍脑袋 - if (floorDesc.equals("高层")) { - factor *= 1.2; - } else if (floorDesc.equals("中层")) { - factor *= 1.0; - } else if (floorDesc.equals("低层")) { - factor *= 0.9; - } - } - } - // 按装修过滤 - List filterWithFitment = new ArrayList(); - if (evaluation.getFitment() != null) { - if (FITMENT_MAP.get(evaluation.getFitment()) != null) { - for (Seawater seawater : seawaters) { - if (FITMENT_MAP.get(evaluation.getFitment()).equals(seawater.getFitment())) { - filterWithFitment.add(seawater); - } - } - } - // 如果样本数量大于5,则按装修过滤 - if (filterWithFitment.size() > 5) { - seawaters = filterWithFitment; - } else { - // TODO 按照装修系数进行调整,如1: 毛坯,2: 简装,3: 精装,4: 豪装 - // 拍脑袋 - if (evaluation.getFitment().equals(1)) { - factor *= 0.8; - } else if (evaluation.getFitment().equals(2)) { - factor *= 1.0; - } else if (evaluation.getFitment().equals(3)) { - factor *= 1.2; - } else if (evaluation.getFitment().equals(4)) { - factor *= 1.5; - } - } - } - // TODO 3.4免租期factor*调整因子:factory - 免租期/最低起租期 - // TODO 物业费因子 + String fitment = FITMENT_MAP.get(evaluation.getFitment()); + String direction = DIRECTION_MAP.get(evaluation.getDirection()); for (Seawater seawater : seawaters) { if (seawater.getTotalPrice() != null && seawater.getArea() != null && seawater.getTotalPrice() / seawater.getArea() / 30 > 0 && seawater.getTotalPrice() / seawater.getArea() / 30 < 30) { - sum += seawater.getTotalPrice(); + Double price = Double.valueOf(seawater.getTotalPrice()); + // 楼层系数修正 + if (seawater.getFloorInfo() != null) { + try { + if (seawater.getFloorInfo().contains("低")) { + price = price / FLOOR_FACTOR.get("低") * FLOOR_FACTOR.get(evaluation.getFloorDesc()); + } else if (seawater.getFloorInfo().contains("中")) { + price = price / FLOOR_FACTOR.get("中") * FLOOR_FACTOR.get(evaluation.getFloorDesc()); + } else if (seawater.getFloorInfo().contains("高")) { + price = price / FLOOR_FACTOR.get("高") * FLOOR_FACTOR.get(evaluation.getFloorDesc()); + } + } catch (Exception ex) { + + } + } + // 装修 + if (seawater.getFitment() != null) { + try { + price = price / FITMENT_FACTOR.get(seawater.getFitment()) * FITMENT_FACTOR.get(fitment); + } catch (Exception ex) { + + } + } + // 朝向 + if (seawater.getDirection() != null) { + try { + price = price / DIRECTION_FACTOR.get(seawater.getDirection()) * DIRECTION_FACTOR.get(direction); + } catch (Exception ex) { + + } + } + + sum += price; size += seawater.getArea(); } } OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto(); if (size > 0) { - unitPrice = DataUtil.roundDouble(sum / size / 30 * factor, 2); + Double unitPrice = DataUtil.roundDouble(sum / size / 30, 2); officeEvaluationDto.setUnitPrice(unitPrice); officeEvaluationDto.setSeawater(seawaters); officeEvaluationDto.setCity(evaluation.getCity()); @@ -255,6 +311,36 @@ public class OfficeServiceImpl implements OfficeService { return officeEvaluationDto; } + /** + * 纯样本查询结果估值 + * + * @param seawaters + * @param evaluation + * @return + */ + private static OfficeEvaluationDto getOfficeEvaluationDto(List seawaters, Evaluation evaluation) { + Integer sum = 0; + Double size = 0.0; + + for (Seawater seawater : seawaters) { + if (seawater.getTotalPrice() != null && seawater.getArea() != null && seawater.getTotalPrice() / seawater.getArea() / 30 > 0 && seawater.getTotalPrice() / seawater.getArea() / 30 < 30) { + sum += seawater.getTotalPrice(); + size += seawater.getArea(); + } + } + OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto(); + if (size > 0) { + Double unitPrice = DataUtil.roundDouble(sum / size / 30, 2); + officeEvaluationDto.setUnitPrice(unitPrice); + officeEvaluationDto.setSeawater(seawaters); + officeEvaluationDto.setCity(evaluation.getCity()); + officeEvaluationDto.setDistrict(evaluation.getRegion()); + officeEvaluationDto.setName(evaluation.getDistrictName()); + } + return officeEvaluationDto; + } + + @Override public OfficeEvaluationDto addressEvaluateRent(Evaluation evaluation) { if (null == evaluation.getFloor() || 0 == evaluation.getFloor() || null == evaluation.getHeight() || 0 == evaluation.getHeight()) { @@ -279,16 +365,14 @@ public class OfficeServiceImpl implements OfficeService { query.setLat(lat); query.setLng(lng); query.setCat("office_rent"); - query.setRadius(1000); + query.setRadius(3000); Integer endDate = Integer.valueOf(DateUtil.formatByPattern(new Date(), "yyyyMMdd")); Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); query.setStartDate(startDate); query.setEndDate(endDate); - if (evaluation.getArea() != null && evaluation.getArea() != 0) { - query.setStartArea(evaluation.getArea() * 0.9); - query.setEndArea(evaluation.getArea() * 1.1); - } + query.setEstateType(TYPE_MAP.get(evaluation.getType())); + query.setLevel(LEVEL_MAP.get(evaluation.getLevel())); query.setCityDisplay(evaluation.getCity()); Pager pager = new Pager(); pager.setStartRow(0); @@ -296,21 +380,14 @@ public class OfficeServiceImpl implements OfficeService { query.setPager(pager); query.setTable("latest_seawater"); seawaters = seawaterService.findSeawatersByQuery(query); - // 如果面积相近查不到,则不限制面积查询一次,如果还是没有查到,则返回null; + // 如果同等级同类型没有查到,则放开 if (CollectionUtils.isEmpty(seawaters)) { - query.setStartArea(null); - query.setEndArea(null); + query.setEstateType(null); + query.setLevel(null); seawaters = seawaterService.findSeawatersByQuery(query); } - // 如果还查不到,取周边三公里,如上海青浦凤新大楼,太偏了 - if (CollectionUtils.isEmpty(seawaters)) { - query.setRadius(3000); - seawaters = seawaterService.findSeawatersByQuery(query); - } - OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto(); if (CollectionUtils.isNotEmpty(seawaters)) { - officeEvaluationDto = calcRent(seawaters, evaluation); - return officeEvaluationDto; + return getOfficeEvaluationDtoWithFactor(seawaters, evaluation); } } return null;