From 97c6e7a1e130d58047c86470bdc0211f5caf6ba5 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 3 Jan 2025 13:29:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=AD=A3=E5=BC=8F=E6=A3=80=E6=B5=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DetectionServiceImpl.java | 51 +++++++++++-------- .../device/err/pojo/po/PqErrSysDtls.java | 2 +- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index cfb2da85..30c2fa84 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -4,6 +4,7 @@ package com.njcn.gather.detection.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.gather.detection.pojo.po.DevData; import com.njcn.gather.detection.pojo.vo.DetectionData; @@ -143,7 +144,7 @@ public class DetectionServiceImpl { * 三相电流不平衡度 */ case "IMBA": - AdNonHarmonicResult iUnban = isUnBalanceOrFlickerQualified(dev, devIdMapComm, pqErrSysDtls, U, sourceIssue, dataRule, "I_UNBAN"); + AdNonHarmonicResult iUnban = isUnBalanceOrFlickerQualified(dev, devIdMapComm, pqErrSysDtls, I, sourceIssue, dataRule, "I_UNBAN"); detectionDataDealService.acceptAdNonResult(Arrays.asList(iUnban),code); return iUnban.getResultFlag(); /** @@ -327,28 +328,37 @@ public class DetectionServiceImpl { result.setSort(sourceIssue.getIndex()); result.setAdType(pqErrSysDtls.get(0).getScriptType()); result.setDataType("avg"); - //取出源所对应的相别信息 - List channelTypeAList = checkData.stream() - .filter(x -> TYPE_A.equals(x.getPhase())) - .collect(Collectors.toList()); - DetectionData a = rangeComparisonList(map.get(TYPE_A), pqErrSysDtls, fData, channelTypeAList.get(0).getValue(), dataRule); - result.setAValue(a.getData() + "_" + a.getIsData()+"_"+a.getResultData()); + if(StrUtil.isBlank(type)){ + //取出源所对应的相别信息 + List channelTypeAList = checkData.stream() + .filter(x -> TYPE_A.equals(x.getPhase())) + .collect(Collectors.toList()); + DetectionData a = rangeComparisonList(map.get(TYPE_A), pqErrSysDtls, fData, channelTypeAList.get(0).getValue(), dataRule); + result.setAValue(a.getData() + "_" + a.getIsData()+"_"+a.getResultData()); - List channelTypeBList = checkData.stream() - .filter(x -> TYPE_B.equals(x.getPhase())) - .collect(Collectors.toList()); - DetectionData b = rangeComparisonList(map.get(TYPE_B), pqErrSysDtls, fData, channelTypeBList.get(0).getValue(), dataRule); - result.setBValue(b.getData() + "_" + b.getIsData()+"_"+b.getResultData()); + List channelTypeBList = checkData.stream() + .filter(x -> TYPE_B.equals(x.getPhase())) + .collect(Collectors.toList()); + DetectionData b = rangeComparisonList(map.get(TYPE_B), pqErrSysDtls, fData, channelTypeBList.get(0).getValue(), dataRule); + result.setBValue(b.getData() + "_" + b.getIsData()+"_"+b.getResultData()); - List channelTypeCList = checkData.stream() - .filter(x -> TYPE_C.equals(x.getPhase())) - .collect(Collectors.toList()); - DetectionData c = rangeComparisonList(map.get(TYPE_C), pqErrSysDtls, fData, channelTypeCList.get(0).getValue(), dataRule); - result.setCValue(c.getData() + "_" + c.getIsData()+"_"+b.getResultData()); - - List numbers = Arrays.asList(a.getIsData(), b.getIsData(), a.getIsData()); - return getAdNonHarmonicResult(result, numbers); + List channelTypeCList = checkData.stream() + .filter(x -> TYPE_C.equals(x.getPhase())) + .collect(Collectors.toList()); + DetectionData c = rangeComparisonList(map.get(TYPE_C), pqErrSysDtls, fData, channelTypeCList.get(0).getValue(), dataRule); + result.setCValue(c.getData() + "_" + c.getIsData()+"_"+b.getResultData()); + List numbers = Arrays.asList(a.getIsData(), b.getIsData(), a.getIsData()); + return getAdNonHarmonicResult(result, numbers); + }else{ + List channelTypeBList = checkData.stream() + .filter(x -> TYPE_T.equals(x.getPhase())) + .collect(Collectors.toList()); + DetectionData t = rangeComparisonList(map.get(TYPE_B), pqErrSysDtls, fData, channelTypeBList.get(0).getValue(), dataRule); + result.setBValue(t.getData() + "_" + t.getIsData()+"_"+t.getResultData()); + List numbers = Arrays.asList(t.getIsData()); + return getAdNonHarmonicResult(result, numbers); + } } @@ -640,6 +650,7 @@ public class DetectionServiceImpl { data.setIsData(4); data.setNum(harm); data.setData(harmDataList.get(0)); + if (ObjectUtil.isNotNull(errSysDtl)) { if (0 == errSysDtl.getErrorValueType()) { errSysDtl.setMaxErrorValue(multiply(errSysDtl.getMaxErrorValue(), fData, 0)); diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java b/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java index 95a69ed2..1c901178 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java +++ b/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java @@ -46,7 +46,7 @@ public class PqErrSysDtls implements Serializable { private Double startValue; /** - * 是否包含起始值 + * 是否包含起始值(0> 1>= 2无) */ private Integer startFlag;