From 29abf64e7a63bc9cf2c4d32788196daf92472ca5 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Mon, 14 Jul 2025 17:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E5=8C=BA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 87 ++++++++++++------- 1 file changed, 56 insertions(+), 31 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 0d2b2f2ff..cc939838a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -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 districts = districtService.findAllByParams(params, 0, model.getMax(), new String[]{"city", @@ -4209,6 +4178,62 @@ public class PropertyController { result.add(item); } } + if(result.isEmpty()){ + List params = new ArrayList(); + 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 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)); }