优化小区搜索接口
This commit is contained in:
+56
-31
@@ -4114,20 +4114,6 @@ public class PropertyController {
|
||||
}
|
||||
params.add(new QueryParam("category", "district"));
|
||||
params.add(new QueryParam("visible", 0));
|
||||
// BooleanQuery srQuery1 = new BooleanQuery();
|
||||
// BooleanQuery nameQuery = new BooleanQuery();
|
||||
// nameQuery.add(new TermQuery(new Term("district_name", model.getKeyword())),
|
||||
// BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new PrefixQuery(new Term("name",
|
||||
// QueryParser.escape(model.getKeyword()).toLowerCase())),
|
||||
// BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("alias_std", model.getKeyword())),
|
||||
// BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("address", model.getKeyword())),
|
||||
// BooleanClause.Occur.SHOULD);
|
||||
// nameQuery.add(new TermQuery(new Term("addr_alias_std", model.getKeyword())),
|
||||
// BooleanClause.Occur.SHOULD);
|
||||
|
||||
if (StringUtils.isNotBlank(model.getKeyword())) {
|
||||
BooleanQuery query = new BooleanQuery();
|
||||
if (model.getUseOrQuery()) {
|
||||
@@ -4148,24 +4134,7 @@ public class PropertyController {
|
||||
q1.setBoost(0.99f);
|
||||
query.add(q1, BooleanClause.Occur.SHOULD);
|
||||
}
|
||||
|
||||
/*
|
||||
* Query q2 = new TermQuery(new Term("keyword_cjk",
|
||||
* QueryParser.escape(model.getKeyword()).toLowerCase())); q2.setBoost(0.01f);
|
||||
* query.add(q2, BooleanClause.Occur.SHOULD);
|
||||
*/
|
||||
|
||||
/*
|
||||
* String districtName = tokenDistrictName(model.getKeyword());
|
||||
* if(StringUtils.isNotBlank(districtName)){ Query q3 = new TermQuery(new
|
||||
* Term("keyword_cjk", districtName)); q3.setBoost(0.99f); query.add(q3,
|
||||
* BooleanClause.Occur.SHOULD); }
|
||||
*/
|
||||
// Query query =
|
||||
// boostQueryDistrictNewPolicy.create(ServiceUtil.removeAndGetKeyword(params));
|
||||
params.add(new QueryParam("$sr", new SrQuery(query)));
|
||||
// params.add(new QueryParam("keyword",
|
||||
// QueryParser.escape(model.getKeyword()).toLowerCase()));
|
||||
|
||||
}
|
||||
List<District> districts = districtService.findAllByParams(params, 0, model.getMax(), new String[]{"city",
|
||||
@@ -4209,6 +4178,62 @@ public class PropertyController {
|
||||
result.add(item);
|
||||
}
|
||||
}
|
||||
if(result.isEmpty()){
|
||||
List<QueryParam> params = new ArrayList<QueryParam>();
|
||||
if (!"全国".equals(model.getCity())) {
|
||||
params.add(new QueryParam("city", model.getCity()));
|
||||
}
|
||||
if (StringUtils.isNotBlank(model.getDistrict())) {
|
||||
params.add(new QueryParam("region", model.getDistrict()));
|
||||
}
|
||||
params.add(new QueryParam("category", "district"));
|
||||
params.add(new QueryParam("visible", 0));
|
||||
if (StringUtils.isNotBlank(model.getKeyword())) {
|
||||
BooleanQuery query = new BooleanQuery();
|
||||
if (model.getUseOrQuery()) {
|
||||
params.add(new QueryParam("$fangjiawang_query_type", "or"));
|
||||
}
|
||||
// 2017-11-02新增, 指定查询字段,以:分割为多个字段查询,处理pds搜索问题,不指定默认用keyword查询
|
||||
String queryFields = model.getQueryField();
|
||||
if (StringUtils.isNotBlank(queryFields) && queryFields.contains(":")) {
|
||||
String[] fs = queryFields.split(":");
|
||||
for (String f : fs) {
|
||||
Query q1 = new TermQuery(new Term(f, QueryParser.escape(model.getKeyword()).toLowerCase()));
|
||||
q1.setBoost(0.99f);
|
||||
query.add(q1, BooleanClause.Occur.SHOULD);
|
||||
}
|
||||
} else {
|
||||
Query q1 = new TermQuery(
|
||||
new Term(model.getQueryField(), QueryParser.escape(model.getKeyword()).toLowerCase()));
|
||||
q1.setBoost(0.99f);
|
||||
query.add(q1, BooleanClause.Occur.SHOULD);
|
||||
}
|
||||
params.add(new QueryParam("$sr", new SrQuery(query)));
|
||||
|
||||
}
|
||||
List<District> districts = districtService.findAllByParams(params, 0, model.getMax(), new String[]{"city",
|
||||
"region", "name", "alias", "address", "addrAlias", "lat2", "lng2", "householdCount"});
|
||||
|
||||
if (districts != null) {
|
||||
for (District district : districts) {
|
||||
BasicDBObject item = new BasicDBObject();
|
||||
item.append("city", district.getCity());
|
||||
item.append("district", district.getRegion());
|
||||
item.append("name", district.getName());
|
||||
item.append("address", district.getAddress());
|
||||
item.append("latBaidu", district.getLat2());
|
||||
item.append("lngBaidu", district.getLng2());
|
||||
item.append("houseHoldCount", district.getHouseholdCount());
|
||||
if (district.getAlias() != null && district.getAlias().size() > 0) {
|
||||
item.append("alias", district.getAlias());
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(district.getAddrAlias())) {
|
||||
item.append("address_alias", district.getAddrAlias());
|
||||
}
|
||||
result.add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(result));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user