From f9c8c812ee5f36d4b4e3c01da9ac3e5a680b73c2 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 13 Jan 2025 21:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A3=80=E6=B5=8B=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B0=86=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E6=95=B0=E6=8D=AE=E7=9B=B8=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=8E=92=E9=99=A4=E5=9C=A8=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DetectionServiceImpl.java | 17 +++++++------ .../storage/pojo/po/AdHarmonicResult.java | 2 +- .../storage/pojo/po/AdNonHarmonicResult.java | 3 +-- .../impl/DetectionDataServiceImpl.java | 24 ++++++++++--------- 4 files changed, 23 insertions(+), 23 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 a11825f8..3c44a1bb 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 @@ -213,12 +213,13 @@ public class DetectionServiceImpl { result.setSort(sourceIssue.getIndex()); List pqErrSysDtls = new ArrayList<>(); if (CollUtil.isNotEmpty(errDtlsCheckData)) { - result.setAdType(errDtlsCheckData.get(0).getValueType()); - if (CollUtil.isNotEmpty(errDtlsCheckData.get(0).getErrSysDtls())) { - pqErrSysDtls = errDtlsCheckData.get(0).getErrSysDtls(); + List dtlsCheckData = errDtlsCheckData.stream().filter(x -> x.getValueTypeCode().equals(s.split("\\$")[1])).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(dtlsCheckData)) { + result.setAdType(dtlsCheckData.get(0).getValueType()); + if (CollUtil.isNotEmpty(dtlsCheckData.get(0).getErrSysDtls())) { + pqErrSysDtls = dtlsCheckData.get(0).getErrSysDtls(); + } } - }else{ - return 4; } result.setDataType("avg"); if (map.containsKey(TYPE_T)) { @@ -511,16 +512,14 @@ public class DetectionServiceImpl { private Integer setResultFlag(List numbers) { - List isData = numbers.stream().filter(x -> ObjectUtil.isNotNull(x.getData())).map(DetectionData::getIsData).distinct().collect(Collectors.toList()); + List isData = numbers.stream().filter(x -> 4 != x.getIsData()).filter(x -> ObjectUtil.isNotNull(x.getData())).map(DetectionData::getIsData).distinct().collect(Collectors.toList()); return getInteger(isData); } private static Integer getInteger(List isData) { if (CollUtil.isNotEmpty(isData)) { if (isData.size() > 1) { - if (isData.contains(4)) { - return 4; - } else if (isData.contains(2)) { + if (isData.contains(2)) { return 2; } } diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java index 16b1259d..80cba184 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java @@ -55,7 +55,7 @@ public class AdHarmonicResult { private String dataType; /** - * 0.不合格 1.合格 + * 1.合格 2.合格 4.无法处理 */ private Integer resultFlag; diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java index 6cb29cc7..4bcdd4ea 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java @@ -1,6 +1,5 @@ package com.njcn.gather.storage.pojo.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDateTime; @@ -53,7 +52,7 @@ public class AdNonHarmonicResult { private String dataType; /** - * 0.不合格 1.合格 + * 1.合格 2.合格 4.无法处理 */ private Integer resultFlag; diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java index b08f7d8a..19b57240 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java @@ -133,18 +133,20 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl resultFlags) { // 检测结果（0:不符合 1:符合 2:/[未检测无结果]) - resultFlags = resultFlags.stream().distinct().collect(Collectors.toList()); + resultFlags = resultFlags.stream().filter(x->4!=x).distinct().collect(Collectors.toList()); if (CollUtil.isNotEmpty(resultFlags)) { - if (resultFlags.size() > 1) { - if (resultFlags.contains(4)) { - return 2; - } else if (resultFlags.contains(2)) { - return 0; - } - } - return resultFlags.get(0); - } else { - return 2; + if (resultFlags.contains(2)) { + return 0; + }else{ + switch (resultFlags.get(0)){ + case 1: + return 1; + case 2: + return 0; + + } + } } + return 1; } }