优化样本查询接口

This commit is contained in:
2025-07-08 10:26:28 +08:00
parent 3aa2016746
commit c2b2b4920b
@@ -231,41 +231,36 @@ public class CzbankSampleServiceImpl implements CzbankSampleService {
districtStat = districtStatService.findOneDistrictStatsSort(district.getCity(), district.getRegion(), district.getName(), DateUtil.add(new Date(), -7));
}
List<SampleWrapper> querySamples = new ArrayList<SampleWrapper>();
District hasHouseDist = districtService.findDistrictHasHouseFlag(district);//查询是否是有房源的小区
List<String> keys = new ArrayList<String>();
String key = district.getName() + "_" + district.getRegion() + "_" + district.getCity();
// 修改
keys.add(key);
if (hasHouseDist != null) {
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()));
List<String> names = new ArrayList<String>();
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<SampleWrapper> 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<SampleWrapper> 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<District> districts = districtService.findNearestDistrict(district, 1000, 5);