This commit is contained in:
xy
2024-09-23 20:30:48 +08:00
parent 692fe1b213
commit 31281cb346

View File

@@ -646,15 +646,15 @@ public class GridServiceImpl implements IGridService {
//谐波电压
List<Integer> list1 = getList(2,25,"getUharm",item2);
Integer maxValue1 = list1.stream().max(Integer::compareTo).orElse(null);
qualifiedDetail.setUHarm(Objects.isNull(maxValue1) ? 0 : PubUtils.doubleRound(2,100.0 - (maxValue1*100.0 / item2.getAllTime())));
qualifiedDetail.setUHarm(Objects.isNull(maxValue1) ? null : PubUtils.doubleRound(2,100.0 - (maxValue1*100.0 / item2.getAllTime())));
//谐波电流
List<Integer> list2 = getList(2,25,"getIharm",item2);
Integer maxValue2 = list2.stream().max(Integer::compareTo).orElse(null);
qualifiedDetail.setUHarm(Objects.isNull(maxValue2) ? 0 : PubUtils.doubleRound(2,100.0 - (maxValue2*100.0 / item2.getAllTime())));
qualifiedDetail.setUHarm(Objects.isNull(maxValue2) ? null : PubUtils.doubleRound(2,100.0 - (maxValue2*100.0 / item2.getAllTime())));
//间谐波电压
List<Integer> list3 = getList(1,16,"getInuharm",item2);
Integer maxValue3 = list3.stream().max(Integer::compareTo).orElse(null);
qualifiedDetail.setUHarm(Objects.isNull(maxValue3) ? 0 : PubUtils.doubleRound(2,100.0 - (maxValue3*100.0 / item2.getAllTime())));
qualifiedDetail.setUHarm(Objects.isNull(maxValue3) ? null : PubUtils.doubleRound(2,100.0 - (maxValue3*100.0 / item2.getAllTime())));
qualifiedDetail.setINeg(PubUtils.doubleRound(2, 100.0 - (item2.getINegOvertime() * 100.0 / item2.getAllTime())));
}
if (item2.getFlickerAllTime() > 0) {