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-10-29 09:01:45 +08:00
parent c7d8fc3168
commit 26c5e933f5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,7 +353,7 @@ public class ResultServiceImpl implements IResultService {
unit = ResultUnitEnum.V_ABSOLUTELY.getUnit(); unit = ResultUnitEnum.V_ABSOLUTELY.getUnit();
} }
List<PqScriptDtls> v = scriptDtlIndexList.stream().filter(x -> "VOL".equals(x.getValueType())).collect(Collectors.toList()); List<PqScriptDtls> v = scriptDtlIndexList.stream().filter(x -> "VOL".equals(x.getValueType())).collect(Collectors.toList());
dtlType.setScriptTypeName(dictTree.getName() + "=" + v.get(0).getValue().intValue() + unit); dtlType.setScriptTypeName(dictTree.getName() + "=" + v.get(0).getValue() + unit);
break; break;
/** /**
* 电流 * 电流
@@ -367,7 +367,7 @@ public class ResultServiceImpl implements IResultService {
unitI = ResultUnitEnum.I_ABSOLUTELY.getUnit(); unitI = ResultUnitEnum.I_ABSOLUTELY.getUnit();
} }
List<PqScriptDtls> I = scriptDtlIndexList.stream().filter(x -> "CUR".equals(x.getValueType())).collect(Collectors.toList()); List<PqScriptDtls> I = scriptDtlIndexList.stream().filter(x -> "CUR".equals(x.getValueType())).collect(Collectors.toList());
dtlType.setScriptTypeName(dictTree.getName() + "=" + I.get(0).getValue().intValue() + unitI); dtlType.setScriptTypeName(dictTree.getName() + "=" + I.get(0).getValue() + unitI);
break; break;
/** /**
* 谐波电压 * 谐波电压
@@ -392,7 +392,7 @@ public class ResultServiceImpl implements IResultService {
+ "次" + dictTree.getName()); // + "（含有率为GB/T）" + "次" + dictTree.getName()); // + "（含有率为GB/T）"
} else { } else {
//叠加5%的2次谐波电压 //叠加5%的2次谐波电压
dtlType.setScriptTypeName("叠加" + hv.get(0).getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + hv.get(0).getHarmNum().intValue() + "次" + dictTree.getName()); dtlType.setScriptTypeName("叠加" + hv.get(0).getValue() + ResultUnitEnum.HV.getUnit() + "的" + hv.get(0).getHarmNum().intValue() + "次" + dictTree.getName());
} }
break; break;
/** /**
@@ -426,7 +426,7 @@ public class ResultServiceImpl implements IResultService {
dtlType.setScriptTypeName(a.toString()); dtlType.setScriptTypeName(a.toString());
} else { } else {
//叠加5%的2次谐波电压 //叠加5%的2次谐波电压
dtlType.setScriptTypeName("叠加" + harmInNumList.get(0).getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + harmInNumList.get(0).getHarmNum() + "次" + dictTree.getName()); dtlType.setScriptTypeName("叠加" + harmInNumList.get(0).getValue() + ResultUnitEnum.HV.getUnit() + "的" + harmInNumList.get(0).getHarmNum() + "次" + dictTree.getName());
} }
break; break;
@@ -483,7 +483,7 @@ public class ResultServiceImpl implements IResultService {
}); });
} else { } else {
PqScriptDtls dtls = harmNumVMap.entrySet().iterator().next().getValue().get(0); PqScriptDtls dtls = harmNumVMap.entrySet().iterator().next().getValue().get(0);
a.append(dtls.getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + dtls.getHarmNum().intValue() + ResultUnitEnum.HV.getName()); a.append(dtls.getValue() + ResultUnitEnum.HV.getUnit() + "的" + dtls.getHarmNum().intValue() + ResultUnitEnum.HV.getName());
} }
a.append(","); a.append(",");
if (harmNumIMap.size() > 1) { if (harmNumIMap.size() > 1) {
@@ -502,7 +502,7 @@ public class ResultServiceImpl implements IResultService {
}); });
} else { } else {
PqScriptDtls dtls = harmNumIMap.entrySet().iterator().next().getValue().get(0); PqScriptDtls dtls = harmNumIMap.entrySet().iterator().next().getValue().get(0);
a.append(dtls.getValue().intValue() + ResultUnitEnum.HI.getUnit() + "的" + dtls.getHarmNum().intValue() + "次" + ResultUnitEnum.HI.getName()); a.append(dtls.getValue() + ResultUnitEnum.HI.getUnit() + "的" + dtls.getHarmNum().intValue() + "次" + ResultUnitEnum.HI.getName());
} }
dtlType.setScriptTypeName(a.toString()); dtlType.setScriptTypeName(a.toString());
break; break;