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) {