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 406afdada..84666f102 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 @@ -231,41 +231,36 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), DateUtil.add(new Date(), -7)); } List querySamples = new ArrayList(); - 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, target.getStrctureArea()); - -// scoreForSample(samples, target); - sortForSample(samples, target); - for (SampleWrapper sample : samples) { - sample.setProperty(queryBean.getProperty()); - } - querySamples.addAll(samples); } + List samples = findJnbankSampleByDistrict(district, keys, names, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat, target.getStrctureArea()); + +// scoreForSample(samples, target); + sortForSample(samples, target); + for (SampleWrapper sample : samples) { + sample.setProperty(queryBean.getProperty()); + } + 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);