单位超标信息算法bug修改
This commit is contained in:
@@ -250,18 +250,20 @@ public class RStatHarmonicVoltageServiceImpl implements RStatHarmonicVoltageServ
|
|||||||
List<LineDevGetDTO> lineBaseList = deptGetChildrenMoreDTO.getLineBaseList();
|
List<LineDevGetDTO> lineBaseList = deptGetChildrenMoreDTO.getLineBaseList();
|
||||||
Map<String, List<LineDevGetDTO>> collect = lineBaseList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getLineTag));
|
Map<String, List<LineDevGetDTO>> collect = lineBaseList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getLineTag));
|
||||||
collect.forEach((k, v) -> {
|
collect.forEach((k, v) -> {
|
||||||
List<String> collect1 = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
|
||||||
Map<String, List<LineDevGetDTO>> collect2 = v.stream().collect(Collectors.groupingBy(LineDevGetDTO::getVoltageLevel));
|
Map<String, List<LineDevGetDTO>> collect2 = v.stream().collect(Collectors.groupingBy(LineDevGetDTO::getVoltageLevel));
|
||||||
collect2.forEach((k1, v1) -> {
|
collect2.forEach((k1, v1) -> {
|
||||||
|
|
||||||
|
List<String> collect3 = v1.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||||
|
|
||||||
queryWrapper.clear();
|
queryWrapper.clear();
|
||||||
queryWrapper.select("freq_over_day", "v_dev_over_day", "v_over_day", "i_over_day", "unbalance_over_day", "i_neg_over_day").
|
queryWrapper.select("freq_over_day", "v_dev_over_day", "v_over_day", "i_over_day", "unbalance_over_day", "i_neg_over_day").
|
||||||
in("measurement_point_id", collect1).
|
in("measurement_point_id", collect3).
|
||||||
between("data_date",begin,end);
|
between("data_date",begin,end);
|
||||||
List<RMpPartHarmonicDetailM> rMpPartHarmonicDetailMS = rMpPartHarmonicDetailMMapper.selectList(queryWrapper);
|
List<RMpPartHarmonicDetailM> rMpPartHarmonicDetailMS = rMpPartHarmonicDetailMMapper.selectList(queryWrapper);
|
||||||
|
|
||||||
rMpSurplusHarmonicDetailMQueryWrapper.clear();
|
rMpSurplusHarmonicDetailMQueryWrapper.clear();
|
||||||
rMpSurplusHarmonicDetailMQueryWrapper.select("flicker_over_day", "inuharm_over_day").
|
rMpSurplusHarmonicDetailMQueryWrapper.select("flicker_over_day", "inuharm_over_day").
|
||||||
in("measurement_point_id", collect1).
|
in("measurement_point_id", collect3).
|
||||||
between("data_date",begin,end);
|
between("data_date",begin,end);
|
||||||
List<RMpSurplusHarmonicDetailM> rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper);
|
List<RMpSurplusHarmonicDetailM> rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper);
|
||||||
|
|
||||||
@@ -303,7 +305,7 @@ public class RStatHarmonicVoltageServiceImpl implements RStatHarmonicVoltageServ
|
|||||||
rStatHarmonicVoltageMPO.setOverLimitMeasurementAverage(asDouble);
|
rStatHarmonicVoltageMPO.setOverLimitMeasurementAverage(asDouble);
|
||||||
double asDouble1 = list.stream().mapToDouble(RStatHarmonicVoltageDPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
|
double asDouble1 = list.stream().mapToDouble(RStatHarmonicVoltageDPO::getOverLimitMeasurementRatioAverage).average().getAsDouble();
|
||||||
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
||||||
rStatHarmonicVoltageMPO.setOverLimitMeasurementRatioAccrued(asDouble);
|
rStatHarmonicVoltageMPO.setOverLimitMeasurementRatioAccrued(asDouble1);
|
||||||
int sum = list.stream().mapToInt(RStatHarmonicVoltageDPO::getOverLimitMeasurementAverage).sum();
|
int sum = list.stream().mapToInt(RStatHarmonicVoltageDPO::getOverLimitMeasurementAverage).sum();
|
||||||
rStatHarmonicVoltageMPO.setOverDay(sum);
|
rStatHarmonicVoltageMPO.setOverDay(sum);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user