1.pms微调
This commit is contained in:
@@ -18,6 +18,8 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
@@ -74,9 +76,7 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
|
||||
// 通过母线id查询变电站背景谐波年表
|
||||
List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList());
|
||||
|
||||
|
||||
for (GeneratrixAndPowerStationDTO generatrixAndPowerStationDTO : dtoS) {
|
||||
boolean flag = false;
|
||||
RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO();
|
||||
vo.setBusbarName(generatrixAndPowerStationDTO.getGeneratrixName());
|
||||
vo.setSubId(generatrixAndPowerStationDTO.getPowerId());
|
||||
@@ -87,22 +87,22 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
|
||||
if (generatrixAndPowerStationDTO.getGeneratrixId().equals(po.getBusbarId())){
|
||||
vo.setBusbarId(po.getBusbarId());
|
||||
vo.setDataDate(po.getDataDate());
|
||||
vo.setVEffectiveMax(po.getVEffectiveMax());
|
||||
vo.setVEffectiveMin(po.getVEffectiveMin());
|
||||
vo.setVEffectiveAvg(po.getVEffectiveAvg());
|
||||
vo.setVEffective95(po.getVEffective95());
|
||||
vo.setVThdMax(po.getVThdMax());
|
||||
vo.setVThdMin(po.getVThdMin());
|
||||
vo.setVThdAvg(po.getVThdAvg());
|
||||
vo.setVThd95(po.getVThd95());
|
||||
vo.setUnbalanceMax(po.getUnbalanceMax());
|
||||
vo.setUnbalanceMin(po.getUnbalanceMin());
|
||||
vo.setUnbalanceAvg(po.getUnbalanceAvg());
|
||||
vo.setUnbalance95(po.getUnbalance95());
|
||||
vo.setFlickerMax(po.getFlickerMax());
|
||||
vo.setFlickerMin(po.getFlickerMin());
|
||||
vo.setFlickerAvg(po.getFlickerAvg());
|
||||
vo.setFlicker95(po.getFlicker95());
|
||||
vo.setVEffectiveMax(po.getVEffectiveMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVEffectiveMin(po.getVEffectiveMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVEffectiveAvg(po.getVEffectiveAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVEffective95(po.getVEffective95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVThdMax(po.getVThdMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVThdMin(po.getVThdMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVThdAvg(po.getVThdAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setVThd95(po.getVThd95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setUnbalanceMax(po.getUnbalanceMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setUnbalanceMin(po.getUnbalanceMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setUnbalanceAvg(po.getUnbalanceAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setUnbalance95(po.getUnbalance95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setFlickerMax(po.getFlickerMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setFlickerMin(po.getFlickerMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setFlickerAvg(po.getFlickerAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
vo.setFlicker95(po.getFlicker95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user