From 5dfb449bee901e2da534737fb35ec43dd1148d83 Mon Sep 17 00:00:00 2001 From: liujq Date: Sat, 18 Jan 2020 16:17:00 +0800 Subject: [PATCH] =?UTF-8?q?es=20=E4=B8=B4=E6=97=B6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=B4=E6=97=B6Id=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/service/DefaultElasticSearchService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/DefaultElasticSearchService.java b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/DefaultElasticSearchService.java index 2cd21fc2..42ad8452 100644 --- a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/DefaultElasticSearchService.java +++ b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/DefaultElasticSearchService.java @@ -116,7 +116,7 @@ public class DefaultElasticSearchService implements ElasticSearchService { FluxUtils.bufferRate(Flux.create(sink -> this.sink = sink), 1000, 2000, Duration.ofSeconds(3)) .flatMap(this::doSave) - .doOnNext((len) ->{ + .doOnNext((len) -> { //System.out.println(len); log.debug("保存ES数据成功:{}", len); }) @@ -184,8 +184,13 @@ public class DefaultElasticSearchService implements ElasticSearchService { } private List translate(Class clazz, SearchResponse response) { + // TODO: 2020/1/18 临时代码 return Arrays.stream(response.getHits().getHits()) - .map(hit -> JSON.toJavaObject(new JSONObject(hit.getSourceAsMap()), clazz)) + .map(hit -> { + Map hitMap = hit.getSourceAsMap(); + hitMap.put("id", hit.getId()); + return JSON.toJavaObject(new JSONObject(hitMap), clazz); + }) .collect(Collectors.toList()); }