微调
This commit is contained in:
@@ -708,6 +708,7 @@ public class GridServiceImpl implements IGridService {
|
|||||||
List<Integer> list3 = getList(1, 16, "getInuharm", item2);
|
List<Integer> list3 = getList(1, 16, "getInuharm", item2);
|
||||||
Integer maxValue3 = list3.stream().max(Integer::compareTo).orElse(null);
|
Integer maxValue3 = list3.stream().max(Integer::compareTo).orElse(null);
|
||||||
qualifiedDetail.setInuHarm(Objects.isNull(maxValue3) ? null : PubUtils.doubleRound(2, 100.0 - (maxValue3 * 100.0 / item2.getAllTime())));
|
qualifiedDetail.setInuHarm(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())));
|
qualifiedDetail.setINeg(PubUtils.doubleRound(2, 100.0 - (item2.getINegOvertime() * 100.0 / item2.getAllTime())));
|
||||||
}
|
}
|
||||||
if (item2.getFlickerAllTime() > 0) {
|
if (item2.getFlickerAllTime() > 0) {
|
||||||
@@ -857,10 +858,11 @@ public class GridServiceImpl implements IGridService {
|
|||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
children.setRatio(PubUtils.doubleRound(2, filteredList5.size() * 100.0 / limitRateList.size()));
|
children.setRatio(PubUtils.doubleRound(2, filteredList5.size() * 100.0 / limitRateList.size()));
|
||||||
break;
|
break;
|
||||||
//谐波电压
|
// 谐波电压
|
||||||
|
// 谐波电压含有率 + 谐波电压有效值
|
||||||
case 6:
|
case 6:
|
||||||
List<RStatLimitRateDPO> filteredList6 = limitRateList.stream()
|
List<RStatLimitRateDPO> filteredList6 = limitRateList.stream()
|
||||||
.filter(x -> getLimitRateStats(x, 2, 26, "uharm", "Overtime"))
|
.filter(x -> getLimitRateStats(x, 2, 26, "uharm", "Overtime") || x.getUaberranceOvertime() > 0)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
children.setRatio(PubUtils.doubleRound(2, filteredList6.size() * 100.0 / limitRateList.size()));
|
children.setRatio(PubUtils.doubleRound(2, filteredList6.size() * 100.0 / limitRateList.size()));
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user