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 d066c60a4..43e6959b0 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 @@ -205,7 +205,32 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { } List querySamples = new ArrayList(); // List samples = findSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); - List samples = findJnbankSampleByDistrict(district.getCity(), district.getRegion(), district.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(), queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + + 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())); + + if (district.getAlias() != null) { + for (String alia : district.getAlias()) { + + 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); + } + } + } + } + + + + List samples = findJnbankSampleByDistrict(district, keys, names, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); // scoreForSample(samples, target); sortForSample(samples, target); @@ -215,22 +240,42 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { 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); +// List districts = districtService.findNearestDistrict(district, 1000, 5); + List districts = districtService.doFindNearestHasHouseDistrict(district, 1000, 5); + List arroundNnames = new ArrayList(); + List arroundKeys = new ArrayList(); for (District d : districts) { d = districtService.findById(d.getId()); - //List nearlySample = findSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(),queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); - List nearlySample = findJnbankSampleByDistrict(d.getCity(), d.getRegion(), d.getName(), district.getAlias(), district.getMasterDistrictNname(), district.getEstateType2(), queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); - - for (SampleWrapper sample : nearlySample) { - sample.setProperty(d); + if(district.getName().equals(d.getName())){ + continue; } -// scoreForSample(nearlySample, target); - sortForSample(nearlySample, target); - querySamples.addAll(nearlySample); - if (querySamples.size() > max) { - break; + + String arroundkey = d.getName() + "_" + d.getRegion() + "_" + d.getCity(); + arroundKeys.add(arroundkey); + arroundNnames.add(ClientUtils.escapeQueryChars(d.getName())); + if (d.getAlias() != null) { + for (String alia : d.getAlias()) { + if (StringUtils.isNotBlank(alia) && alia.length() >= 2 && !arroundNnames.contains(alia)) { + arroundNnames.add(ClientUtils.escapeQueryChars(alia)); + + arroundkey = alia + "_" + d.getRegion() + "_" + d.getCity(); + if (!arroundKeys.contains(arroundkey)) { + arroundKeys.add(arroundkey); + } + } + } } } + List nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat); + + for (SampleWrapper sample : nearlySample) { + sample.setProperty(district); + } + sortForSample(nearlySample, target); + querySamples.addAll(nearlySample); +// if (querySamples.size() > max) { +// break; +// } } if (querySamples.isEmpty()) { SampleWrapper standardSample = createStandardSample(queryBean); @@ -934,54 +979,34 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { /** * 江南行查找小区样本(优先使用贝壳链家) * - * @param city - * @param region - * @param name - * @param alias * @param estateType 用户查询物业类型 * @param startDate - * @param distEstateType 小区物业类型 * @return */ - private List findJnbankSampleByDistrict(String city, String region, String name, List alias, String masterName, String distEstateType, String estateType, Date startDate, DistrictStat districtStat) { + private List findJnbankSampleByDistrict(District district, List keys, List names, String estateType, Date startDate, DistrictStat districtStat) { - List names = new ArrayList(); - names.add(ClientUtils.escapeQueryChars(name)); - if (alias != null) { - for (String alia : alias) { - if (StringUtils.isNotBlank(alia) && alia.length() >= 2 && !names.contains(alia)) { - names.add(ClientUtils.escapeQueryChars(alia)); - } + + BooleanQuery nameQuery = new BooleanQuery(); + int c = 0; + for (String namekey : keys) { + if (StringUtils.isNotBlank(namekey)) { + namekey = ClientUtils.escapeQueryChars(namekey); + c++; + nameQuery.add(new TermQuery(new Term("districtname_key", namekey)), BooleanClause.Occur.SHOULD); } } - if (StringUtils.isNotBlank(masterName)) { - names.add(ClientUtils.escapeQueryChars(masterName)); - } List samples = new ArrayList(); List nolianjiaSamples = new ArrayList(); List houseQuery = new ArrayList(); - houseQuery.add(new QueryParam("city", city)); - houseQuery.add(new QueryParam("region", region)); + houseQuery.add(new QueryParam("city", district.getCity())); + houseQuery.add(new QueryParam("region", district.getRegion())); if (districtStat != null && districtStat.getAvgPrice() > 0) { int avgPrice = districtStat.getAvgPrice(); houseQuery.add(new QueryParam("avgPrice", QueryParam.GREATER_THAN_EQUAL_OPERATOR, (int) (avgPrice * 0.5)));//0.85 houseQuery.add(new QueryParam("avgPrice", QueryParam.LESS_THAN_EQUAL_OPERATOR, (int) (avgPrice * 1.5)));//1.15 } - BooleanQuery nameQuery = new BooleanQuery(); - int c = 0; - for (String n : names) { - if (StringUtils.isNotBlank(name)) { - if (name.indexOf("(") > -1 || name.indexOf(")") > -1 || name.indexOf("(") > -1 || name.indexOf(")") > -1 - | name.indexOf("[") > -1 || name.indexOf("]") > -1 || name.indexOf("-") > -1 || name.indexOf("{") > -1 - || name.indexOf("}") > -1 || name.indexOf("{") > -1 || name.indexOf("}") > -1 || name.indexOf(":") > -1 || name.indexOf("\\") > -1) { - continue; - } - c++; - nameQuery.add(new TermQuery(new Term("district_name", n)), BooleanClause.Occur.SHOULD); - } - } if (nameQuery.clauses().size() == 0) { return samples; @@ -995,7 +1020,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { List houseSortParams = new ArrayList(); houseSortParams.add(new SortParam("publishDate", false)); - List houses = houseDao.findAllByParams(houseQuery, houseSortParams, 0, 500, HOUSE_FIELDS); + List houses = houseDao.findAllByParams(houseQuery, houseSortParams, 0, 200, HOUSE_FIELDS); int height = 0; int maxFloor = 0; boolean allSampleHasHeight = true; @@ -1043,15 +1068,27 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { sample.setBuildingName(house.getDistrictName() + "(商住)"); } } else { - if (StringUtils.isNotBlank(distEstateType) && (distEstateType.contains("商住") && (!name.contains("商住") || !name.contains("商业")))) { + if (StringUtils.isNotBlank(district.getEstateType2()) && (district.getEstateType2().contains("商住") && (!district.getName().contains("商住") || !district.getName().contains("商业")))) { sample.setBuildingName(house.getDistrictName() + "(商住)"); } } - } + +// List names = new ArrayList(); +// names.add(ClientUtils.escapeQueryChars(name)); +// if (alias != null) { +// for (String alia : alias) { +// if (StringUtils.isNotBlank(alia) && alia.length() >= 2 && !names.contains(alia)) { +// names.add(ClientUtils.escapeQueryChars(alia)); +// } +// } +// } +// if (StringUtils.isNotBlank(masterName)) { +// names.add(ClientUtils.escapeQueryChars(masterName)); +// } List dealPriceQuery = new ArrayList(); - dealPriceQuery.add(new QueryParam("city", city)); - dealPriceQuery.add(new QueryParam("region", region)); + dealPriceQuery.add(new QueryParam("city", district.getCity())); + dealPriceQuery.add(new QueryParam("region", district.getRegion())); dealPriceQuery.add(new QueryParam("districtName", QueryParam.IN_OPERATOR, names)); if (startDate != null) { dealPriceQuery.add(new QueryParam("tradeDate", QueryParam.GREATER_THAN_OPERATOR, startDate)); @@ -1077,7 +1114,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { } if (!allSampleHasHeight) { if (height == 0) {//如果没有楼高到楼栋库里寻找最高的楼高 - height = findHeight(city, region, name); + height = findHeight(district.getCity(), district.getRegion(), district.getName()); } if (height == 0) {//如果楼栋库没有使用房源中的最大楼层 height = maxFloor; @@ -1091,7 +1128,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { } } - FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertFangjiaToOfficial(city, region); + FangjiaOfficialAreaMap fangjiaOfficialAreaMap = fangjiaOfficialAreaService.convertFangjiaToOfficial(district.getCity(), district.getRegion()); if (samples.size() < 10) { samples.addAll(nolianjiaSamples); @@ -1114,8 +1151,6 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { sample.setDistrict(fangjiaOfficialAreaMap.getDistrictCode()); } } - - return samples; }