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 a54807ac..bcfcd210 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 @@ -116,6 +116,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.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()+"*")) .should(QueryBuilders.wildcardQuery("standNatureName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -160,7 +163,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .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()+"*")); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -247,7 +253,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*" +searchInfoEO.getSelectValue().toUpperCase()+ "*").boost(1002f)) .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)); + .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)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -262,7 +271,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*" +searchInfoEO.getSelectValue().toUpperCase()+ "*").boost(1002f)) .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)); + .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)); break; default: break; } @@ -409,7 +421,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .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)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -431,7 +446,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .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)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -1463,8 +1481,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + "sortTitle","numberTitle","yearOrder","nameTitle","title","titleBig","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("titleBig",1000f).field("textContent",100f).field("issue_time",10f); boolQueryBuilder.must(multiQueryBuilder); } //在结果中检索 @@ -1615,7 +1633,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f)) .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("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)); // 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); @@ -1961,16 +1980,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { if (null != value && select == null) { QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); queryBuilder1 = QueryBuilders.multiMatchQuery(value, - "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + "sortTitle","numberTitle","yearOrder","nameTitle","title","titleBig","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("titleBig",1000f).field("textContent",100f).field("issue_time",10f); boolQueryShould.must(queryBuilder1); } // searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); if (null != select) { QueryBuilder queryBuilder2 = QueryBuilders.multiMatchQuery(""); queryBuilder2 = QueryBuilders.multiMatchQuery(real, - "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + "sortTitle","numberTitle","yearOrder","nameTitle","title","titleBig","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("titleBig",1000f).field("textContent",100f).field("issue_time",10f); boolQueryShould.must(queryBuilder2); // for (String se : selects) { // if (StringUtils.isNotBlank(se)) { 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 5806c642..3ccd1ab0 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 @@ -164,6 +164,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { boolean isForeign = false; Map fullTextSearchEO = new HashMap<>(); + fullTextSearchEO.put("titleBig",attrInfoMap.get("sortTitle")); Map mapItems = new TreeMap<>(); if(attrInfoMap.get("mapItems") != null){ mapItems = net.sf.json.JSONObject.fromObject(attrInfoMap.get("mapItems").toString()); @@ -463,6 +464,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { logger.info("err:" + errFilter(e.getMessage())); } } + String title = String.valueOf(fullTextSearchEO.getOrDefault("title","")); + fullTextSearchEO.put("titleBig",title.toUpperCase()); return fullTextSearchEO; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 3df6114e..c3321cf7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -227,6 +227,10 @@ public class SendBussMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + String numberShow = String.valueOf(saveMap.get("numbershow")); + if (!"null".equals(numberShow) && StringUtils.isNotBlank(numberShow)) { + saveMap.put("titleBig", numberShow.toUpperCase()); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java index 948feed8..18937562 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java @@ -275,6 +275,10 @@ public class SendLawsMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + String numberShow = String.valueOf(saveMap.get("numbershow")); + if (!"null".equals(numberShow) && StringUtils.isNotBlank(numberShow)) { + saveMap.put("titleBig", numberShow.toUpperCase()); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index ff10623f..80f7c1ec 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -262,6 +262,18 @@ public class SendStandMQService { // if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { // saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); // } + String numberShow = String.valueOf(saveMap.get("numbershow")); + if (!"null".equals(numberShow) && StringUtils.isNotBlank(numberShow)) { + saveMap.put("numberShowBig", numberShow.toUpperCase()); + } + String nameshow = String.valueOf(saveMap.get("nameshow")); + if (!"null".equals(nameshow) && StringUtils.isNotBlank(nameshow)) { + saveMap.put("nameshowBig", nameshow.toUpperCase()); + } + String standEnName = String.valueOf(saveMap.get("standEnName")); + if (!"null".equals(standEnName) && StringUtils.isNotBlank(standEnName)) { + saveMap.put("standEnNameBig", standEnName.toUpperCase()); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else {