From a856ca8a0ff77380d9f33f3d8249400ae27814f9 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 27 Dec 2023 17:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E5=8D=97=E8=A1=8C=E6=88=BF=E6=BA=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=E7=AC=AC=E4=B8=89=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastore/CzbankSampleServiceImpl.java | 45 ++++++++++--------- .../service/datastore/DistrictService.java | 3 ++ .../datastore/DistrictServiceImpl.java | 12 +++++ 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java index 646b65331..b21b903b1 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java @@ -204,40 +204,41 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), DateUtil.add(new Date(), -7)); } List querySamples = new ArrayList(); -// List samples = findSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + District hasHouseDist = districtService.findDistrictHasHouseFlag(district);//查询是否是有房源的小区 - List keys = new ArrayList(); - String key = district.getName() + "_" + district.getRegion() + "_" + district.getCity(); - // 修改 - keys.add(key); + if(hasHouseDist != null){ + List keys = new ArrayList(); + String key = district.getName() + "_" + district.getRegion() + "_" + district.getCity(); + // 修改 + keys.add(key); - List names = new ArrayList(); - names.add(ClientUtils.escapeQueryChars(district.getName())); + List names = new ArrayList(); + names.add(ClientUtils.escapeQueryChars(district.getName())); - if (district.getAlias() != null) { - for (String alia : district.getAlias()) { + if (district.getAlias() != null) { + for (String alia : district.getAlias()) { - if (StringUtils.isNotBlank(alia) && alia.length() >= 2 && !names.contains(alia)) { - names.add(ClientUtils.escapeQueryChars(alia)); + if (StringUtils.isNotBlank(alia) && alia.length() >= 2 && !names.contains(alia)) { + names.add(ClientUtils.escapeQueryChars(alia)); - key = alia + "_" + district.getRegion() + "_" + district.getCity(); - if (!keys.contains(key)) { - keys.add(key); + key = alia + "_" + district.getRegion() + "_" + district.getCity(); + if (!keys.contains(key)) { + keys.add(key); + } } } } - } - - - List samples = findJnbankSampleByDistrict(district, keys, names, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + List samples = findJnbankSampleByDistrict(district, keys, names, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); // scoreForSample(samples, target); - sortForSample(samples, target); - for (SampleWrapper sample : samples) { - sample.setProperty(queryBean.getProperty()); + sortForSample(samples, target); + for (SampleWrapper sample : samples) { + sample.setProperty(queryBean.getProperty()); + } + querySamples.addAll(samples); } - querySamples.addAll(samples); + if (querySamples.size() < max) { district = districtService.findOneByKey(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); // List districts = districtService.findNearestDistrict(district, 1000, 5); 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 d1f56da79..8cd9fc3f9 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 @@ -522,8 +522,11 @@ public interface DistrictService extends ModeService { public District findOneByKey(DistrictKey districtKey, String cat); List findNearestDistrict(District district, int radiusMeters, int limit); + List doFindNearestHasHouseDistrict(District district, int radiusMeters, int limit) ; + District findDistrictHasHouseFlag(District district); + List findNearestDistrict(District district, int radiusMeters, String[] fields, int limit); List findNearestDistrict(String city, Double lng, Double lat, int radiusMeters, int limit); 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 c5f8d917c..ccd394174 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 @@ -2495,6 +2495,18 @@ public class DistrictServiceImpl implements DistrictService { return new ArrayList(ret); } + @Override + public District findDistrictHasHouseFlag(District district) { + List params = new ArrayList(); + params.add(new QueryParam("category", "district")); + params.add(new QueryParam("city", district.getCity())); + params.add(new QueryParam("region", district.getRegion())); + params.add(new QueryParam("name", district.getName())); + params.add(new QueryParam("visible", 0)); + params.add(new QueryParam("ifSell", 1)); + return districtDao.findDistrict(params); + } + public List doFindNearestDistrict(District district, int radiusMeters, String[] fields, int limit) { if (district == null || district.getLat() == null || district.getLng() == null || district.getLat() <= 0