Merge branch 'release' into 'master'

Release

See merge request !223

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

@@ -1131,12 +1131,20 @@ public class MarkDataServiceImpl implements MarkDataService {
         result.put("startTime", startTime);
         // 结束时间
         result.put("endTime", endTime);
-
+        // 时间超过三天则选用day
+        List<Map<String, Long>> cutList;
+        if (endTime - startTime > Constant.ONE_DAY * 3) {
+            cutList = Tools.parseToDays(startTime, endTime);
+            result.put("timeType", "day");
+        } else {
+            cutList = Tools.parseToHours(startTime, endTime);
+            result.put("timeType", "hour");
+        }
         // 主品牌图谱
         JSONObject primaryLine = new JSONObject();
         primaryLine.put("id", Constant.PRIMARY_CONTEND_ID);
         primaryLine.put("brand", project.getBrandName());
-        List<LineVO> primarySpread = getArticleSpread(projectId, project.getBrandLinkedGroupId(), Constant.PRIMARY_CONTEND_ID, startTime, endTime);
+        List<LineVO> primarySpread = getArticleSpread(projectId, project.getBrandLinkedGroupId(), Constant.PRIMARY_CONTEND_ID, cutList);
         primaryLine.put("spread", primarySpread);
         resList.add(primaryLine);
         result.put("days", primarySpread.size());
@@ -1145,7 +1153,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         JSONObject contendLine = new JSONObject();
         contendLine.put("id", contendId);
         contendLine.put("brand", brandName);
-        List<LineVO> contendSpread = getArticleSpread(projectId, contendLinkedGroupId, contendId, startTime, endTime);
+        List<LineVO> contendSpread = getArticleSpread(projectId, contendLinkedGroupId, contendId, cutList);
         contendLine.put("spread", contendSpread);
         resList.add(contendLine);
         result.put("spread", resList);
@@ -1573,18 +1581,10 @@ public class MarkDataServiceImpl implements MarkDataService {
      * @param projectId     项目ID
      * @param linkedGroupId 关联组Id
      * @param contendId     竞品ID
-     * @param start         开始时间
-     * @param end           结束时间
+     * @param cutList 拆分list
      * @return
      */
-    private List<LineVO> getArticleSpread(String projectId, String linkedGroupId, String contendId,Long start,Long end) {
-        List<Map<String, Long>> cutList;
-        // 时间超过三天则选用day
-        if(end-start>Constant.ONE_DAY*3){
-            cutList = Tools.parseToDays(start, end);
-        }else{
-            cutList = Tools.parseToHours(start, end);
-        }
+    private List<LineVO> getArticleSpread(String projectId, String linkedGroupId, String contendId, List<Map<String, Long>> cutList) {
         List<LineVO> lineList = new ArrayList<>(cutList.size());
         cutList.forEach(day -> {
             LineVO lineVO = new LineVO();