From 14dbf79dc42a4d10112f9d73b863e854e368d834 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 18 May 2023 18:27:43 +0800 Subject: [PATCH] =?UTF-8?q?es=E4=BC=98=E5=8C=96=E9=80=89=E6=8B=A9=E8=83=BD?= =?UTF-8?q?=E6=BA=90=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=80=82=E7=94=A8=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 36 ++++++++++++------- 1 file changed, 24 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 4820eaf7..4c9a2c9f 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 @@ -126,8 +126,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*")) @@ -169,8 +169,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -227,6 +227,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { String sortField1 = ""; String sortField2 = ""; String sortField3 = ""; + String sortField4 = ""; + String sortField5 = ""; if("laws".equals(searchInfoEO.getSelectIndex())){ sortField1 = "lawsNumber"; sortField2 = "lawsYear"; @@ -235,6 +237,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { sortField1 = "standNumber"; sortField2 = "standYear"; sortField3 = "standSort.keyword"; +// sortField4 = "NYLXCLASS.keyword"; +// sortField5 = "CLLX.keyword"; } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) @@ -244,6 +248,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .addSort(sortField1, SortOrder.ASC) .addSort(sortField2, SortOrder.DESC) .addSort(sortField3, SortOrder.ASC) +// .addSort(sortField4, SortOrder.ASC) +// .addSort(sortField5, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .setSize(searchInfoEO.getPageSize()); @@ -261,8 +267,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -281,8 +287,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; default: break; } @@ -385,6 +391,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { String sortField1 = ""; String sortField2 = ""; String sortField3 = ""; + String sortField4 = ""; + String sortField5 = ""; if("laws".equals(searchInfoEO.getSelectIndex())){ sortField1 = "lawsNumber"; sortField2 = "lawsYear"; @@ -393,6 +401,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { sortField1 = "standNumber"; sortField2 = "standYear"; sortField3 = "standSort.keyword"; +// sortField4 = "NYLXCLASS.keyword"; +// sortField5 = "CLLX.keyword"; } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) @@ -402,6 +412,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .addSort(sortField1, SortOrder.ASC) .addSort(sortField2, SortOrder.DESC) .addSort(sortField3, SortOrder.ASC) +// .addSort(sortField4, SortOrder.ASC) +// .addSort(sortField5, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .setSize(searchInfoEO.getPageSize()); @@ -433,8 +445,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -460,8 +472,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();