From 387e847c02f49a5f00115ca0785d12f9ffcea67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Thu, 23 May 2024 15:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/dal/seaweed/model/District.java | 10 +-- .../open/controllers/PropertyController.java | 69 +++++++++++++++---- .../service/datastore/DistrictService.java | 4 +- .../datastore/DistrictServiceImpl.java | 4 +- 4 files changed, 63 insertions(+), 24 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java index 2bb00ca36..00d35fa46 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java @@ -187,7 +187,7 @@ public class District implements SeaweedEntity { private double score; // 小区性质 private String landProperty; - private String masterDistrictNname; + private String masterDistrictName; private String ip; private String addrType; private boolean selected; @@ -309,12 +309,12 @@ public class District implements SeaweedEntity { } @Column(name = "master_district_name") - public String getMasterDistrictNname() { - return masterDistrictNname; + public String getMasterDistrictName() { + return masterDistrictName; } - public void setMasterDistrictNname(String masterDistrictNname) { - this.masterDistrictNname = masterDistrictNname; + public void setMasterDistrictName(String masterDistrictName) { + this.masterDistrictName = masterDistrictName; } public void setCategory(String category) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 81a281610..875390efc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2524,14 +2524,32 @@ public class PropertyController { if (district.getAlias() != null) { districtNames.addAll(district.getAlias()); } - } - List dealPrices = null; - for (String name : districtNames) { - dealPrices = findDealPricesByName(model.getCity(), model.getDistrict(), name, model.getMax() * 5, model); - if (!dealPrices.isEmpty()) { - break; + final String masterDistrictName = district.getMasterDistrictName(); + if (StringUtils.isNotBlank(masterDistrictName)) { + List districts; + if ("master".equals(masterDistrictName)) { + // 所有的分期数据 + districts = districtService.findSlaves(model.getCity(), model.getDistrict(), model.getName()); + } else { + // 根据主小区名查询所有名称 + districts = districtService.findSlaves(model.getCity(), model.getDistrict(), masterDistrictName); + } + if (CollectionUtils.isNotEmpty(districts)) { + for (District districtTemp : districts) { + districtNames.add(districtTemp.getName()); + } + } } } +// List dealPrices = new ArrayList(); + // 将主名与映射别名查得成交加入 存在不能查出最新成交问题 +// for (String name : districtNames) { +// List dealPricesTempList = findDealPricesByName(model.getCity(), model.getDistrict(), name, model.getMax() * 5, model); +// if (CollectionUtils.isNotEmpty(dealPricesTempList)) { +// dealPrices.addAll(dealPricesTempList); +// } +// } + List dealPrices = findDealPricesByNames(model.getCity(), model.getDistrict(), districtNames, model.getMax() * 5, model); if (model.getSize() != null) { Collections.sort(dealPrices, new Comparator() { @Override @@ -2580,15 +2598,9 @@ public class PropertyController { } deal = new LinkedHashMap(); dealPrice.setId(null); - if (district != null) { - deal.put("city", district.getCity()); - deal.put("district", district.getRegion()); - deal.put("name", district.getName()); - } else { - deal.put("city", dealPrice.getCity()); - deal.put("district", dealPrice.getRegion()); - deal.put("name", dealPrice.getDistrictName()); - } + deal.put("city", dealPrice.getCity()); + deal.put("district", dealPrice.getRegion()); + deal.put("name", dealPrice.getDistrictName()); if (dealPrice.getArea() == null) { deal.put("size", ""); } else { @@ -3501,6 +3513,33 @@ public class PropertyController { return null; } + private List findDealPricesByNames(String city, String region, List names, int max, + DealPriceModel model) { + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("districtName", QueryParam.IN_OPERATOR, names)); + if (model.getRoom() != null) { + params.add(new QueryParam("room", model.getRoom())); + } + if (model.getHall() != null) { + params.add(new QueryParam("hall", model.getHall())); + } + // 18年之后抓住的数据没有score字段 +// params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); + List dealPrices = dealPriceService.findDealPrices(params, max); + List distinctDealPrices = new ArrayList(); + for (DealPrice dealPrice : dealPrices) { + if (dealPrice.getAvgPrice() == null) { + dealPrice.setAvgPrice((int) (dealPrice.getTotalPrice() / dealPrice.getArea())); + } + if (!checkExists(distinctDealPrices, dealPrice)) { + distinctDealPrices.add(dealPrice); + } + } + return distinctDealPrices; + } + private List findDealPricesByName(String city, String region, String name, int max, DealPriceModel model) { List params = new ArrayList(); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java index 8cd9fc3f9..68588d8e5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java @@ -540,10 +540,10 @@ public interface DistrictService extends ModeService { * * @param city * @param region - * @param masterDistrictNname + * @param masterDistrictName * @return */ - List findSlaves(String city, String region, String masterDistrictNname); + List findSlaves(String city, String region, String masterDistrictName); /** * 分期操作时设置此小区为人工操作标识 diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index 31b588538..189508ed8 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2717,12 +2717,12 @@ public class DistrictServiceImpl implements DistrictService { } @Override - public List findSlaves(String city, String region, String masterDistrictNname) { + public List findSlaves(String city, String region, String masterDistrictName) { List params = new ArrayList(); params.add(new QueryParam("visible", 0)); params.add(new QueryParam("city", city)); params.add(new QueryParam("region", region)); - params.add(new QueryParam("masterDistrictNname", masterDistrictNname)); + params.add(new QueryParam("masterDistrictName", masterDistrictName)); return districtDao.findAllByParams(params); }