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-21 09:53:15 +08:00
parent 19b69eed0e
commit 484f9c9f4c
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1544,13 +1544,10 @@ public class ResultServiceImpl implements IResultService {
realDataXiList.addAll(this.toList(nonHarmonicResults, null, true)); realDataXiList.addAll(this.toList(nonHarmonicResults, null, true));
} }
if (CollUtil.isNotEmpty(harmonicResults)) { if (CollUtil.isNotEmpty(harmonicResults)) {
DictTree dictTree = dictTreeService.getById(harmonicResults.get(0).getAdType()); if (DetectionCodeEnum.V2_50.getCode().equals(harmonicResults.get(0).getAdType()) || DetectionCodeEnum.I2_50.getCode().equals(harmonicResults.get(0).getAdType()) || DetectionCodeEnum.P2_50.getCode().equals(harmonicResults.get(0).getAdType())) {
if (ObjectUtil.isNotNull(dictTree)) { realDataXiList.addAll(this.toList(null, harmonicResults, true));
if (DetectionCodeEnum.V2_50.getCode().equals(dictTree.getCode()) || DetectionCodeEnum.I2_50.getCode().equals(dictTree.getCode()) || DetectionCodeEnum.P2_50.getCode().equals(dictTree.getCode())) { } else {
realDataXiList.addAll(this.toList(null, harmonicResults, true)); realDataXiList.addAll(this.toList(null, harmonicResults, false));
} else {
realDataXiList.addAll(this.toList(null, harmonicResults, false));
}
} }
} }
@@ -1597,16 +1594,15 @@ public class ResultServiceImpl implements IResultService {
List<DevData.SqlDataHarmDTO> sqlDataHarmDTOS = new ArrayList<>(); List<DevData.SqlDataHarmDTO> sqlDataHarmDTOS = new ArrayList<>();
DevData.SqlDataHarmDTO dataHarmDTO; DevData.SqlDataHarmDTO dataHarmDTO;
for (AdHarmonicResult harmonicResult : value) { for (AdHarmonicResult harmonicResult : value) {
DictTree dictTree = dictTreeService.getById(harmonicResult.getAdType());
if (containBaseHarm) { if (containBaseHarm) {
sqlDataDTO = new DevData.SqlDataDTO(); sqlDataDTO = new DevData.SqlDataDTO();
sqlDataDTO.setType(harmonicResult.getDataType()); sqlDataDTO.setType(harmonicResult.getDataType());
if (DetectionCodeEnum.V2_50.getCode().equals(dictTree.getCode())) { if (DetectionCodeEnum.V2_50.getCode().equals(harmonicResult.getAdType())) {
sqlDataDTO.setDesc(DetectionCodeEnum.U1.getCode()); sqlDataDTO.setDesc(DetectionCodeEnum.U1.getCode());
} else if (DetectionCodeEnum.I2_50.getCode().equals(dictTree.getCode())) { } else if (DetectionCodeEnum.I2_50.getCode().equals(harmonicResult.getAdType())) {
sqlDataDTO.setDesc(DetectionCodeEnum.I1.getCode()); sqlDataDTO.setDesc(DetectionCodeEnum.I1.getCode());
} else { } else {
sqlDataDTO.setDesc(dictTree.getCode()); sqlDataDTO.setDesc(harmonicResult.getAdType());
} }
DevData.SqlDataDTO.ListDTO listDTO = new DevData.SqlDataDTO.ListDTO(); DevData.SqlDataDTO.ListDTO listDTO = new DevData.SqlDataDTO.ListDTO();
listDTO.setA(StrUtil.isNotBlank(harmonicResult.getAValue1()) ? Double.valueOf(harmonicResult.getAValue1()) : null); listDTO.setA(StrUtil.isNotBlank(harmonicResult.getAValue1()) ? Double.valueOf(harmonicResult.getAValue1()) : null);
@@ -1618,7 +1614,7 @@ public class ResultServiceImpl implements IResultService {
dataHarmDTO = new DevData.SqlDataHarmDTO(); dataHarmDTO = new DevData.SqlDataHarmDTO();
dataHarmDTO.setType(harmonicResult.getDataType()); dataHarmDTO.setType(harmonicResult.getDataType());
dataHarmDTO.setDesc(dictTree.getCode()); dataHarmDTO.setDesc(harmonicResult.getAdType());
dataHarmDTO.setNum(containBaseHarm ? 49 : 50); dataHarmDTO.setNum(containBaseHarm ? 49 : 50);
DevData.SqlDataHarmDTO.ListDTO listHarmDTO = new DevData.SqlDataHarmDTO.ListDTO(); DevData.SqlDataHarmDTO.ListDTO listHarmDTO = new DevData.SqlDataHarmDTO.ListDTO();
listHarmDTO.setA(reflectHarmonicValue("a", harmonicResult, containBaseHarm)); listHarmDTO.setA(reflectHarmonicValue("a", harmonicResult, containBaseHarm));
@@ -1641,9 +1637,7 @@ public class ResultServiceImpl implements IResultService {
}); });
} }
// }
return info; return info;
} }
private List<String> reflectHarmonicValue(String phase, AdHarmonicResult adHarmonicResult, boolean notContainBaseHarm) { private List<String> reflectHarmonicValue(String phase, AdHarmonicResult adHarmonicResult, boolean notContainBaseHarm) {