河北超高压bug调整
This commit is contained in:
@@ -153,6 +153,7 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
|
||||
rDimBusbarHarmnicDPO.setStatisDate(localDate);
|
||||
rDimBusbarHarmnicDPO.setTargetType(dictData.getId());
|
||||
rDimBusbarHarmnicDPO.setBusbarId(busbar.getLineId());
|
||||
rDimBusbarHarmnicDPO.setPowerId(busbar.getPowerrId());
|
||||
rDimBusbarHarmnicDPO.setLevel(1);
|
||||
rDimBusbarHarmnicDPO.setMonitorTag(busbar.getMonitorTag());
|
||||
rDimBusbarHarmnicDPO.setVoltageLevel(busbar.getVoltageLevel());
|
||||
@@ -165,6 +166,7 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
|
||||
}
|
||||
|
||||
rDimBusbarHarmnicDPO.setLimitCount(eventBusbarsCount(dictData,rMpEventDetailDPO));
|
||||
rDimBusbarHarmnicDPO.setStatisCount(0);
|
||||
rDimBusbarHarmnicDPOList.add(rDimBusbarHarmnicDPO);
|
||||
});
|
||||
|
||||
@@ -193,9 +195,9 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
|
||||
rDimStationHarmnicDPO.setTargetType(targetType);
|
||||
rDimStationHarmnicDPO.setStationId(powerId);
|
||||
rDimStationHarmnicDPO.setLevel(level);
|
||||
int sum = map3.stream().mapToInt(RDimBusbarHarmnicDPO::getStatisCount).sum();
|
||||
int sum = map3.stream().map(o->Objects.isNull(o.getStatisCount())?0:o.getStatisCount()).mapToInt(p->p).sum();
|
||||
rDimStationHarmnicDPO.setStatisCount(sum);
|
||||
int limitSum = map3.stream().mapToInt(RDimBusbarHarmnicDPO::getLimitCount).sum();
|
||||
int limitSum = map3.stream().map(o->Objects.isNull(o.getLimitCount())?0:o.getLimitCount()).mapToInt(p->p).sum();
|
||||
rDimStationHarmnicDPO.setLimitCount(limitSum);
|
||||
rDimStationHarmnicDPO.setVoltageLevel(data.stream().filter(temp->Objects.equals(temp.getPowerId(),powerId)).map(PmsStatationStatInfoDTO::getPowerVoltageLevel).findFirst().orElse("3.14159"));
|
||||
rDimStationHarmnicDPOList.add(rDimStationHarmnicDPO);
|
||||
|
||||
Reference in New Issue
Block a user