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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!501
This commit is contained in:
super_liu
2022-05-23 09:27:22 +08:00
parent 81efed01a9 4d82138c54
commit 559f53a8a9
2 changed files with 25 additions and 10 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/ElasticsearchServiceImpl.java
+5 -10
View File
@@ -295,18 +295,13 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
.get();
SearchHits hits = sResponse.getHits();
if(hits.getTotalHits().value > 0){
BoolQueryBuilder boolSelectValue = new BoolQueryBuilder();
QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery("");
if(StringUtils.isNotBlank(search)){
boolSelectValue
.should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + search.toUpperCase() + "*").boost(1005f))
.should(QueryBuilders.wildcardQuery("numberTitle.keyword", "*" + search.toUpperCase() + "*").boost(1003f))
.should(QueryBuilders.wildcardQuery("yearOrder.keyword", "*" + search.toUpperCase() + "*").boost(1002f))
.should(QueryBuilders.wildcardQuery("nameTitle.keyword", "*" + search.toUpperCase() + "*").boost(1001f))
.should(QueryBuilders.wildcardQuery("title.keyword", "*" + search + "*").boost(1000f))
.should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + search.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f))
.should(QueryBuilders.wildcardQuery("issue_time", "*" + search.toUpperCase() + "*"));
queryBuilder1 = QueryBuilders.multiMatchQuery(search,
"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);
}
SearchResponse scrollResp = search(index,boolSelectValue, 1,(int) hits.getTotalHits().value);
SearchResponse scrollResp = search(index,queryBuilder1, 1,(int) hits.getTotalHits().value);
for (SearchHit hit : scrollResp.getHits().getHits()) {
sourceList.add(hit.getSourceAsMap());
}
doc/es/es 创建索引字段_fulltextserch.txt
+20
View File
@@ -85,6 +85,26 @@ fulltextserch/fulltextserch/_mapping?pretty&include_type_name=true
},
"fielddata": true
},
"standSortOrder": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"fielddata": true
},
"standTypeOrder": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"fielddata": true
},
"textContent": {
"type": "text",
"analyzer": "ik_max_word",