From 0873fba7df5ec0c70dea70e38e578ab09e4f5ffc Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Tue, 5 Dec 2023 14:21:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=81=9A=E5=90=88=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/elasticsearch/EmptyPage.java | 48 -------------------
 .../serviceimpl/EsGoodsSearchServiceImpl.java |  3 +-
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 framework/src/main/java/cn/lili/elasticsearch/EmptyPage.java

diff --git a/framework/src/main/java/cn/lili/elasticsearch/EmptyPage.java b/framework/src/main/java/cn/lili/elasticsearch/EmptyPage.java
deleted file mode 100644
index 8513354a..00000000
--- a/framework/src/main/java/cn/lili/elasticsearch/EmptyPage.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.lili.elasticsearch;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-public class EmptyPage implements Pageable {
-
-    @Override
-    public int getPageNumber() {
-        return 0;
-    }
-
-    @Override
-    public int getPageSize() {
-        return 0;
-    }
-
-    @Override
-    public long getOffset() {
-        return 0;
-    }
-
-    @Override
-    public Sort getSort() {
-        return null;
-    }
-
-    @Override
-    public Pageable next() {
-        return null;
-    }
-
-    @Override
-    public Pageable previousOrFirst() {
-        return null;
-    }
-
-    @Override
-    public Pageable first() {
-        return null;
-    }
-
-    @Override
-    public boolean hasPrevious() {
-        return false;
-    }
-
-}
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
index e9781017..11ba3c74 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
@@ -7,7 +7,6 @@ import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.PageVO;
-import cn.lili.elasticsearch.EmptyPage;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
@@ -138,8 +137,8 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
         AggregationBuilder sortBuilder = AggregationBuilders.sum("sortAgg").field(ATTR_SORT);
         AggregationBuilder paramsNameBuilder = AggregationBuilders.terms("nameAgg").field(ATTR_NAME).subAggregation(sortBuilder).order(BucketOrder.aggregation("sortAgg", false)).subAggregation(valuesBuilder);
         builder.addAggregation(AggregationBuilders.nested("attrAgg", ATTR_PATH).subAggregation(paramsNameBuilder));
-        builder.withPageable(new EmptyPage());
         NativeSearchQuery searchQuery = builder.build();
+        searchQuery.setMaxResults(0);
         SearchHits<EsGoodsIndex> search = restTemplate.search(searchQuery, EsGoodsIndex.class);
 
         log.debug("getSelector DSL:{}", searchQuery.getQuery());