电能质量问题修改

This commit is contained in:
hzj
2024-04-10 10:47:45 +08:00
parent 859be88988
commit c348b24b51
9 changed files with 73 additions and 36 deletions

View File

@@ -57,14 +57,11 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
YearMonth yearMonth = YearMonth.from(date);
int daysInMonth = yearMonth.lengthOfMonth();
/*获取稳态统计指标*/
List<DictData> steadyStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
List<DictData> steadyStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData();
rStatLimitRateDPOs.stream().collect(Collectors.groupingBy(RStatLimitRateDPO::getLineId)).forEach((k, v) -> {
LineALLInfoDTO lineALLInfoDTO = commLineClient.getLineAllDetail(k).getData();
steadyStatis.forEach(dictData -> {
if(Objects.equals(dictData.getCode(), DicDataEnum.TOTAL_INDICATOR.getCode())||
Objects.equals(dictData.getCode(), DicDataEnum.phase_Voltage.getCode())){
return;
}
RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO = new RMpPartHarmonicDetailDTO();
rMpPartHarmonicDetailDTO.setHarmonicType(dictData.getId());
List<LocalDate> localDates = overLimitCount(dictData, v);
@@ -99,21 +96,23 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
private List<LocalDate> overLimitCount(DictData temp,List<RStatLimitRateDPO> rStatLimitRateDPOs ) {
List<LocalDate> localDetails = new ArrayList<>();
if (Objects.equals(temp.getCode(), DicDataEnum.VOLTAGE_DEV.getCode())) {
if (Objects.equals(temp.getCode(), DicDataEnum.DYPC_ENUM.getCode())) {
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getVoltageDevOvertime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
} else if ( Objects.equals(temp.getCode(), DicDataEnum.FLICKER.getCode())) {
} else if ( Objects.equals(temp.getCode(), DicDataEnum.CSSB_ENUM.getCode())) {
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getFlickerOvertime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
} else if ( Objects.equals(temp.getCode(), DicDataEnum.PHASE_VOLTAGE.getCode())) {
} else if ( Objects.equals(temp.getCode(), DicDataEnum.SXDYBPHD_ENUM.getCode())) {
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getUbalanceOvertime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
} else if (Objects.equals(temp.getCode(), DicDataEnum.THD_V.getCode())){
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getUaberranceOvertime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
}else if ( Objects.equals(temp.getCode(), DicDataEnum.HARMONIC_VOLTAGE.getCode())) {
}
// else if (Objects.equals(temp.getCode(), DicDataEnum.THD_V.getCode())){
// localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getUaberranceOvertime() > 0)
// .map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
// }
else if ( Objects.equals(temp.getCode(), DicDataEnum.XBDY_ENUM.getCode())) {
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO ->
rStatLimitRateDPO.getUharm2Overtime()+
rStatLimitRateDPO.getUharm3Overtime()+
@@ -141,7 +140,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
rStatLimitRateDPO.getUharm25Overtime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
} else if ( Objects.equals(temp.getCode(), DicDataEnum.HARMONIC_CURRENT.getCode())) {
} else if ( Objects.equals(temp.getCode(), DicDataEnum.XBDL_ENUM.getCode())) {
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO ->
rStatLimitRateDPO.getIharm2Overtime()+
rStatLimitRateDPO.getIharm4Overtime()+
@@ -170,7 +169,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
} else if (Objects.equals(temp.getCode(), DicDataEnum.INTERHARMONIC_VOLTAGE.getCode())){
} else if (Objects.equals(temp.getCode(), DicDataEnum.JXBDY_ENUM.getCode())){
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO ->
rStatLimitRateDPO.getInuharm1Overtime()+
rStatLimitRateDPO.getInuharm2Overtime()+
@@ -191,11 +190,11 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
> 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
}else if ( Objects.equals(temp.getCode(), DicDataEnum.FREQUENCY_DEV.getCode())) {
}else if ( Objects.equals(temp.getCode(), DicDataEnum.PLPC_ENUM.getCode())) {
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getFreqDevOvertime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
} else if (Objects.equals(temp.getCode(), DicDataEnum.NEG_CURRENT.getCode())){
} else if (Objects.equals(temp.getCode(), DicDataEnum.FXDL_ENUM.getCode())){
localDetails = rStatLimitRateDPOs.stream().filter(rStatLimitRateDPO -> rStatLimitRateDPO.getINegOvertime() > 0)
.map(RStatLimitRateDPO::getTime).collect(Collectors.toList());
}