From 71ac54b05e84298cb7a05276f5b239895fa00249 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 17 Jun 2022 11:17:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20=E6=B7=BB=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E6=96=87=E7=B4=A2=E5=BC=95=20=E8=8B=B1=E6=96=87=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 6 +++--- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) 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 92e70f27..4d7f3980 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 @@ -1520,11 +1520,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) -// .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) + .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standTypeOrder",SortOrder.ASC) .addSort("standSortOrder",SortOrder.ASC) -// .addSort("numberTitle.keyword",SortOrder.ASC) - .addSort("yearOrder",SortOrder.DESC) + .addSort("numberTitle.keyword",SortOrder.ASC) + .addSort("yearOrder.keyword",SortOrder.DESC) .addSort("sortTitle.keyword",SortOrder.ASC) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .setSize(searchInfoEO.getPageSize()); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index f3d124d5..1fb95f00 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -267,6 +267,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName"))); + fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("standEnName"))); fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("textStatusName","")); @@ -348,6 +349,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName"))); + fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("lawsEnName"))); fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("lawsTextStateName","")); @@ -410,6 +412,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name"))); + fullTextSearchEO.put("nameEnTitle", String.valueOf(attrInfoMap.get("stand_en_name"))); fullTextSearchEO.put("textStatusFull", attrInfoMap.getOrDefault("textStatusBussName","")); if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {