Merge branch 'open_v2' into 'master'

江南行房源修改

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