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详情接口 文本分词高亮显示全部内容

See merge request LiuChao/foton-slrs-system-rest!532
This commit is contained in:
super_liu
2022-06-17 16:51:47 +08:00
parent 7a037a96bf 5c1234d076
commit 9f52d69c13
2 changed files with 11 additions and 12 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
+8 -9
View File
@@ -215,17 +215,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
updateIndex(searchInfoEO.getSelectIndex()); updateIndex(searchInfoEO.getSelectIndex());
// 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 +232,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("numberTitle", SortOrder.ASC) .addSort(sortField1, SortOrder.ASC)
.addSort("yearOrder", SortOrder.DESC) .addSort(sortField2, 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());
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+3 -3
View File
@@ -274,7 +274,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
fullTextSearchEO.put("standTypeOrder","1"); fullTextSearchEO.put("standTypeOrder","1");
} }
fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap));
fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("standYear"))) && !"null".equals(String.valueOf(attrInfoMap.get("standYear")))) ? String.valueOf(attrInfoMap.get("standYear")) : "0"); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName")));
@@ -361,7 +361,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("textContent",textContent.toString());
fullTextSearchEO.put("standTypeOrder","4"); fullTextSearchEO.put("standTypeOrder","4");
fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap)); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap));
fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("lawsYearName"))) && "null".equals(String.valueOf(attrInfoMap.get("lawsYearName")))) ? String.valueOf(attrInfoMap.get("lawsYearName")) : "0"); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName")));
fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName"))); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName")));
fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber")));
fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName")));
@@ -428,7 +428,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("textContent",textContent.toString());
fullTextSearchEO.put("standTypeOrder","3"); fullTextSearchEO.put("standTypeOrder","3");
fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap));
fullTextSearchEO.put("yearOrder", (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("standYear"))) && "null".equals(String.valueOf(attrInfoMap.get("standYear")))) ? String.valueOf(attrInfoMap.get("standYear")) : "0"); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear")));
fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort")));
fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber")));
fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name"))); fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name")));