From 5c1234d076fea00cbbcd946a93f1f0e017542c56 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 17 Jun 2022 16:49:00 +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=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2ES=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=20=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=88=86=E8=AF=8D=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 17 ++++++++--------- .../impl/StandLawsSearchServiceImpl.java | 6 +++--- 2 files changed, 11 insertions(+), 12 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 984c15c8..1435b43c 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 @@ -215,17 +215,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); updateIndex(searchInfoEO.getSelectIndex()); -// String sortField = ""; -// String sortField1 = ""; -// String sortField2 = ""; + String sortField1 = ""; + String sortField2 = ""; String sortField3 = ""; if("laws".equals(searchInfoEO.getSelectIndex())){ -// sortField1 = "lawsNumber"; -// sortField2 = "lawsYear"; + sortField1 = "lawsNumber"; + sortField2 = "lawsYear"; sortField3 = "lawsType.keyword"; }else { -// sortField1 = "standNumber"; -// sortField2 = "standYear"; + sortField1 = "standNumber"; + sortField2 = "standYear"; sortField3 = "standSort.keyword"; } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) @@ -233,8 +232,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standSortOrder", SortOrder.ASC) - .addSort("numberTitle", SortOrder.ASC) - .addSort("yearOrder", SortOrder.DESC) + .addSort(sortField1, SortOrder.ASC) + .addSort(sortField2, SortOrder.DESC) .addSort(sortField3, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .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 cbad2678..77620cf7 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 @@ -274,7 +274,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("standTypeOrder","1"); } fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); - fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("standYear"))) && !"null".equals(String.valueOf(attrInfoMap.get("standYear")))) ? String.valueOf(attrInfoMap.get("standYear")) : "0"); + fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName"))); @@ -361,7 +361,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("standTypeOrder","4"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap)); - fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("lawsYearName"))) && "null".equals(String.valueOf(attrInfoMap.get("lawsYearName")))) ? String.valueOf(attrInfoMap.get("lawsYearName")) : "0"); + fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName"))); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName"))); @@ -428,7 +428,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("standTypeOrder","3"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); - fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("standYear"))) && "null".equals(String.valueOf(attrInfoMap.get("standYear")))) ? String.valueOf(attrInfoMap.get("standYear")) : "0"); + fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); 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")));