From a4947fe76c1f1c16014d48527a19d0a93c0b880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 7 Mar 2025 16:22:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E6=A0=B7?= =?UTF-8?q?=E6=9C=AC=E4=BC=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datastore/OfficeServiceImpl.java | 119 +++++++++++++----- .../datastore/dto/OfficeEvaluationDto.java | 10 ++ 2 files changed, 101 insertions(+), 28 deletions(-) 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 a1f6d9978..c1426a0be 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 @@ -15,8 +15,9 @@ import com.fangjia.service.datastore.dto.OfficeEvaluationDto; import com.fangjia.service.mongo.fangjia.SeawaterService; import com.fangjia.service.util.GeoUtils; import com.fangjia.service.util.dto.GaodeDto; +import com.mongodb.BasicDBObject; +import org.apache.commons.collections.CollectionUtils; import org.sothis.core.util.Closure; -import org.sothis.core.util.CollectionUtils; import org.sothis.core.util.Pager; import weiboclient4j.utils.StringUtils; @@ -362,36 +363,98 @@ public class OfficeServiceImpl implements OfficeService { if (StringUtils.isNotBlank(evaluation.getLocation())) { Double lng = Double.valueOf(evaluation.getLocation().split(",")[0]); Double lat = Double.valueOf(evaluation.getLocation().split(",")[1]); - // 查询Seawater样本 - List seawaters; - SeawaterQuery query = new SeawaterQuery(); - query.setLat(lat); - query.setLng(lng); - query.setCat("office_rent"); - query.setRadius(3000); + // 查询附近5个写字楼基准价 + BasicDBObject geo = new BasicDBObject(); + BasicDBObject nearQuery = new BasicDBObject(); + nearQuery.append("$geometry", new BasicDBObject("type", "Point").append("coordinates", new double[]{lng, lat})); + nearQuery.append("$maxDistance", 3000); + geo.append("$near", nearQuery); - 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); + List params = new ArrayList(5); + if (TYPE_MAP.get(evaluation.getType()) != null) { + params.add(new QueryParam("estate_type2", TYPE_MAP.get(evaluation.getType()))); } - if (CollectionUtils.isNotEmpty(seawaters)) { - return getOfficeEvaluationDtoWithFactor(seawaters, evaluation); + if (LEVEL_MAP.get(evaluation.getLevel()) != null) { + params.add(new QueryParam("bed_kind", LEVEL_MAP.get(evaluation.getLevel()))); } + params.add(new QueryParam("cat", "office")); + params.add(new QueryParam("location", geo)); + + 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)); + + List infos = officeRentStatDao.findAllByParams(params, sortParams); + if (CollectionUtils.isEmpty(infos)) { + // 去掉类型,重新查找 + params = new ArrayList(5); + params.add(new QueryParam("cat", "office")); + params.add(new QueryParam("location", geo)); + params.add(new QueryParam("date", Integer.parseInt(date))); + infos = officeRentStatDao.findAllByParams(params, sortParams); + } + if (CollectionUtils.isNotEmpty(infos)) { + // 求均值 + OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto(); + Double totalPrice = 0D; + int count = 0; + for (OfficeRentStat officeRentStat : infos) { + if (officeRentStat.getAvgPrice() != null) { + totalPrice += officeRentStat.getAvgPrice(); + count += 1; + } + } + Double factor = 1.0; + if (evaluation.getFitment() != null) { + factor *= FITMENT_FACTOR.get(FITMENT_MAP.get(evaluation.getFitment())); + } + if (evaluation.getFloorDesc() != null) { + factor *= FLOOR_FACTOR.get(evaluation.getFloorDesc()); + } + if (evaluation.getDirection() != null) { + factor *= DIRECTION_FACTOR.get(DIRECTION_MAP.get(evaluation.getDirection())); + } + Double avgPrice = DataUtil.roundDouble(totalPrice / count * factor, 2); + officeEvaluationDto.setUnitPrice(avgPrice); + officeEvaluationDto.setOffices(infos); + officeEvaluationDto.setCity(evaluation.getCity()); + officeEvaluationDto.setDistrict(evaluation.getRegion()); + officeEvaluationDto.setName(evaluation.getDistrictName()); + } + +// // 查询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 null; } 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 b445eb392..db68aeac2 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 @@ -1,6 +1,7 @@ package com.fangjia.service.datastore.dto; import com.fangjia.dal.mongo.model.Evaluation; +import com.fangjia.dal.mongo.model.OfficeRentStat; import com.fangjia.dal.seawater.model.Seawater; import java.util.List; @@ -14,6 +15,7 @@ public class OfficeEvaluationDto extends Evaluation { private Double unitPrice; private List seawater; + private List offices; private String district; private String name; @@ -49,4 +51,12 @@ public class OfficeEvaluationDto extends Evaluation { public void setName(String name) { this.name = name; } + + public List getOffices() { + return offices; + } + + public void setOffices(List offices) { + this.offices = offices; + } } From 96c7f46656a5cdc55ebb5c2feed370e254d43758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 7 Mar 2025 17:00:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E6=A0=B7?= =?UTF-8?q?=E6=9C=AC=E4=BC=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/dal/mongo/model/OfficeRentStat.java | 10 ++++++++++ .../com/fangjia/open/controllers/OfficeController.java | 1 - .../fangjia/service/datastore/OfficeServiceImpl.java | 7 ++++--- 3 files changed, 14 insertions(+), 4 deletions(-) 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 1173752c8..4c173468d 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 @@ -16,6 +16,7 @@ public class OfficeRentStat implements MongoEntity { private Integer date; private Double avgPrice; private String name; + private Object location; @Id @GeneratedValue @@ -81,4 +82,13 @@ public class OfficeRentStat implements MongoEntity { public void setName(String name) { this.name = name; } + + @Column(name = "location") + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } } 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 2eb8b3d73..cc9a5522f 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 @@ -281,7 +281,6 @@ public class OfficeController { districtPriceMap.put("city", evaluation.getCity()); districtPriceMap.put("district", evaluation.getRegion()); districtPriceMap.put("name", evaluation.getName()); - districtPriceMap.put("unitPrice", evaluation.getUnitPrice()); districtPriceMap.put("samples", evaluation.getSeawater()); mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); 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 c1426a0be..950f6711a 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 @@ -360,6 +360,7 @@ public class OfficeServiceImpl implements OfficeService { } private OfficeEvaluationDto rentEvaluateByLocation(Evaluation evaluation) { + OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto(); if (StringUtils.isNotBlank(evaluation.getLocation())) { Double lng = Double.valueOf(evaluation.getLocation().split(",")[0]); Double lat = Double.valueOf(evaluation.getLocation().split(",")[1]); @@ -387,7 +388,7 @@ public class OfficeServiceImpl implements OfficeService { List sortParams = new ArrayList(); sortParams.add(new SortParam("date", false)); - List infos = officeRentStatDao.findAllByParams(params, sortParams); + List infos = officeRentStatDao.findAllByParams(params, sortParams, 5); if (CollectionUtils.isEmpty(infos)) { // 去掉类型,重新查找 params = new ArrayList(5); @@ -398,7 +399,6 @@ public class OfficeServiceImpl implements OfficeService { } if (CollectionUtils.isNotEmpty(infos)) { // 求均值 - OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto(); Double totalPrice = 0D; int count = 0; for (OfficeRentStat officeRentStat : infos) { @@ -423,6 +423,7 @@ public class OfficeServiceImpl implements OfficeService { officeEvaluationDto.setCity(evaluation.getCity()); officeEvaluationDto.setDistrict(evaluation.getRegion()); officeEvaluationDto.setName(evaluation.getDistrictName()); + return officeEvaluationDto; } // // 查询Seawater样本 @@ -456,7 +457,7 @@ public class OfficeServiceImpl implements OfficeService { // return getOfficeEvaluationDtoWithFactor(seawaters, evaluation); // } } - return null; + return officeEvaluationDto; } private String getLocation(String city, String address) { From d9c0dce1dcbb336805a8cc221c10f984a6b2c672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 7 Mar 2025 17:15:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E6=A0=B7?= =?UTF-8?q?=E6=9C=AC=E4=BC=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mongo/model/OfficeRentStat.java | 2 ++ .../open/controllers/OfficeController.java | 1 + .../service/datastore/OfficeServiceImpl.java | 36 ++----------------- .../datastore/dto/OfficeEvaluationDto.java | 10 +++--- 4 files changed, 10 insertions(+), 39 deletions(-) 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; } } From 68c9fb6399730b7cae10ce89425cb0dfeb189c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 7 Mar 2025 17:16:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E6=A0=B7?= =?UTF-8?q?=E6=9C=AC=E4=BC=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fangjia/open/controllers/OfficeController.java | 1 + 1 file changed, 1 insertion(+) 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 443f116bb..1b29ffc46 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 @@ -524,6 +524,7 @@ public class OfficeController { districtPriceMap.put("name", district.getName()); districtPriceMap.put("unitPrice", evaluation.getUnitPrice()); districtPriceMap.put("samples", evaluation.getSeawater()); + districtPriceMap.put("refOffices", evaluation.getOffice()); mav.setModel(BasicModel.buildOKModel().setResult(districtPriceMap)); try {