融合报告详情界面添加三级页面和复现程度。

src/main/java/com/mooctest/controller/ReportController.java

@@ -16,7 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
@@ -70,6 +71,11 @@ public class ReportController {
         supplements.forEach(supplementDTO -> bugs.addAll(supplementDTO.getBugs()));
         List<BugDTO> sourceReports = bugs.stream().distinct().collect(Collectors.toList());
         Map<String, Long> categoryCounts = sourceReports.stream().collect(Collectors.groupingBy(BugDTO::getBugCategory, Collectors.counting()));
+        Map<String, Long> pageCounts =  sourceReports.stream().collect(Collectors.groupingBy(BugDTO::getBug_page,Collectors.counting()));
+        Map<String, Long> recurrentCounts = sourceReports.stream()
+                .map(BugDTO::getRecurrent)
+                .map((recurrentNum) -> ReportUtil.recurrent2String.get(recurrentNum))
+                .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
         Map<String, Long> severityCounts = sourceReports.stream()
                 .map(BugDTO::getSeverity)
                 .map((severityNum) -> ReportUtil.severity2String.get(severityNum))
@@ -80,6 +86,8 @@ public class ReportController {
         model.addAttribute("wordList", getWordCloudList(sourceReports));
         model.addAttribute("categoryCounts", categoryCounts);
         model.addAttribute("severityCounts", severityCounts);
+        model.addAttribute("pageCounts",pageCounts);
+        model.addAttribute("recurrentCounts",recurrentCounts);
         model.addAttribute("aggReportId", "ML-AG-" + masterId.substring(10));
         model.addAttribute("masterReport", masterReport);
         model.addAttribute("createTime", new Date(Long.parseLong(masterReport.getCreateTimeMillis())));

src/main/java/com/mooctest/data/BugDTO.java

@@ -26,4 +26,5 @@ public class BugDTO{
     private int status = 0;
     private Long reviewerId;
     private String masterId;
+    private String bug_page;
 }

src/main/java/com/mooctest/service/impl/BugReportServiceImpl.java

@@ -99,6 +99,7 @@ public class BugReportServiceImpl implements BugReportService {
                 .imgUrls(imgUrls)
                 .recurrent(bug.getRecurrent())
                 .severity(bug.getSeverity())
+                .bug_page(bug.getBugPage())
                 .build();
     }
 

src/main/resources/templates/agg_report_new.html

@@ -108,9 +108,9 @@
                             <td class="dup-category" colspan="3">
 
                                 <!--<i class="fa fa-square" style="color: {{ category.category_color  }};"></i>-->
-                                <span th:each="categoryCounts : ${categoryCounts}">
-                                    <span th:text="${categoryCounts.key}"></span>
-                                    <span class="badge" th:text="${categoryCounts.value}"></span>
+                                <span th:each="categoryCount : ${categoryCounts}">
+                                    <span th:text="${categoryCount.key}"></span>
+                                    <span class="badge" th:text="${categoryCount.value}"></span>
                                 </span>
                                 <span th:if="${categoryCounts.size()}==0">
                                     该报告没有补充报告
@@ -118,6 +118,34 @@
                             </td>
                         </tr>
                         <tr>
+                            <td class="attr-title">三级页面&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                            <td class="dup-category" colspan="3">
+
+                                <!--<i class="fa fa-square" style="color: {{ category.category_color  }};"></i>-->
+                                <span th:each="pageCount : ${pageCounts}">
+                                    <span th:text="${pageCount.key}"></span>
+                                    <span class="badge" th:text="${pageCount.value}"></span>
+                                </span>
+                                <span th:if="${pageCounts.size()}==0">
+                                    该报告没有补充报告
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="attr-title">复现程度&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                            <td class="dup-category" colspan="3">
+
+                                <!--<i class="fa fa-square" style="color: {{ category.category_color  }};"></i>-->
+                                <span th:each="recurrentCount : ${recurrentCounts}">
+                                    <span th:text="${recurrentCount.key}"></span>
+                                    <span class="badge" th:text="${recurrentCount.value}"></span>
+                                </span>
+                                <span th:if="${recurrentCounts.size()}==0">
+                                    该报告没有补充报告
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
                             <td class="attr-title">审核人</td>
                             <td class="dup-assignee" colspan="3">