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

1.专项分析-指标总览算法修改

Browse Source
This commit is contained in:
wr
2024-03-06 18:47:17 +08:00
parent 3782ac6900
commit cf0324bff5
6 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java
View File

@@ -53,6 +53,11 @@ public class RStatHarmonicOrgM implements Serializable {
* 数据类型,字典表（01：主网测点 02：配网测点）
*/
private String dataType;
public void setOverLimitMeasurementAverage(Float overLimitMeasurementAverage) {
this.overLimitMeasurementAverage = NumberUtil.round(overLimitMeasurementAverage*100,2).floatValue();;
}
public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) {
this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue();
}

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java
View File

@@ -53,6 +53,9 @@ public class RStatHarmonicOrgQ implements Serializable {
* 数据类型,字典表（01：主网测点 02：配网测点）
*/
private String dataType;
public void setOverLimitMeasurementAverage(Float overLimitMeasurementAverage) {
this.overLimitMeasurementAverage = NumberUtil.round(overLimitMeasurementAverage*100,2).floatValue();;
}
public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) {
this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue();
}

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java
View File

@@ -54,6 +54,9 @@ public class RStatHarmonicOrgY implements Serializable {
*/
private String dataType;
public void setOverLimitMeasurementAverage(Float overLimitMeasurementAverage) {
this.overLimitMeasurementAverage = NumberUtil.round(overLimitMeasurementAverage*100,2).floatValue();;
}
public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) {
this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue();
}

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/WindFarmIndexOverviewPO.java
View File

@@ -43,6 +43,6 @@ public class WindFarmIndexOverviewPO implements Serializable {
/**
* 平均超标天数
*/
private Integer avgExcessiveDays;
private Double avgExcessiveDays;
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java
View File

@@ -114,8 +114,8 @@ public class WindFarmIndexOverviewServiceImpl implements WindFarmIndexOverview {
RStatOrgWfIndexOverviewVO vo = new RStatOrgWfIndexOverviewVO();
vo.setMonitorNum(po.getMonitorNum());
vo.setType(dataMap.get(po.getOrgNo()));
vo.setHistograms(po.getAvgExcessiveDays().toString());
vo.setLineCharts(po.getMonitorNum().toString());
vo.setHistograms(po.getProportionOfExcessPoints().toString());
vo.setLineCharts(po.getAvgExcessiveDays().toString());
vo.setMonitorTag(po.getMonitorTag());
return vo;
}).collect(Collectors.toList());