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
2026-06-25 09:35:08 +08:00
parent 4fd813f476
commit 7fd1563f3a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,13 +462,13 @@ public class ResultServiceImpl implements IResultService {
dtlType.setScriptType(scriptDtlIndexList.get(0).getScriptType()); dtlType.setScriptType(scriptDtlIndexList.get(0).getScriptType());
dtlType.setScriptTypeCode(subKey); dtlType.setScriptTypeCode(subKey);
if ("Many-Vol-Harm-InHarm".equals(subKey)) { if ("Many-Vol-Harm-InHarm".equals(subKey)) {
volAndharmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); volAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType);
} }
if ("Many-IMBV-Harm-InHarm".equals(subKey)) { if ("Many-IMBV-Harm-InHarm".equals(subKey)) {
imbvAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); imbvAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType);
} }
if ("Many-Vol-Harm-InHarm".equals(subKey)) { if ("Many-Freq-Harm-InHarm".equals(subKey)) {
volAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); freqAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType);
} }
dtlType.setSourceDesc(ScriptDtlsDesc.getStringBuffer(scriptDtlIndexList, false, isValueType).toString()); dtlType.setSourceDesc(ScriptDtlsDesc.getStringBuffer(scriptDtlIndexList, false, isValueType).toString());
if (finalResultMap.containsKey(index)) { if (finalResultMap.containsKey(index)) {
@@ -1024,7 +1024,7 @@ public class ResultServiceImpl implements IResultService {
} }
} }
private void volAndharmAndInHarmScriptTypeName(List<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) { private void volAndHarmAndInHarmScriptTypeName(List<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) {
ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode()); ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode());
List<PqScriptDtls> f = dtls.stream().filter(x -> "Freq".equals(x.getValueType())).collect(Collectors.toList()); List<PqScriptDtls> f = dtls.stream().filter(x -> "Freq".equals(x.getValueType())).collect(Collectors.toList());
String unit; String unit;
@@ -1185,7 +1185,7 @@ public class ResultServiceImpl implements IResultService {
} }
} }
private void volAndHarmAndInHarmScriptTypeName(List<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) { private void freqAndHarmAndInHarmScriptTypeName(List<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) {
ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode()); ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode());
switch (resultUnitEnumByCode) { switch (resultUnitEnumByCode) {
/** /**