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

地市合格率报错

Browse Source
This commit is contained in:
xy
2025-12-13 11:11:50 +08:00
parent 10273dd2b0
commit 3a97f01383
1 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -890,7 +890,7 @@ public class GridServiceImpl implements IGridService {
} }
} }
public AssessDetailVo getAssessData(String deptId, String deptName, List<String> lineList, List<RStatAssesDPO> list1, List<PQSComAssesPO> list2, List<RStatLimitRateDPO> list3) { public AssessDetailVo getAssessData(String deptId, String deptName, List<String> lineList, List<RStatAssesDPO> list1, List<PQSComAssesPO> list2, List<RStatLimitRateDPO> list3) {
AssessDetailVo comAssess = new AssessDetailVo(); AssessDetailVo comAssess = new AssessDetailVo();
comAssess.setDeptId(deptId); comAssess.setDeptId(deptId);
comAssess.setDeptName(deptName); comAssess.setDeptName(deptName);
@@ -946,12 +946,61 @@ public class GridServiceImpl implements IGridService {
//计算总稳态合格率 //计算总稳态合格率
double all1 = 100 - (devTime + freqTime + thdTime + ubalanceTime) * 100.0 / (allTime * 4); double all1 = 100 - (devTime + freqTime + thdTime + ubalanceTime) * 100.0 / (allTime * 4);
double all2 = 100 - pltTime * 100.0 / allFlickerTime; double all2 = 100 - pltTime * 100.0 / allFlickerTime;
comAssess.setQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, (all1 + all2) / 2.0));
comAssess.setVDevQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - devTime * 100.0 / allTime)); double data1,data2,data3,data4,data5,data6;
comAssess.setFreqQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - freqTime * 100.0 / allTime)); if (Double.isNaN(all1+all2)) {
comAssess.setHarmQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - thdTime * 100.0 / allTime)); data1 = 3.14159;
comAssess.setFlickerQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - pltTime * 100.0 / allFlickerTime)); } else if (Double.isInfinite(all1+all2)) {
comAssess.setUnbalanceQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - ubalanceTime * 100.0 / allTime)); data1 = 100.0;
} else {
data1 = PubUtils.doubleRound(2, (all1 + all2) / 2.0);
}
if (Double.isNaN(100 - devTime * 100.0 / allTime)) {
data2 = 3.14159;
} else if (Double.isInfinite(100 - devTime * 100.0 / allTime)) {
data2 = 100.0;
} else {
data2 = PubUtils.doubleRound(2, 100 - devTime * 100.0 / allTime);
}
if (Double.isNaN(100 - freqTime * 100.0 / allTime)) {
data3 = 3.14159;
} else if (Double.isInfinite(100 - freqTime * 100.0 / allTime)) {
data3 = 100.0;
} else {
data3 = PubUtils.doubleRound(2, 100 - freqTime * 100.0 / allTime);
}
if (Double.isNaN(100 - thdTime * 100.0 / allTime)) {
data4 = 3.14159;
} else if (Double.isInfinite(100 - thdTime * 100.0 / allTime)) {
data4 = 100.0;
} else {
data4 = PubUtils.doubleRound(2, 100 - thdTime * 100.0 / allTime);
}
if (Double.isNaN(100 - pltTime * 100.0 / allFlickerTime)) {
data5 = 3.14159;
} else if (Double.isInfinite(100 - pltTime * 100.0 / allFlickerTime)) {
data5 = 100.0;
} else {
data5 = PubUtils.doubleRound(2, 100 - pltTime * 100.0 / allFlickerTime);
}
if (Double.isNaN(100 - pltTime * 100.0 / allTime)) {
data6 = 3.14159;
} else if (Double.isInfinite(100 - pltTime * 100.0 / allTime)) {
data6 = 100.0;
} else {
data6 = PubUtils.doubleRound(2, 100 - ubalanceTime * 100.0 / allTime);
}
comAssess.setQualifyData(allTime <= 0 ? 3.14159 : data1);
comAssess.setVDevQualifyData(allTime <= 0 ? 3.14159 : data2);
comAssess.setFreqQualifyData(allTime <= 0 ? 3.14159 : data3);
comAssess.setHarmQualifyData(allTime <= 0 ? 3.14159 : data4);
comAssess.setFlickerQualifyData(allTime <= 0 ? 3.14159 : data5);
comAssess.setUnbalanceQualifyData(allTime <= 0 ? 3.14159 : data6);
} }
} }
return comAssess; return comAssess;