提交 b80bcd3d 作者: 925993793@qq.com

【fix】资讯列表默认过滤掉内容字段

上级 abd27dd9
...@@ -607,6 +607,13 @@ public class EsService { ...@@ -607,6 +607,13 @@ public class EsService {
public IPage<EventDataVO> collectPageList(InfoDataSearchCondition eventDataCondition) { public IPage<EventDataVO> collectPageList(InfoDataSearchCondition eventDataCondition) {
SearchRequest searchRequest = new SearchRequest(Constants.COLLECT_INDEX); SearchRequest searchRequest = new SearchRequest(Constants.COLLECT_INDEX);
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
String[] fetchFields = eventDataCondition.getFetchFields();
String[] excludeFields = eventDataCondition.getExcludeFields();
if (fetchFields != null && fetchFields.length > 0) {
searchSourceBuilder.fetchSource(fetchFields, null);
} else if (excludeFields != null && excludeFields.length > 0){
searchSourceBuilder.fetchSource(null, excludeFields);
}
//设置分页参数 //设置分页参数
Integer pageNo = eventDataCondition.getPageNo(); Integer pageNo = eventDataCondition.getPageNo();
Integer pageSize = eventDataCondition.getPageSize(); Integer pageSize = eventDataCondition.getPageSize();
...@@ -731,6 +738,15 @@ public class EsService { ...@@ -731,6 +738,15 @@ public class EsService {
public IPage<SpecialInformation> pageListByCondition(InfoDataSearchCondition searchCondition, List<String> subjectIdList) throws IOException { public IPage<SpecialInformation> pageListByCondition(InfoDataSearchCondition searchCondition, List<String> subjectIdList) throws IOException {
SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX); SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
//默认最大数量是10000,设置为true后,显示准确数量
searchSourceBuilder.trackTotalHits(true);
String[] fetchFields = searchCondition.getFetchFields();
String[] excludeFields = searchCondition.getExcludeFields();
if (fetchFields != null && fetchFields.length > 0) {
searchSourceBuilder.fetchSource(fetchFields, null);
} else if (excludeFields != null && excludeFields.length > 0){
searchSourceBuilder.fetchSource(null, excludeFields);
}
//设置分页参数 //设置分页参数
Integer pageNo = searchCondition.getPageNo(); Integer pageNo = searchCondition.getPageNo();
Integer pageSize = searchCondition.getPageSize(); Integer pageSize = searchCondition.getPageSize();
...@@ -765,12 +781,6 @@ public class EsService { ...@@ -765,12 +781,6 @@ public class EsService {
searchSourceBuilder.sort("publishDate", SortOrder.DESC); searchSourceBuilder.sort("publishDate", SortOrder.DESC);
break; break;
} }
//默认最大数量是10000,设置为true后,显示准确数量
searchSourceBuilder.trackTotalHits(true);
String[] fetchFields = searchCondition.getFetchFields();
if (fetchFields != null && fetchFields.length > 0) {
searchSourceBuilder.fetchSource(fetchFields, null);
}
//构建es查询条件 //构建es查询条件
BoolQueryBuilder boolQuery = buildQuery(searchCondition, subjectIdList); BoolQueryBuilder boolQuery = buildQuery(searchCondition, subjectIdList);
searchSourceBuilder.query(boolQuery); searchSourceBuilder.query(boolQuery);
......
...@@ -113,6 +113,8 @@ public class InfoDataSearchCondition { ...@@ -113,6 +113,8 @@ public class InfoDataSearchCondition {
//es查询字段数组 //es查询字段数组
private String[] fetchFields; private String[] fetchFields;
//排除字段数组
private String[] excludeFields = new String[]{"content", "contentWithTag"};
//排序参数 //排序参数
//排序字段 //排序字段
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论