From b1079ab9a40ecf476a114f0c655fc02763e9c875 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 18 May 2023 10:27:02 +0800 Subject: [PATCH] =?UTF-8?q?es=E6=A0=B9=E6=8D=AE=E8=83=BD=E6=BA=90=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E9=80=82=E7=94=A8=E8=BD=A6=E8=BE=86=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E6=9D=A1=E4=BB=B6=E6=90=9C=E7=B4=A2=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 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 93fb2b23..6a4af3f0 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 @@ -125,7 +125,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .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()+"*")) @@ -166,7 +168,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .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("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) + .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(); @@ -256,7 +260,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)) .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("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .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()+"*")) @@ -274,7 +280,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)) .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("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; default: break; } @@ -424,7 +432,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .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("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .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()+"*")) @@ -449,7 +459,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .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("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .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(); @@ -1637,7 +1649,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f)) .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f)) .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)); + .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "sortTitle","numberTitle","yearOrder","nameTitle","title" // ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f);