From 1e7807f99d489df8d9491c23f43a988e478c78bd Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Wed, 23 Apr 2025 15:44:38 +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 --- .../weixin/DistrictController.java | 34 ++++++------------- .../index/DistrictTriggerServiceImpl.java | 2 +- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java index 17ab2c4b2..e2b80dddd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java @@ -1,10 +1,12 @@ package com.fangjia.open.controllers.weixin; -import com.fangjia.core.util.*; +import com.fangjia.core.util.CacheUtils; import com.fangjia.core.util.CacheUtils.CachePolicyEnum; +import com.fangjia.core.util.DataUtil; +import com.fangjia.core.util.DateUtil; +import com.fangjia.core.util.GeocodeUtils; import com.fangjia.dal.QueryParam; import com.fangjia.dal.SdQuery; -import com.fangjia.dal.SrQuery; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.model.SeaweedImages; import com.fangjia.dal.seaweed.model.District; @@ -12,7 +14,6 @@ import com.fangjia.dal.sql.model.FjtUsers; import com.fangjia.open.compatible.model.JsonModel; import com.fangjia.open.model.weixin.DistrictModel; import com.fangjia.open.model.weixin.DistrictSearchModel; -import com.fangjia.open.util.BHBankUtils; import com.fangjia.service.api.AutoCompleteBo; import com.fangjia.service.bo.DistrictStatBo; import com.fangjia.service.bo.DistrictStatRentBo; @@ -24,21 +25,16 @@ import com.fangjia.service.sql.FjtUsersService; import com.fangjia.service.sql.UserCityService; import com.fangjia.service.user.UsersInfoService; import com.fangjia.service.util.CookieUtils; -import com.google.common.collect.Lists; - -import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.BooleanClause; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.TermQuery; import org.sothis.web.mvc.annotation.Param; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; public class DistrictController { @@ -114,17 +110,7 @@ public class DistrictController { params.add(new QueryParam("city", city)); params.add(new QueryParam("category", cat)); params.add(new QueryParam("visible", 0)); - - - BooleanQuery srQuery1 = new BooleanQuery(); - BooleanQuery nameQuery = new BooleanQuery(); - // nameQuery.add(new TermQuery(new Term("district_name", keyword)), BooleanClause.Occur.SHOULD); - // nameQuery.add(new TermQuery(new Term("alias_std", keyword)), BooleanClause.Occur.SHOULD); - // nameQuery.add(new TermQuery(new Term("address", keyword)), BooleanClause.Occur.SHOULD); - // nameQuery.add(new TermQuery(new Term("addr_alias_std", keyword)), BooleanClause.Occur.SHOULD); - nameQuery.add(new TermQuery(new Term("keyword", keyword)), BooleanClause.Occur.SHOULD); - //nameQuery.add(new TermQuery(new Term("keyword_cjk", keyword)), BooleanClause.Occur.SHOULD);//这个重要,因seaweed不支持模糊搜索,当输入"中远两"需用此进行搜索 - srQuery1.add(nameQuery, BooleanClause.Occur.SHOULD); + params.add(new QueryParam("$srByStr", String.format("keyword:%s^6.0 OR keyword_cjk:%s", keyword, keyword))); if (lat != null && lng != null && lat != 0 && lng != 0) { Map geo = GeocodeUtils.geoconvBaiduToGoogle(lng, lat); SdQuery sdQuery = new SdQuery(); @@ -133,7 +119,7 @@ public class DistrictController { sdQuery.setDistance("500"); params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); } - params.add(new QueryParam("$sr", new SrQuery(srQuery1))); + List districts = districtService.findAllByParams(params, 0, limit, new String[]{"region", "name", "address", "addrAlias", "id", "alias"}); List ret = new ArrayList(districts.size()); for (District district : districts) { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java index 9abc4273b..c2e754a0e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java @@ -183,7 +183,7 @@ public class DistrictTriggerServiceImpl implements TriggerService { (String)object.get("address"), (List)newObj.get("alias"), (List)newObj.get("addr_alias"), - addressNum, block + addressNum, null ) );