From e8d9117d90e629e1adf924dec2c9044a0d5587e5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 8 Nov 2022 14:55:29 +0800 Subject: [PATCH] =?UTF-8?q?279-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/search/entity/SeniorSearchInfoEO.java | 1 + .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java index 4dba3f5a..c5aa6213 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java @@ -277,5 +277,6 @@ public class SeniorSearchInfoEO extends BasePage { private String standId; + private String clientType; // 客户端类型：空-web端， 2-手机端 } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index ef43932f..6f2f3e03 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1645,6 +1645,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "title" // ).minimumShouldMatch("100%").field("title",1000f); + + if ("2".equals(searchInfoEO.getClientType())) { + boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3")); + } boolQueryBuilder.must(boolQueryShould); } @@ -1684,9 +1688,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) - .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standTypeOrder",SortOrder.ASC) .addSort("standSortOrder",SortOrder.ASC) + .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("numberTitle",SortOrder.ASC) .addSort("yearOrder.keyword",SortOrder.DESC) .addSort("sortTitle.keyword",SortOrder.ASC)