ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

起点

Browse Source
This commit is contained in:
caozehui
2026-04-30 09:34:44 +08:00
parent 391fd0cf4f
commit 503018a721
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
detection/src/main/java/com/njcn/gather/freqConverter/service/impl/FreqConverterServiceImpl.java
View File

@@ -18,11 +18,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -128,11 +124,32 @@ public class FreqConverterServiceImpl extends ServiceImpl<FreqConverterStatusMap
}
Map<Integer, List<TolerantPointVO>> durationPointMap = dipPoints.stream()
.collect(Collectors.groupingBy(TolerantPointVO::getDurationMs));
.collect(Collectors.groupingBy(TolerantPointVO::getDurationMs, TreeMap::new, Collectors.toList()));
if (durationPointMap.size() < 2) {
return new ArrayList<>();
}
List<TolerantPointVO> result = new ArrayList<>();
TolerantPointVO firstPoint = new TolerantPointVO();
List<Integer> keyList = durationPointMap.keySet().stream().collect(Collectors.toList());
Integer i1 = keyList.get(0);
List<TolerantPointVO> tolerantPointVOS1 = durationPointMap.get(i1);
Collections.sort(tolerantPointVOS1,Comparator.comparing(TolerantPointVO::getResidualVoltage));
TolerantPointVO tolerantPointVO1 = tolerantPointVOS1.get(0);
Integer i2 = keyList.get(1);
List<TolerantPointVO> tolerantPointVOS2 = durationPointMap.get(i2);
Collections.sort(tolerantPointVOS2,Comparator.comparing(TolerantPointVO::getResidualVoltage));
TolerantPointVO tolerantPointVO2 = tolerantPointVOS2.get(0);
firstPoint.setDurationMs((i1 + i2)/2);
firstPoint.setResidualVoltage((tolerantPointVO1.getResidualVoltage() + tolerantPointVO2.getResidualVoltage()) / 2D);
firstPoint.setTolerant(2);
result.add(firstPoint);
durationPointMap.entrySet().stream()
.sorted(Map.Entry.comparingByKey())
.forEach(entry -> {
List<TolerantPointVO> sameDurationPoints = entry.getValue().stream()
.sorted(Comparator.comparing(TolerantPointVO::getResidualVoltage, Comparator.reverseOrder()))