江南行房源接口优化第三版
This commit is contained in:
+23
-22
@@ -204,40 +204,41 @@ 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>();
|
||||
// List<SampleWrapper> 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<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);
|
||||
List<SampleWrapper> 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<District> districts = districtService.findNearestDistrict(district, 1000, 5);
|
||||
|
||||
+3
@@ -522,8 +522,11 @@ public interface DistrictService extends ModeService<DistrictKey, DistrictBo> {
|
||||
public District findOneByKey(DistrictKey districtKey, String cat);
|
||||
|
||||
List<District> findNearestDistrict(District district, int radiusMeters, int limit);
|
||||
|
||||
List<District> doFindNearestHasHouseDistrict(District district, int radiusMeters, int limit) ;
|
||||
|
||||
District findDistrictHasHouseFlag(District district);
|
||||
|
||||
List<District> findNearestDistrict(District district, int radiusMeters, String[] fields, int limit);
|
||||
|
||||
List<District> findNearestDistrict(String city, Double lng, Double lat, int radiusMeters, int limit);
|
||||
|
||||
+12
@@ -2495,6 +2495,18 @@ public class DistrictServiceImpl implements DistrictService {
|
||||
return new ArrayList<District>(ret);
|
||||
}
|
||||
|
||||
@Override
|
||||
public District findDistrictHasHouseFlag(District district) {
|
||||
List<QueryParam> params = new ArrayList<QueryParam>();
|
||||
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<District> doFindNearestDistrict(District district, int radiusMeters, String[] fields, int limit) {
|
||||
if (district == null || district.getLat() == null || district.getLng() == null || district.getLat() <= 0
|
||||
|
||||
Reference in New Issue
Block a user