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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!82
This commit is contained in:
高嵩
2023-05-18 18:39:44 +08:00
parent 93d2f3cbff 14dbf79dc4
commit afbd075cd7
16 changed files with 380 additions and 56 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
+14 -2
View File
@@ -227,6 +227,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
String sortField1 = "";
String sortField2 = "";
String sortField3 = "";
String sortField4 = "";
String sortField5 = "";
if("laws".equals(searchInfoEO.getSelectIndex())){
sortField1 = "lawsNumber";
sortField2 = "lawsYear";
@@ -235,6 +237,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
sortField1 = "standNumber";
sortField2 = "standYear";
sortField3 = "standSort.keyword";
// sortField4 = "NYLXCLASS.keyword";
// sortField5 = "CLLX.keyword";
}
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
@@ -244,6 +248,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
.addSort(sortField1, SortOrder.ASC)
.addSort(sortField2, SortOrder.DESC)
.addSort(sortField3, SortOrder.ASC)
// .addSort(sortField4, SortOrder.ASC)
// .addSort(sortField5, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize());
@@ -385,6 +391,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
String sortField1 = "";
String sortField2 = "";
String sortField3 = "";
String sortField4 = "";
String sortField5 = "";
if("laws".equals(searchInfoEO.getSelectIndex())){
sortField1 = "lawsNumber";
sortField2 = "lawsYear";
@@ -393,6 +401,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
sortField1 = "standNumber";
sortField2 = "standYear";
sortField3 = "standSort.keyword";
// sortField4 = "NYLXCLASS.keyword";
// sortField5 = "CLLX.keyword";
}
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
@@ -402,6 +412,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
.addSort(sortField1, SortOrder.ASC)
.addSort(sortField2, SortOrder.DESC)
.addSort(sortField3, SortOrder.ASC)
// .addSort(sortField4, SortOrder.ASC)
// .addSort(sortField5, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize());
@@ -1650,8 +1662,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
.should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f))
.should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f))
.should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f))
.should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
.should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
.should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
.should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
// 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);