Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

河北超高压bug调整

Browse Source
This commit is contained in:
xuyang
2024-03-06 11:16:03 +08:00
parent 5e27d90263
commit 34b76fe7ff
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusbarHarmnicDPOServiceImpl.java
View File

@@ -153,6 +153,7 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
rDimBusbarHarmnicDPO.setStatisDate(localDate); rDimBusbarHarmnicDPO.setStatisDate(localDate);
rDimBusbarHarmnicDPO.setTargetType(dictData.getId()); rDimBusbarHarmnicDPO.setTargetType(dictData.getId());
rDimBusbarHarmnicDPO.setBusbarId(busbar.getLineId()); rDimBusbarHarmnicDPO.setBusbarId(busbar.getLineId());
rDimBusbarHarmnicDPO.setPowerId(busbar.getPowerrId());
rDimBusbarHarmnicDPO.setLevel(1); rDimBusbarHarmnicDPO.setLevel(1);
rDimBusbarHarmnicDPO.setMonitorTag(busbar.getMonitorTag()); rDimBusbarHarmnicDPO.setMonitorTag(busbar.getMonitorTag());
rDimBusbarHarmnicDPO.setVoltageLevel(busbar.getVoltageLevel()); rDimBusbarHarmnicDPO.setVoltageLevel(busbar.getVoltageLevel());
@@ -165,6 +166,7 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
} }
rDimBusbarHarmnicDPO.setLimitCount(eventBusbarsCount(dictData,rMpEventDetailDPO)); rDimBusbarHarmnicDPO.setLimitCount(eventBusbarsCount(dictData,rMpEventDetailDPO));
rDimBusbarHarmnicDPO.setStatisCount(0);
rDimBusbarHarmnicDPOList.add(rDimBusbarHarmnicDPO); rDimBusbarHarmnicDPOList.add(rDimBusbarHarmnicDPO);
}); });
@@ -193,9 +195,9 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
rDimStationHarmnicDPO.setTargetType(targetType); rDimStationHarmnicDPO.setTargetType(targetType);
rDimStationHarmnicDPO.setStationId(powerId); rDimStationHarmnicDPO.setStationId(powerId);
rDimStationHarmnicDPO.setLevel(level); 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); 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.setLimitCount(limitSum);
rDimStationHarmnicDPO.setVoltageLevel(data.stream().filter(temp->Objects.equals(temp.getPowerId(),powerId)).map(PmsStatationStatInfoDTO::getPowerVoltageLevel).findFirst().orElse("3.14159")); rDimStationHarmnicDPO.setVoltageLevel(data.stream().filter(temp->Objects.equals(temp.getPowerId(),powerId)).map(PmsStatationStatInfoDTO::getPowerVoltageLevel).findFirst().orElse("3.14159"));
rDimStationHarmnicDPOList.add(rDimStationHarmnicDPO); rDimStationHarmnicDPOList.add(rDimStationHarmnicDPO);