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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
liyawei
2022-11-10 18:24:18 +08:00
parent 5e9e111f49 d51705e3bb
commit 249eef116e
1 changed files with 12 additions and 5 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
+12 -5
View File
@@ -591,9 +591,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
// 关键字查询属性字段 // 关键字查询属性字段
String keyWordField = field + ".keyword"; String keyWordField = field + ".keyword";
String keyWordField2 = field + "Name.keyword"; String keyWordField2 = field + "Name.keyword";
if(field.equals("NYLX")){ // if(field.equals("NYLX")){
field = field+"CLASS"; // field = field+"CLASS";
} // }
if(collectAttrMap.containsKey(field)){ if(collectAttrMap.containsKey(field)){
List<String> fields = new ArrayList<>(); List<String> fields = new ArrayList<>();
Object json= new JSONTokener(collectAttrMap.get(field).toString()).nextValue(); Object json= new JSONTokener(collectAttrMap.get(field).toString()).nextValue();
@@ -1647,6 +1647,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
// "title" // "title"
// ).minimumShouldMatch("100%").field("title",1000f); // ).minimumShouldMatch("100%").field("title",1000f);
// 手机端搜索，不要搜不来企标
if ("2".equals(searchInfoEO.getClientType())) { if ("2".equals(searchInfoEO.getClientType())) {
boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3")); boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3"));
} }
@@ -1658,14 +1659,20 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){ if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){
if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
"NYLXName"
).minimumShouldMatch("100%"));
/* queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
"textContent" "textContent"
).minimumShouldMatch("100%").field("title",1000f)); ).minimumShouldMatch("100%").field("title",1000f));*/
} }
if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){
queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
"CLLXName"
).minimumShouldMatch("100%"));
/* queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
"textContent" "textContent"
).minimumShouldMatch("100%").field("title",1000f)); ).minimumShouldMatch("100%").field("title",1000f));*/
} }
boolQueryBuilder.must(queryBuilder); boolQueryBuilder.must(queryBuilder);