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 4c173468d..cc6084e23 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 @@ -1,6 +1,7 @@ package com.fangjia.dal.mongo.model; import com.fangjia.dal.MongoEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import javax.persistence.*; @@ -16,6 +17,7 @@ public class OfficeRentStat implements MongoEntity { private Integer date; private Double avgPrice; private String name; + @JsonIgnore private Object location; @Id 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 cc9a5522f..443f116bb 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 @@ -282,6 +282,7 @@ public class OfficeController { districtPriceMap.put("district", evaluation.getRegion()); districtPriceMap.put("name", evaluation.getName()); districtPriceMap.put("samples", evaluation.getSeawater()); + districtPriceMap.put("refOffices", evaluation.getOffice()); mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); try { 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 950f6711a..1d5339786 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 @@ -354,9 +354,8 @@ public class OfficeServiceImpl implements OfficeService { // 评估逻辑 String location = getLocation(evaluation.getCity(), evaluation.getAddress()); evaluation.setLocation(location); - OfficeEvaluationDto officeEvaluationDto = rentEvaluateByLocation(evaluation); - return officeEvaluationDto; + return rentEvaluateByLocation(evaluation); } private OfficeEvaluationDto rentEvaluateByLocation(Evaluation evaluation) { @@ -419,43 +418,12 @@ public class OfficeServiceImpl implements OfficeService { } Double avgPrice = DataUtil.roundDouble(totalPrice / count * factor, 2); officeEvaluationDto.setUnitPrice(avgPrice); - officeEvaluationDto.setOffices(infos); + officeEvaluationDto.setOffice(infos); officeEvaluationDto.setCity(evaluation.getCity()); officeEvaluationDto.setDistrict(evaluation.getRegion()); officeEvaluationDto.setName(evaluation.getDistrictName()); return officeEvaluationDto; } - -// // 查询Seawater样本 -// List seawaters; -// SeawaterQuery query = new SeawaterQuery(); -// query.setLat(lat); -// query.setLng(lng); -// 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.setEstateType(TYPE_MAP.get(evaluation.getType())); -// query.setLevel(LEVEL_MAP.get(evaluation.getLevel())); -// query.setCityDisplay(evaluation.getCity()); -// Pager pager = new Pager(); -// pager.setStartRow(0); -// pager.setPageSize(10); -// query.setPager(pager); -// query.setTable("latest_seawater"); -// seawaters = seawaterService.findSeawatersByQuery(query); -// // 如果同等级同类型没有查到,则放开 -// if (CollectionUtils.isEmpty(seawaters)) { -// query.setEstateType(null); -// query.setLevel(null); -// seawaters = seawaterService.findSeawatersByQuery(query); -// } -// if (CollectionUtils.isNotEmpty(seawaters)) { -// return getOfficeEvaluationDtoWithFactor(seawaters, evaluation); -// } } return officeEvaluationDto; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/dto/OfficeEvaluationDto.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/dto/OfficeEvaluationDto.java index db68aeac2..b2d164110 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/dto/OfficeEvaluationDto.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/dto/OfficeEvaluationDto.java @@ -15,7 +15,7 @@ public class OfficeEvaluationDto extends Evaluation { private Double unitPrice; private List seawater; - private List offices; + private List office; private String district; private String name; @@ -52,11 +52,11 @@ public class OfficeEvaluationDto extends Evaluation { this.name = name; } - public List getOffices() { - return offices; + public List getOffice() { + return office; } - public void setOffices(List offices) { - this.offices = offices; + public void setOffice(List office) { + this.office = office; } }