Merge branch 'feature' into 'dev'

恢复舆情数据聚合功能

See merge request !23

src/main/java/com/zhiwei/brandkbs2/service/impl/EventServiceImpl.java

@@ -552,8 +552,7 @@ public class EventServiceImpl implements EventService {
         // 未保证排序
         Map<String, EventListInfoVO> sortMap = eventList.stream().collect(Collectors.toConcurrentMap(Event::getId, EventListInfoVO::new));
         CompletableFuture.allOf(eventList.stream().map(event -> eventDataDao.findFirstDataAsync(event.getId(), event.getCollectionName()).thenApply((r) -> {
-            // 放入首发稿件
-            EventListInfoVO vo = new EventListInfoVO(event);
+            // 设置首发稿件
             sortMap.get(event.getId()).setFirstEventData(r);
             return null;
         })).toArray(CompletableFuture[]::new)).join();

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -63,7 +63,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -603,10 +602,8 @@ public class MarkDataServiceImpl implements MarkDataService {
     private Pair<SearchHits[], Map<String, Long>> searchMarkHitsAndCount(MarkSearchDTO dto, boolean aggree) throws IOException {
         EsClientDao.SearchHelper helper = createSearchHelperByMarkSearchDTO(dto);
         if (aggree) {
-            helper.setSize(0);
-            // TODO 本地调试不滚动查询
-//           List<SearchResponse> searchResponses = esClientDao.searchScrollResponse(helper);
-            List<SearchResponse> searchResponses = Collections.singletonList(esClientDao.searchResponse(helper));
+            List<SearchResponse> searchResponses = esClientDao.searchScrollResponse(helper);
+//          <SearchResponse> searchResponses = Collections.singletonList(esClientDao.searchResponse(helper));
             return Pair.of(searchResponses.stream().map(SearchResponse::getHits).toArray(SearchHits[]::new), null);
         }
         SearchHits searchHits = esClientDao.searchHits(helper);
@@ -917,7 +914,6 @@ public class MarkDataServiceImpl implements MarkDataService {
     private Pair<SearchHits[], Map<String, Long>> searchContendMarkHitsAndCount(MarkSearchDTO dto, boolean aggree) throws IOException {
         EsClientDao.SearchHelper helper = createContendSearchHelper(dto);
         if (aggree) {
-            helper.setSize(0);
             // TODO 本地调试不滚动查询
 //           List<SearchResponse> searchResponses = esClientDao.searchScrollResponse(helper);
             List<SearchResponse> searchResponses = Collections.singletonList(esClientDao.searchResponse(helper));