From 8f8d3d38ccbe94ad496182b2f301dce2f034f5c8 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 15 May 2025 15:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E5=8E=9F?= =?UTF-8?q?=E5=88=99-=E6=89=80=E6=9C=89=E5=80=BC=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DetectionServiceImpl.java | 21 ++++++++++++++++++- .../impl/PqScriptCheckDataServiceImpl.java | 14 ++++++++++++- .../service/impl/PqSourceServiceImpl.java | 2 +- 3 files changed, 34 insertions(+), 3 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 b4f81d7e..acac560d 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 @@ -25,6 +25,7 @@ import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; import com.njcn.gather.storage.service.DetectionDataDealService; import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -1015,7 +1016,23 @@ public class DetectionServiceImpl { BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); if (CollUtil.isNotEmpty(qualifiedList)) { - data.setErrorData(devSubtractChannelData(qualifiedList.get(0), channelData, ratedValue, errSysDtl)); + switch (dataRule) { + case AT_WILL_VALUE: + case CP95_VALUE: + case AVG_VALUE: + case SECTION_VALUE: + data.setErrorData(devSubtractChannelData(qualifiedList.get(0), channelData, ratedValue, errSysDtl)); + break; + case Own_value: + if (qualifiedList.size() == harmDataList.size()) { + data.setErrorData(devSubtractChannelData(qualifiedList.get(0), channelData, ratedValue, errSysDtl)); + } else { + List subtract = CollectionUtils.subtract(harmDataList, qualifiedList).stream().collect(Collectors.toList()); + data.setData(subtract.get(0)); + data.setErrorData(devSubtractChannelData(subtract.get(0), channelData, ratedValue, errSysDtl)); + } + break; + } } else { data.setErrorData(devSubtractChannelData(harmDataList.get(0), channelData, ratedValue, errSysDtl)); } @@ -1041,6 +1058,8 @@ public class DetectionServiceImpl { if (qualifiedList.size() == harmDataList.size()) { data.setIsData(1); } else { + List subtract = CollectionUtils.subtract(harmDataList, qualifiedList).stream().collect(Collectors.toList()); + data.setData(subtract.get(0)); data.setIsData(2); } break; diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java index 68407db6..a7f8589b 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java @@ -152,6 +152,18 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl list1 = this.list(wrapper).stream().map(PqScriptCheckData::getScriptIndex).distinct().collect(Collectors.toList()); + for (int i = list1.size() - 1; i >= 0; i--) { + wrapper.clear(); + wrapper.eq(PqScriptCheckData::getScriptId, scriptId); + wrapper.eq(PqScriptCheckData::getScriptIndex, list1.get(i)); + List list = this.list(wrapper); + long count = list.stream().filter(x -> x.getErrorFlag() == 1).count(); + if (count != 0) { + list1.remove(i); + } + } + return list1; } } diff --git a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java index c4e6f007..28bacd8b 100644 --- a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java @@ -96,7 +96,7 @@ public class PqSourceServiceImpl extends ServiceImpl i @Override public List> listAllPqSource(String patternId) { - List pqSourceList = this.lambdaQuery().eq(PqSource::getPattern, patternId).eq(PqSource::getState, DataStateEnum.ENABLE.getCode()).list(); + List pqSourceList = this.lambdaQuery().eq(PqSource::getPattern, patternId).orderByAsc(PqSource::getCreateTime).eq(PqSource::getState, DataStateEnum.ENABLE.getCode()).list(); List> result = pqSourceList.stream().map(pqSource -> { Map map = new HashMap<>(); map.put("id", pqSource.getId());