From a269eb09bd305e910961172c6d84e95ed0fcebdd Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sun, 21 Sep 2025 14:29:04 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9APC=E5=8F=8AAPP=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E5=85=88=E6=8C=89=E7=85=A7storeWeight=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=90=8E=E5=86=8D=E6=8C=89=E7=85=A7=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E7=AD=9B=E9=80=89=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java | 9 ++++++--- .../com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java index 62eeb2fea..5ff6a5d93 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import co.elastic.clients.elasticsearch._types.FieldValue; +import co.elastic.clients.elasticsearch._types.SortOptions; import co.elastic.clients.elasticsearch._types.SortOrder; import co.elastic.clients.elasticsearch._types.query_dsl.*; import co.elastic.clients.elasticsearch.core.SearchResponse; @@ -1017,7 +1018,7 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { if (StringUtils.isNotBlank(searchDTO.getSearch())) { MultiMatchQuery multiMatchQuery = MultiMatchQuery.of(m -> m .query(searchDTO.getSearch()) - .fields( "prodArtNum", "storeName", "prodCateName", "parCateName") + .fields("prodArtNum", "storeName", "prodCateName", "parCateName") ); boolQuery.must(multiMatchQuery._toQuery()); } @@ -1095,8 +1096,10 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { .query(query) .from((searchDTO.getPageNum() - 1) * searchDTO.getPageSize()) .size(searchDTO.getPageSize()) - .sort(sort -> sort.field(f -> f.field("storeWeight").order(SortOrder.Desc))) - .sort(sort -> sort.field(f -> f.field(searchDTO.getSort()).order(searchDTO.getOrder()))), + .sort(Arrays.asList( + SortOptions.of(so -> so.field(f -> f.field("storeWeight").order(SortOrder.Desc))), + SortOptions.of(so -> so.field(f -> f.field(searchDTO.getSort()).order(searchDTO.getOrder()))) + )), ESProductDTO.class); final long total = resList.hits().total().value(); final List esProdList = resList.hits().hits().stream().map(x -> x.source().setStoreProdId(x.id())).collect(Collectors.toList()); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java index ff93cb0dd..38077da26 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import co.elastic.clients.elasticsearch._types.FieldValue; +import co.elastic.clients.elasticsearch._types.SortOptions; import co.elastic.clients.elasticsearch._types.SortOrder; import co.elastic.clients.elasticsearch._types.query_dsl.*; import co.elastic.clients.elasticsearch.core.SearchResponse; @@ -1933,8 +1934,10 @@ public class WebsitePCServiceImpl implements IWebsitePCService { .query(query) .from((searchDTO.getPageNum() - 1) * searchDTO.getPageSize()) .size(searchDTO.getPageSize()) - .sort(sort -> sort.field(f -> f.field("storeWeight").order(SortOrder.Desc))) - .sort(sort -> sort.field(f -> f.field(searchDTO.getSort()).order(searchDTO.getOrder()))), + .sort(Arrays.asList( + SortOptions.of(so -> so.field(f -> f.field("storeWeight").order(SortOrder.Desc))), + SortOptions.of(so -> so.field(f -> f.field(searchDTO.getSort()).order(searchDTO.getOrder()))) + )), ESProductDTO.class); final long total = resList.hits().total().value(); final List esProdList = resList.hits().hits().stream().map(x -> x.source().setStoreProdId(x.id())).collect(Collectors.toList());