|
@@ -15,6 +15,7 @@ import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.data.elasticsearch.annotations.Document;
|
|
|
import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
|
|
|
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
|
|
|
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
|
|
|
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
|
|
|
import org.springframework.data.repository.NoRepositoryBean;
|
|
@@ -160,8 +161,10 @@ public interface ToflyEsRepository<T, ID extends Serializable> extends Elasticse
|
|
|
NativeSearchQueryBuilder nativeSearchQueryBuilder =setNativeSearchQueryBuilder(bean,page, DyMonth,elasticsearchTemplate,queryBuilder);
|
|
|
List<T> list = elasticsearchTemplate.queryForList(nativeSearchQueryBuilder.build(), this.getEntityClass());
|
|
|
|
|
|
- page.setRecords(list);
|
|
|
- page.setTotal(list.size());
|
|
|
+ AggregatedPage<T> datas = elasticsearchTemplate.queryForPage(nativeSearchQueryBuilder.build(), this.getEntityClass());
|
|
|
+
|
|
|
+ page.setRecords(datas.getContent());
|
|
|
+ page.setTotal(datas.getTotalElements());
|
|
|
return page;
|
|
|
};
|
|
|
|