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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wr
2024-03-14 11:34:35 +08:00
parent 4a5152c0f9 10c2a65533
commit c9e369e7bd
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
View File

@@ -393,16 +393,19 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
List<String> l2 = voltageMap.get(key).stream().map(PmsMidLedger::getId).collect(Collectors.toList()); List<String> l2 = voltageMap.get(key).stream().map(PmsMidLedger::getId).collect(Collectors.toList());
voltageChild.setVoltageLevel(key); voltageChild.setVoltageLevel(key);
voltageChild.setOnlineBusNum(l2.size()); voltageChild.setOnlineBusNum(l2.size());
//这边没法直接通过电压等级来关联灿能母线，只能通过 Mid_Bus_Id 来关联 //匹配wire母线表数量
List<GeneratrixWire> l3 = list1.stream().filter(o->l2.contains(o.getMidBusId())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(item.getBusBarIds())){
List<GeneratrixWire> l3 = list1.stream().filter(o->item.getBusBarIds().contains(o.getId())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(l3)){ if (CollUtil.isNotEmpty(l3)){
voltageChild.setMonitorBusNum(l3.size()); voltageChild.setMonitorBusNum(l3.size());
}
} else { } else {
voltageChild.setMonitorBusNum(0); voltageChild.setMonitorBusNum(0);
} }
voltageChild.setMonitorRate(voltageChild.getMonitorBusNum()*100.0/voltageChild.getOnlineBusNum()); voltageChild.setMonitorRate(voltageChild.getMonitorBusNum()*100.0/voltageChild.getOnlineBusNum());
childList.add(voltageChild); childList.add(voltageChild);
count = count + voltageChild.getMonitorBusNum(); // count = count + voltageChild.getMonitorBusNum();
count = voltageChild.getMonitorBusNum();
} }
dto1.setAllMonitorBusNum(count); dto1.setAllMonitorBusNum(count);
dto1.setVoltageChild(childList); dto1.setVoltageChild(childList);
@@ -444,9 +447,9 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
map.forEach((k,v)->{ map.forEach((k,v)->{
BusBarDto.VoltageChild c1 = new BusBarDto.VoltageChild(); BusBarDto.VoltageChild c1 = new BusBarDto.VoltageChild();
c1.setVoltageLevel(k); c1.setVoltageLevel(k);
int monitorBusNum = v.stream().mapToInt(BusBarDto.VoltageChild::getMonitorBusNum).sum(); int monitorBusNum = (int) v.stream().mapToDouble(BusBarDto.VoltageChild::getMonitorBusNum).average().getAsDouble();
c1.setMonitorBusNum(monitorBusNum); c1.setMonitorBusNum(monitorBusNum);
int online = v.stream().mapToInt(BusBarDto.VoltageChild::getOnlineBusNum).sum(); int online = (int) v.stream().mapToDouble(BusBarDto.VoltageChild::getOnlineBusNum).average().getAsDouble();
c1.setOnlineBusNum(online); c1.setOnlineBusNum(online);
c1.setMonitorRate(online==0.0?0:monitorBusNum*100.0/online); c1.setMonitorRate(online==0.0?0:monitorBusNum*100.0/online);
children.add(c1); children.add(c1);