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] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E6=A0=B7=E6=9C=AC?= =?UTF-8?q?=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) {