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:
雨木c
2023-03-09 08:57:30 +08:00
parent 49e04b5806
commit 57ac6fd4f7
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
View File

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -68,7 +69,6 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
if (CollUtil.isEmpty(dto.getGeneratrixIdList())) { if (CollUtil.isEmpty(dto.getGeneratrixIdList())) {
continue; continue;
} }
PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam(); PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
pmsGeneratrixParam.setGeneratrixIds(dto.getGeneratrixIdList()); pmsGeneratrixParam.setGeneratrixIds(dto.getGeneratrixIdList());
pmsGeneratrixParam.setPowerStationVoltageLevel(param.getVoltageLevel()); pmsGeneratrixParam.setPowerStationVoltageLevel(param.getVoltageLevel());
@@ -78,7 +78,6 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList()); List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList());
for (GeneratrixAndPowerStationDTO generatrixAndPowerStationDTO : dtoS) { for (GeneratrixAndPowerStationDTO generatrixAndPowerStationDTO : dtoS) {
boolean flag = false; boolean flag = false;
RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO(); RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO();
@@ -89,7 +88,6 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
vo.setDeptName(generatrixAndPowerStationDTO.getOrgName()); vo.setDeptName(generatrixAndPowerStationDTO.getOrgName());
for (RStatBusbarHarmonicYPO po : info) { for (RStatBusbarHarmonicYPO po : info) {
if (generatrixAndPowerStationDTO.getGeneratrixId().equals(po.getBusbarId())){ if (generatrixAndPowerStationDTO.getGeneratrixId().equals(po.getBusbarId())){
flag = true;
vo.setBusbarId(po.getBusbarId()); vo.setBusbarId(po.getBusbarId());
vo.setDataDate(po.getDataDate()); vo.setDataDate(po.getDataDate());
vo.setVEffectiveMax(po.getVEffectiveMax()); vo.setVEffectiveMax(po.getVEffectiveMax());
@@ -111,19 +109,11 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
break; break;
} }
} }
if(!flag){
}
result.add(vo); result.add(vo);
} }
} }
// 取出母线id
//List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
result = result.stream().sorted(Comparator.comparing(RStatBusbarHarmonicYVO::getDeptName)).collect(Collectors.toList());
return result; return result;
} }