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 
feat: There is no way the, 新需求 调整ES 检索规则 更新 es 操作文档

See merge request LiuChao/foton-slrs-system-rest!529
This commit is contained in:
super_liu
2022-06-17 15:55:44 +08:00
parent 56c2d1991f 7f36f4899e
commit c5ca4be11f
1 changed files with 9 additions and 9 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
+9 -9
View File
@@ -215,17 +215,17 @@ public class SearchCenterServiceImpl implements SearchCenterService {
BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
updateIndex(searchInfoEO.getSelectIndex()); updateIndex(searchInfoEO.getSelectIndex());
String sortField = ""; // String sortField = "";
String sortField1 = ""; // String sortField1 = "";
String sortField2 = ""; // String sortField2 = "";
String sortField3 = ""; String sortField3 = "";
if("laws".equals(searchInfoEO.getSelectIndex())){ if("laws".equals(searchInfoEO.getSelectIndex())){
sortField1 = "lawsNumber"; // sortField1 = "lawsNumber";
sortField2 = "lawsYear"; // sortField2 = "lawsYear";
sortField3 = "lawsType.keyword"; sortField3 = "lawsType.keyword";
}else { }else {
sortField1 = "standNumber"; // sortField1 = "standNumber";
sortField2 = "standYear"; // sortField2 = "standYear";
sortField3 = "standSort.keyword"; sortField3 = "standSort.keyword";
} }
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
@@ -233,8 +233,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
.setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
.addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort(new ScoreSortBuilder().order(SortOrder.DESC))
.addSort("standSortOrder", SortOrder.ASC) .addSort("standSortOrder", SortOrder.ASC)
.addSort(sortField1, SortOrder.ASC) .addSort("numberTitle", SortOrder.ASC)
.addSort(sortField2, SortOrder.DESC) .addSort("yearOrder", SortOrder.DESC)
.addSort(sortField3, SortOrder.ASC) .addSort(sortField3, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC) .addSort("issue_time_data", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize()); .setSize(searchInfoEO.getPageSize());