FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master

Browse Source
This commit is contained in:
zhangyanduan
2022-09-29 17:14:05 +08:00
parent 822437e364 d105dce3a5
commit 83cbe979bb
8 changed files with 103 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+6 -4
View File
@@ -1495,14 +1495,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){
if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
"textContent"
).minimumShouldMatch("100%").field("title",10f));
"NYLXName"
).minimumShouldMatch("100%"));
// .field("title",10f));
}
if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){
queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
"textContent"
).minimumShouldMatch("100%").field("title",10f));
"CLLXName"
).minimumShouldMatch("100%"));
// .field("title",10f));
}
boolQueryBuilder.must(queryBuilder);
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+4
View File
@@ -466,6 +466,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
}
String title = String.valueOf(fullTextSearchEO.getOrDefault("title",""));
fullTextSearchEO.put("titleBig",title.toUpperCase());
fullTextSearchEO.put("CLLXName",attrInfoMap.get("CLLXName"));
fullTextSearchEO.put("NYLXName",attrInfoMap.get("NYLXName"));
fullTextSearchEO.put("CLLX",attrInfoMap.get("CLLX"));
fullTextSearchEO.put("NYLX",attrInfoMap.get("NYLX"));
return fullTextSearchEO;
}