From 484f9c9f4c6900fba542324bde38ac49ee2a7c86 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 21 Apr 2025 09:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResultServiceImpl.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index fb4db562..da734407 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -1544,13 +1544,10 @@ public class ResultServiceImpl implements IResultService { realDataXiList.addAll(this.toList(nonHarmonicResults, null, true)); } if (CollUtil.isNotEmpty(harmonicResults)) { - DictTree dictTree = dictTreeService.getById(harmonicResults.get(0).getAdType()); - if (ObjectUtil.isNotNull(dictTree)) { - if (DetectionCodeEnum.V2_50.getCode().equals(dictTree.getCode()) || DetectionCodeEnum.I2_50.getCode().equals(dictTree.getCode()) || DetectionCodeEnum.P2_50.getCode().equals(dictTree.getCode())) { - realDataXiList.addAll(this.toList(null, harmonicResults, true)); - } else { - realDataXiList.addAll(this.toList(null, harmonicResults, false)); - } + 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())) { + realDataXiList.addAll(this.toList(null, harmonicResults, true)); + } else { + realDataXiList.addAll(this.toList(null, harmonicResults, false)); } } @@ -1597,16 +1594,15 @@ public class ResultServiceImpl implements IResultService { List sqlDataHarmDTOS = new ArrayList<>(); DevData.SqlDataHarmDTO dataHarmDTO; for (AdHarmonicResult harmonicResult : value) { - DictTree dictTree = dictTreeService.getById(harmonicResult.getAdType()); if (containBaseHarm) { sqlDataDTO = new DevData.SqlDataDTO(); 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()); - } else if (DetectionCodeEnum.I2_50.getCode().equals(dictTree.getCode())) { + } else if (DetectionCodeEnum.I2_50.getCode().equals(harmonicResult.getAdType())) { sqlDataDTO.setDesc(DetectionCodeEnum.I1.getCode()); } else { - sqlDataDTO.setDesc(dictTree.getCode()); + sqlDataDTO.setDesc(harmonicResult.getAdType()); } DevData.SqlDataDTO.ListDTO listDTO = new DevData.SqlDataDTO.ListDTO(); 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.setType(harmonicResult.getDataType()); - dataHarmDTO.setDesc(dictTree.getCode()); + dataHarmDTO.setDesc(harmonicResult.getAdType()); dataHarmDTO.setNum(containBaseHarm ? 49 : 50); DevData.SqlDataHarmDTO.ListDTO listHarmDTO = new DevData.SqlDataHarmDTO.ListDTO(); listHarmDTO.setA(reflectHarmonicValue("a", harmonicResult, containBaseHarm)); @@ -1641,9 +1637,7 @@ public class ResultServiceImpl implements IResultService { }); } -// } return info; - } private List reflectHarmonicValue(String phase, AdHarmonicResult adHarmonicResult, boolean notContainBaseHarm) {