Merge branch 'feature' into 'release'

舆情分析趋势图修复

See merge request !607

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

@@ -4476,9 +4476,9 @@ public class MarkDataServiceImpl implements MarkDataService {
                 long count = timeBucket.getDocCount();
                 line.add(new LineVO(count, time));
             }
+            List<LineVO> resLine = Tools.completeLine(line, dto.getStartTime(), dto.getEndTime());
             // 由于结束点为开区间，将结束点数据补完
-            if (CollectionUtils.isNotEmpty(line)){
-                line.get(0).setDate(dto.getStartTime());
+            if (CollectionUtils.isNotEmpty(resLine)){
                 MarkSearchDTO searchDTO = Tools.convertMap(dto, MarkSearchDTO.class);
                 searchDTO.setPlatforms(Collections.singletonList(platformId));
                 searchDTO.setStartTime(dto.getEndTime());
@@ -4488,9 +4488,9 @@ public class MarkDataServiceImpl implements MarkDataService {
                     count = esClientDao.count(indexes, yuqingAnalyzeQuery(searchDTO), null);
                 } catch (IOException ignore) {
                 }
-                line.add(new LineVO(count, dto.getEndTime()));
+                resLine.add(new LineVO(count, dto.getEndTime()));
             }
-            res.put(GlobalPojo.getPlatformNameById(platformId), line);
+            res.put(GlobalPojo.getPlatformNameById(platformId), resLine);
         });
         return res;
     }
@@ -4533,14 +4533,14 @@ public class MarkDataServiceImpl implements MarkDataService {
             long count = bucket.getDocCount();
             res.add(new LineVO(count, time));
         });
+        List<LineVO> resLine = Tools.completeLine(res, dto.getStartTime(), dto.getEndTime());
         // 由于结束点为开区间，将结束点数据补完
-        if (CollectionUtils.isNotEmpty(res)){
-            res.get(0).setDate(dto.getStartTime());
+        if (CollectionUtils.isNotEmpty(resLine) && !Objects.equals(resLine.get(resLine.size() - 1).getDate(), dto.getEndTime())){
             MarkSearchDTO secondDTO = Tools.convertMap(dto, MarkSearchDTO.class);
             secondDTO.setStartTime(dto.getEndTime());
             secondDTO.setEndTime(dto.getEndTime() + 1);
             Long count = esClientDao.count(indexes, yuqingAnalyzeQuery(secondDTO, emotion, null), null);
-            res.add(new LineVO(count, dto.getEndTime()));
+            resLine.add(new LineVO(count, dto.getEndTime()));
         }
         // 走势图最高点的聚合标题
         String maxAggTitle = null;
@@ -4552,7 +4552,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             // 没有拿到聚合标题，说明此时发文的平台为微博
             maxAggTitle = CollectionUtils.isEmpty(titleBuckets) ? null : titleBuckets.get(0).getKeyAsString();
         }
-        return Pair.of(maxAggTitle, res);
+        return Pair.of(maxAggTitle, resLine);
     }
 
     private Long getYuqingAnalyzeCount(MarkSearchDTO dto, String emotion) throws IOException {

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

@@ -840,6 +840,8 @@ public class SearchWholeServiceImpl implements SearchWholeService {
         endTime = startIndex == totalSpreadTendency.size() - 1 ? endTime : totalSpreadTendency.get(startIndex + 1).getDate();
         dto.setStartTime(startTime);
         dto.setEndTime(endTime);
+        dto.setPlatforms(null);
+        dto.setVideoPlatforms(null);
         // indexes
         String[] indexes = esClientDao.getAllIndexes(dto.getStartTime(), dto.getEndTime());
         BoolQueryBuilder query = searchWholeAnalyzeQuery(dto);
@@ -891,8 +893,7 @@ public class SearchWholeServiceImpl implements SearchWholeService {
         });
         List<LineVO> resLine = Tools.completeLine(res, dto.getStartTime(), dto.getEndTime());
         // 由于结束点为开区间，将结束点数据补完
-        if (CollectionUtils.isNotEmpty(resLine)){
-//            res.get(0).setDate(dto.getStartTime());
+        if (CollectionUtils.isNotEmpty(resLine) && !Objects.equals(resLine.get(resLine.size() - 1).getDate(), dto.getEndTime())){
             SearchFilterDTO searchFilterDTO = Tools.convertMap(dto, SearchFilterDTO.class);
             searchFilterDTO.setStartTime(dto.getEndTime());
             searchFilterDTO.setEndTime(dto.getEndTime() + 1);
@@ -966,11 +967,11 @@ public class SearchWholeServiceImpl implements SearchWholeService {
         // 合并数据
         platformLines.forEach((k1, v1) -> {
             List<LineVO> line = new ArrayList<>();
+            v1 = v1.entrySet().stream().sorted(Comparator.comparing((Map.Entry<String, Long> entry) -> Long.valueOf(entry.getKey()))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
             v1.forEach((k2, v2) -> line.add(new LineVO(v2, Long.valueOf(k2))));
             List<LineVO> resLine = Tools.completeLine(line, dto.getStartTime(), dto.getEndTime());
             // 结束点数据补充完全
-            if (CollectionUtils.isNotEmpty(resLine)){
-//                line.get(0).setDate(dto.getStartTime());
+            if (CollectionUtils.isNotEmpty(resLine) && !Objects.equals(resLine.get(resLine.size() - 1).getDate(), dto.getEndTime())){
                 SearchFilterDTO searchFilterDTO = Tools.convertMap(dto, SearchFilterDTO.class);
                 searchFilterDTO.setPlatforms(Collections.singletonList(GlobalPojo.getPlatformIdByName(k1)));
                 searchFilterDTO.setStartTime(dto.getEndTime());

src/main/java/com/zhiwei/brandkbs2/util/Tools.java

@@ -1432,14 +1432,27 @@ public class Tools {
      * @return
      */
     public static List<LineVO> completeLine(List<LineVO> lines, Long startTime, Long endTime){
-        int size = endTime - startTime > 7 * Constant.ONE_DAY ? 30 : (endTime - startTime <= Constant.ONE_DAY ? 24 : 7);
-        long timeRange = 7 == size || 30 == size ? Constant.ONE_DAY : Constant.ONE_HOUR;
+        int size = 0;
+        long timeGap = endTime - startTime;
+        int timeType = 0;
+        if (timeGap <= Constant.ONE_WEEK){
+            size = new Period(startTime, endTime, PeriodType.hours()).getHours();
+            timeType = 1;
+        }
+        if (timeGap > Constant.ONE_WEEK && timeGap <= 6 * Constant.ONE_MONTH){
+            size = new Period(startTime, endTime, PeriodType.days()).getDays();
+            timeType = 2;
+        }
+        if (timeGap > 6 * Constant.ONE_MONTH){
+            size = new Period(startTime, endTime, PeriodType.months()).getMonths();
+            timeType = 3;
+        }
         if (lines.size() < size){
             // 无数据，按时间段全部补为0
             if (CollectionUtils.isEmpty(lines)){
                 for (int i = 0; i < size; i++) {
                     lines.add(new LineVO(0L, startTime));
-                    startTime = startTime + timeRange;
+                    startTime = 1 == timeType ? DateUtils.addHours(new Date(startTime), 1).getTime() : 2 == timeType ? DateUtils.addDays(new Date(startTime), 1).getTime() : DateUtils.addMonths(new Date(startTime), 1).getTime();
                     if (startTime >= endTime || lines.size() >= size){
                         break;
                     }
@@ -1450,8 +1463,11 @@ public class Tools {
                 LineVO startLine = lines.get(0);
                 Long startLineTime = startLine.getDate();
                 for (int i = 0; i < size; i++) {
-                    startLineTime = startLineTime - timeRange;
+                    startLineTime = 1 == timeType ? DateUtils.addHours(new Date(startLineTime), -1).getTime() : 2 == timeType ? DateUtils.addDays(new Date(startLineTime), -1).getTime() : DateUtils.addMonths(new Date(startLineTime), -1).getTime();
                     if (startLineTime <= startTime || lines.size() >= size){
+                        if (startLineTime.equals(startTime)) {
+                            lines.add(0, new LineVO(0L, startLineTime));
+                        }
                         break;
                     }
                     lines.add(0, new LineVO(0L, startLineTime));
@@ -1460,8 +1476,11 @@ public class Tools {
                 LineVO endLine = lines.get(lines.size() - 1);
                 Long endLineTime = endLine.getDate();
                 for (int i = 0; i < size; i++) {
-                    endLineTime = endLineTime + timeRange;
+                    endLineTime = 1 == timeType ? DateUtils.addHours(new Date(endLineTime), 1).getTime() : 2 == timeType ? DateUtils.addDays(new Date(endLineTime), 1).getTime() : DateUtils.addMonths(new Date(endLineTime), 1).getTime();
                     if (endLineTime >= endTime || lines.size() >= size){
+                        if (endLineTime.equals(endTime)) {
+                            lines.add(new LineVO(0L, endLineTime));
+                        }
                         break;
                     }
                     lines.add(new LineVO(0L, endLineTime));