From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
index e85f759..7ed3c3b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
@@ -85,7 +85,7 @@
boolQueryBuilder.should(QueryBuilders.matchQuery("by4",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("by6",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("by7",con));
- boolQueryBuilder.filter(QueryBuilders.termsQuery("fid", idList));
+
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder()
.withQuery(boolQueryBuilder);
@@ -100,7 +100,9 @@
});
// articleList.forEach(a-> System.out.println(a))
- return esm;
+ return esm.stream().filter(esModel -> {
+ return idList.contains(esModel.getFid());
+ }).collect(Collectors.toList());
}
@@ -119,7 +121,11 @@
.withQuery(boolQueryBuilder);
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
- return Objects.requireNonNull(elasticsearchRestTemplate.searchOne(nativeSearchQuery, EsModel.class)).getContent();
+ SearchHit<EsModel> esModelSearchHit = elasticsearchRestTemplate.searchOne(nativeSearchQuery, EsModel.class);
+ if(esModelSearchHit != null){
+ return esModelSearchHit.getContent();
+ }
+ return null;
}
--
Gitblit v1.9.1