From f1340972631c85da9122ad570db848108535569f Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Mon, 17 Nov 2025 09:42:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E4=B8=80=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=AE=97=E6=B3=95=E7=BB=93=E8=AE=BA=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=EF=BC=8C=E7=BB=93=E8=AE=BA=E6=9C=AA=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/analysis/domain/AnalyseResult.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java index bc46639..b5c1d30 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java @@ -10,6 +10,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; @Getter @Setter @@ -42,19 +43,22 @@ public class AnalyseResult implements Serializable { AnalyseResItem resItem = analyseResItem.clone(); resultList.add(resItem); AnalyseReqItem analyseReqItem = analyseRequest.getObjectList().get(i); - AnalyseResPoint resPoint = analyseResItem.getResults().get(0); - if("-9999".equals(resPoint.getValue())) { - resPoint.setValue(""); - } List results = new ArrayList<>(); - resItem.setResults(results); for (String type : analyseReqItem.getTypeList()) { + AnalyseResPoint resPoint = analyseResItem.getResults().get(0); + Optional optional = analyseResItem.getResults().stream().filter(result -> type.equals(Optional.ofNullable(result.getType()).orElse(""))).findFirst(); + if (optional.isPresent()) { + resPoint = optional.get(); + } + if ("-9999".equals(resPoint.getValue())) { + resPoint.setValue(""); + } AnalyseResPoint clone = resPoint.clone(); clone.setType(type); results.add(clone); } + resItem.setResults(results); } - } public void setRequestId(String requestId) {