监测脚本排序调整
This commit is contained in:
@@ -794,8 +794,19 @@ public class SocketDevResponseService {
|
|||||||
}
|
}
|
||||||
//正式检测
|
//正式检测
|
||||||
sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
|
sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
|
||||||
sourceIssues = sourceIssues.stream().sorted(Comparator.comparing(SourceIssue::getIndex)).collect(Collectors.groupingBy(SourceIssue::getType)).values().stream().flatMap(list->list.stream().sorted(Comparator.comparing(SourceIssue::getIndex))).collect(Collectors.toList());
|
sourceIssues = sourceIssues.stream().sorted(Comparator.comparing(SourceIssue::getIndex)).collect(Collectors.toList());
|
||||||
|
// 使用 LinkedHashMap 保持分组顺序
|
||||||
|
Map<String, List<SourceIssue>> groupedIssues = sourceIssues.stream()
|
||||||
|
.collect(Collectors.groupingBy(
|
||||||
|
SourceIssue::getType,
|
||||||
|
LinkedHashMap::new,
|
||||||
|
Collectors.toList()
|
||||||
|
));
|
||||||
|
|
||||||
|
// 将分组后的元素合并成一个新的集合,保持原有顺序
|
||||||
|
sourceIssues = groupedIssues.values().stream()
|
||||||
|
.flatMap(List::stream)
|
||||||
|
.collect(Collectors.toList());
|
||||||
// 存放所有检测小项
|
// 存放所有检测小项
|
||||||
SocketManager.addSourceList(sourceIssues);
|
SocketManager.addSourceList(sourceIssues);
|
||||||
// 按照大项分组。key为大项code,value为小项个数
|
// 按照大项分组。key为大项code,value为小项个数
|
||||||
|
|||||||
Reference in New Issue
Block a user