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

微调

Browse Source
This commit is contained in:
wr
2025-12-14 15:42:55 +08:00
parent cebda9323e
commit f5e1fac55d
2 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/DetailAbnormalVO.java
View File

@@ -92,49 +92,6 @@ public class DetailAbnormalVO {
private Double freqData = 3.14159;
@ApiModelProperty("频率偏差限值")
private Float freqLimit = 3.14159F;
@ApiModelProperty("频率偏差信息")
private List<DetailLimitInnerVO> freqDataList;
/**
* 电压偏差上
*/
@ApiModelProperty("电压上偏差")
private Double vDevData = 3.14159;
@ApiModelProperty("电压上偏差限值")
private Float vDevLimit = 3.14159F;
@ApiModelProperty("频率偏差信息")
private List<DetailLimitInnerVO> vDevDataList;
/**
* 电压偏差下
*/
@ApiModelProperty("电压下偏差")
private Double uDevData = 3.14159;
@ApiModelProperty("电压下偏差限值")
private Float uDevLimit = 3.14159F;
@ApiModelProperty("频率偏差信息")
private List<DetailLimitInnerVO> uDevDataList;
/**
* 总谐波畸变率
*/
@ApiModelProperty("总谐波畸变率")
private Double uaberranceData = 3.14159;
@ApiModelProperty("总谐波畸变率限值")
private Float uaberranceLimit = 3.14159F;
@ApiModelProperty("频率偏差信息")
private List<DetailLimitInnerVO> uaberranceDataList;
/**
* 三相电压不平衡度
*/
@ApiModelProperty("三相电压不平衡度")
private Double unbalanceData = 3.14159;
@ApiModelProperty("三相电压不平衡度限值")
private Float unbalanceLimit = 3.14159F;
@ApiModelProperty("频率偏差信息")
private List<DetailLimitInnerVO> unbalanceDataList;
/**
* 电压闪变
@@ -143,8 +100,76 @@ public class DetailAbnormalVO {
private Double flickerData = 3.14159;
@ApiModelProperty("电压闪变限值")
private Float flickerLimit = 3.14159F;
@ApiModelProperty("频率偏差信息")
private List<DetailLimitInnerVO> flickerDataList;
/**
* 电压偏差上
*/
@ApiModelProperty("电压上偏差")
private Double vDevData = 3.14159;
@ApiModelProperty("电压上偏差限值")
private Float vDevLimit = 3.14159F;
/**
* 电压偏差下
*/
@ApiModelProperty("电压下偏差")
private Double uDevData = 3.14159;
@ApiModelProperty("电压下偏差限值")
private Float uDevLimit = 3.14159F;
/**
* 三相电压不平衡度
*/
@ApiModelProperty("三相电压不平衡度")
private Double unbalanceData = 3.14159;
@ApiModelProperty("三相电压不平衡度限值")
private Float unbalanceLimit = 3.14159F;
/**
* 总谐波畸变率
*/
@ApiModelProperty("总谐波畸变率")
private Double uaberranceData = 3.14159;
@ApiModelProperty("总谐波畸变率限值")
private Float uaberranceLimit = 3.14159F;
/**
* 负序电流限值天数
*/
@ApiModelProperty("负序电流")
private Double iNegData= 3.14159;
@ApiModelProperty("负序电流限值")
private Float iNegLimit= 3.14159F;
/**
* 谐波电压越限天数
*/
@ApiModelProperty("谐波电压")
private Double uharmData = 3.14159;
@ApiModelProperty("谐波电压限值")
private Float uharmLimit= 3.14159F;
/**
* 谐波电流越限天数
*/
@ApiModelProperty("谐波电流")
private Double iharmData = 3.14159;
@ApiModelProperty("谐波电流限值")
private Float iharmLimit= 3.14159F;
/**
* 间谐波限值天数
*/
@ApiModelProperty("间谐波电压")
private Double inuharmData = 3.14159;
@ApiModelProperty("间谐波电压限值")
private Float inuharmLimit= 3.14159F;
}

19
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java
View File

@@ -403,7 +403,7 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
LineCountEvaluateParam lineCountEvaluateParam = new LineCountEvaluateParam();
lineCountEvaluateParam.setLineId(Collections.singletonList(monitorBaseParam.getMonitorIds().get(0)));
lineCountEvaluateParam.setStartTime(monitorBaseParam.getSearchBeginTime());
lineCountEvaluateParam.setEndTime(monitorBaseParam.getSearchBeginTime());
lineCountEvaluateParam.setEndTime(monitorBaseParam.getSearchEndTime());
List<DataLimitRateDetailDto> dtoList = dataLimitRateDetailFeignClient.getRawData(lineCountEvaluateParam).getData();
Overlimit overLimitDataById = overLimitService.getOverLimitDataById(monitorBaseParam.getMonitorIds().get(0));
@@ -419,12 +419,22 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
dealJsonArr(new JSONArray(dto.getUbalanceOvertime()), ubalance, DicDataEnum.phase_Voltage.getCode(), null);
dealJsonArr(new JSONArray(dto.getFlickerOvertime()), flicker, DicDataEnum.FLICKER.getCode(), null);
}
//电压偏差
//负序电流
//电压总谐波
//谐波电压
//谐波电压
//频率偏差
//谐波电流
//简谐波电压
//闪变
//三相不平衡度
if (CollUtil.isNotEmpty(freq)) {
List<DetailAbnormalVO.DetailLimitInnerVO> collect = freq.stream().sorted(Comparator.comparing(DetailAbnormalVO.DetailLimitInnerVO::getVal).reversed()).collect(Collectors.toList());
DetailAbnormalVO.DetailLimitInnerVO val = collect.get(0);
assess.setFreqData(Double.valueOf(val.getVal()));
assess.setFreqLimit(val.getOverLimitValue());
assess.setFreqDataList(collect);
} else {
assess.setFreqLimit(overLimitDataById.getFreqDev());
}
@@ -434,14 +444,12 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
DetailAbnormalVO.DetailLimitInnerVO val = collect.get(0);
assess.setVDevData(Double.valueOf(val.getVal()));
assess.setVDevLimit(val.getOverLimitValue());
assess.setVDevDataList(collect);
}
List<DetailAbnormalVO.DetailLimitInnerVO> collect2 = voltage.stream().filter(x->Double.valueOf(x.getVal()) < 0).sorted(Comparator.comparing(DetailAbnormalVO.DetailLimitInnerVO::getVal)).collect(Collectors.toList());
if(CollUtil.isNotEmpty(collect2)){
DetailAbnormalVO.DetailLimitInnerVO val2 = collect2.get(0);
assess.setUDevData(Double.valueOf(val2.getVal()));
assess.setUDevLimit(val2.getOverLimitValue());
assess.setUDevDataList(collect2);
}
}else{
assess.setVDevLimit(overLimitDataById.getVoltageDev());
@@ -453,7 +461,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
DetailAbnormalVO.DetailLimitInnerVO val = collect.get(0);
assess.setUaberranceData(Double.valueOf(val.getVal()));
assess.setUaberranceLimit(val.getOverLimitValue());
assess.setUaberranceDataList(collect);
}else {
assess.setUaberranceLimit(overLimitDataById.getUaberrance());
}
@@ -463,7 +470,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
DetailAbnormalVO.DetailLimitInnerVO val = collect.get(0);
assess.setUnbalanceData(Double.valueOf(val.getVal()));
assess.setUnbalanceLimit(val.getOverLimitValue());
assess.setUnbalanceDataList(collect);
}else{
assess.setUnbalanceLimit(overLimitDataById.getUbalance());
}
@@ -472,7 +478,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
DetailAbnormalVO.DetailLimitInnerVO val = collect.get(0);
assess.setFlickerData(Double.valueOf(val.getVal()));
assess.setFlickerLimit(val.getOverLimitValue());
assess.setFlickerDataList(collect);
}else {
assess.setFlickerLimit(overLimitDataById.getFlicker());
}