ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-04-23 15:30:24 +08:00
parent ea585a65ff
commit e42a2c8309
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
View File

@@ -125,6 +125,7 @@ public class DetectionServiceImpl {
* 间谐波 * 间谐波
*/ */
case HSV: case HSV:
case HSI:
AdHarmonicResult harmInV = isHarmQualified(dev, devIdMapComm, errDtlsCheckData, U, sourceIssue, dataRule, 1); AdHarmonicResult harmInV = isHarmQualified(dev, devIdMapComm, errDtlsCheckData, U, sourceIssue, dataRule, 1);
AdHarmonicResult harmInI = isHarmQualified(dev, devIdMapComm, errDtlsCheckData, I, sourceIssue, dataRule, 1); AdHarmonicResult harmInI = isHarmQualified(dev, devIdMapComm, errDtlsCheckData, I, sourceIssue, dataRule, 1);
return resultFlag(harmInV, harmInI, code); return resultFlag(harmInV, harmInI, code);

18
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -1249,15 +1249,15 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
double bBaseValue = baseValue; double bBaseValue = baseValue;
double cBaseValue = baseValue; double cBaseValue = baseValue;
// if (!aBase.equals(StrPool.SLASH)) { if (!aBase.equals(StrPool.SLASH)) {
// aBaseValue = Double.parseDouble(aBase); aBaseValue = Double.parseDouble(aBase);
// } }
// if (!bBase.equals(StrPool.SLASH)) { if (!bBase.equals(StrPool.SLASH)) {
// bBaseValue = Double.parseDouble(bBase); bBaseValue = Double.parseDouble(bBase);
// } }
// if (!cBase.equals(StrPool.SLASH)) { if (!cBase.equals(StrPool.SLASH)) {
// cBaseValue = Double.parseDouble(cBase); cBaseValue = Double.parseDouble(cBase);
// } }
dataModelMap.put("${" + index + "#" + key + "#A#2}", devValue(adHarmonicResult.getAValue2(), aBaseValue, percent)); dataModelMap.put("${" + index + "#" + key + "#A#2}", devValue(adHarmonicResult.getAValue2(), aBaseValue, percent));
dataModelMap.put("${" + index + "#" + key + "#B#2}", devValue(adHarmonicResult.getBValue2(), bBaseValue, percent)); dataModelMap.put("${" + index + "#" + key + "#B#2}", devValue(adHarmonicResult.getBValue2(), bBaseValue, percent));

BIN
entrance/src/main/resources/model/report_table.docx
View File

Binary file not shown.