From 6040dee5691fd440225cf5c15841edd606aeed15 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 6 Jan 2025 10:34:53 +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 | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 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 e407c0ca..f8273054 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 @@ -113,11 +113,11 @@ public class ResultServiceImpl implements IResultService { public List treeData(ResultParam param) { //根据所有的检测脚本查询出检测信息 List dtlsList = pqScriptDtlsService.list(new MPJLambdaWrapper() - .selectAll(PqScriptDtls.class) - .eq(StrUtil.isNotBlank(param.getScriptId()), PqScriptDtls::getScriptId, param.getScriptId()) - .eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType()) - .ne(PqScriptDtls::getIndex, -1) - .eq(PqScriptDtls::getEnable, DataStateEnum.ENABLE.getCode()) + .selectAll(PqScriptDtls.class) + .eq(StrUtil.isNotBlank(param.getScriptId()), PqScriptDtls::getScriptId, param.getScriptId()) + .eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType()) + .ne(PqScriptDtls::getIndex, -1) + .eq(PqScriptDtls::getEnable, DataStateEnum.ENABLE.getCode()) ); List allResultList = new ArrayList<>(); List indexList = new ArrayList<>(); @@ -182,9 +182,9 @@ public class ResultServiceImpl implements IResultService { subType.setChildren(subTypeList); scriptSubList.add(subType); } else { - dipScriptTypeName(subValue, scriptSubList,finalResultMap, isValueType, "电压暂降测量准确度测试", 20, 85); - dipScriptTypeName(subValue, scriptSubList,finalResultMap, isValueType, "电压暂升测量准确度测试", 110, 180); - dipScriptTypeName(subValue, scriptSubList,finalResultMap, isValueType, "电压中断测量准确度测试", 0, 10); + dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂降测量准确度测试", 20, 85); + dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂升测量准确度测试", 110, 180); + dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压中断测量准确度测试", 0, 10); } }); @@ -240,7 +240,7 @@ public class ResultServiceImpl implements IResultService { return infoVOS; } - private void dipScriptTypeName(List subValue, List subTypeList,Map> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) { + private void dipScriptTypeName(List subValue, List subTypeList, Map> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) { List info = new ArrayList<>(); List dip = subValue.stream() .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase())) @@ -251,7 +251,7 @@ public class ResultServiceImpl implements IResultService { vo.setScriptTypeName(name); TreeDataVO dlt; for (PqScriptDtls dtls : dip) { - if(finalResultMap.containsKey(dtls.getIndex())){ + if (finalResultMap.containsKey(dtls.getIndex())) { dlt = new TreeDataVO(); List scriptDtlIndexList = subValue.stream().filter(x -> dtls.getIndex().equals(x.getIndex())).collect(Collectors.toList()); //特征幅值=20%Un，持续时间=1周波 @@ -780,25 +780,30 @@ public class ResultServiceImpl implements IResultService { @Override public ResultVO resultData(ResultParam param) { - StorageParam storage=new StorageParam(); + StorageParam storage = new StorageParam(); storage.setIndex(param.getIndex()); storage.setScriptId(param.getScriptId()); storage.setDevId(param.getDevId()); storage.setDevNum(param.getDevNum()); storage.setCode(param.getCode()); - List list = pqScriptCheckDataService.list(new MPJLambdaWrapper() - .distinct() - .select(PqScriptCheckData::getHarmNum) - .eq(PqScriptCheckData::getScriptId, param.getScriptId()) - .isNotNull(PqScriptCheckData::getHarmNum) - .eq(PqScriptCheckData::getIndex, param.getIndex()) - ); - List harmNum = list.stream().map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList()); - ResultVO resultVO=new ResultVO(); - if(CollUtil.isEmpty(harmNum)){ + DictTree dictTree = dictTreeService.getById(param.getScriptType()); + List harmNum = new ArrayList<>(); + if (HARMONIC_TYPE_CODE.contains(dictTree.getCode())) { + List list = pqScriptCheckDataService.list(new MPJLambdaWrapper() + .distinct() + .select(PqScriptCheckData::getHarmNum) + .eq(PqScriptCheckData::getScriptId, param.getScriptId()) + .isNotNull(PqScriptCheckData::getHarmNum) + .eq(PqScriptCheckData::getIndex, param.getIndex()) + ); + harmNum = list.stream().sorted(Comparator.comparing(PqScriptCheckData::getHarmNum)) + .map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList()); + } + ResultVO resultVO = new ResultVO(); + if (CollUtil.isEmpty(harmNum)) { resultVO.setRawData(adNonHarmonicService.listNonHarmData(storage)); resultVO.setResultData(adNonHarmonicService.listNonHarmResultData(storage)); - }else{ + } else { storage.setHarmNum(harmNum); resultVO.setRawData(adHarmonicService.listHarmData(storage)); resultVO.setResultData(adHarmonicService.listHarmResultData(storage));