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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
caozehui
2025-10-22 15:49:14 +08:00
parent 071c6e3d64 a2de4b80a7
commit 98cca582f6
8 changed files with 43 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -2136,7 +2136,11 @@ public class ResultServiceImpl implements IResultService {
String phases = phaseEntry.getKey();
List<Integer> harmNums = phaseEntry.getValue();
specialCaseDesc.append("第").append(formatHarmNumbers(harmNums, isInterHarmonic)).append("次谐波");
specialCaseDesc.append(phases).append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
// 如果是T相，则不拼接相别
if (!"T相".equals(phases)) {
specialCaseDesc.append(phases);
}
specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
}
}
}
@@ -2360,10 +2364,16 @@ public class ResultServiceImpl implements IResultService {
// 生成无法比较的描述
if (!unComparablePhases.isEmpty()) {
specialCaseDesc.append("注：");
if (unComparablePhases.size() == 1) {
specialCaseDesc.append(unComparablePhases.get(0));
// 如果只有T相，则不拼接相别
if (unComparablePhases.size() == 1 && "T相".equals(unComparablePhases.get(0))) {
// T相不拼接相别
} else {
specialCaseDesc.append(String.join("、", unComparablePhases));
// 其他情况拼接相别
if (unComparablePhases.size() == 1) {
specialCaseDesc.append(unComparablePhases.get(0));
} else {
specialCaseDesc.append(String.join("、", unComparablePhases));
}
}
specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
}