This commit is contained in:
caozehui
2025-10-24 16:25:21 +08:00
parent 98f4ecef6c
commit 57c419eb70
3 changed files with 57 additions and 3 deletions

View File

@@ -3337,8 +3337,17 @@ public class ResultServiceImpl implements IResultService {
devMonitorIdMap2.forEach((devMonitorId, value) -> {
Map<LocalDateTime, List<ContrastHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getTimeId, Collectors.toList()));
String[] split1 = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
timeListMap.forEach((time, value1) -> {
DevData devData = info.stream().filter(x -> x.getTime().equals(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)))).findFirst().orElse(null);
// DevData devData = info.stream().filter(x -> x.getTime().equals(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)))).findFirst().orElse(null);
DevData devData = null;
for (int i = 0; i < info.size(); i++) {
DevData devData1 = info.get(i);
if (time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)).equals(devData1.getTime()) && devData1.getId().split(CnSocketUtil.SPLIT_TAG)[1].equals(split1[1])) {
devData = devData1;
break;
}
}
if (ObjectUtil.isNotNull(devData)) {
String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
if (flag == 0) {