diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java b/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java index c01e168..06a5cc4 100644 --- a/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java +++ b/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java @@ -44,6 +44,8 @@ public class MessageData { private String result; + private String resultImg; + @Override public String toString() { return "MessageData{" + @@ -62,6 +64,7 @@ public class MessageData { ", resValue='" + resValue + '\'' + ", phyAssetId='" + phyAssetId + '\'' + ", result='" + result + '\'' + + ", resultImg='" + resultImg + '\'' + '}'; } } diff --git a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java index 17d35cc..de2e8cc 100644 --- a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java @@ -441,7 +441,14 @@ public class PatrolResultServiceImpl implements PatrolResultService { if (StringUtils.isEmpty(item.getMllmResultCode())) { item.setMllmResultCode("0"); } - item.setResult("0".equals(item.getMllmResultCode()) ? "正常" : "缺陷"); + if ("0".equals(item.getMllmResultCode())) { + item.setResult("正常"); + item.setResultImg(StringUtils.isEmpty(item.getFitlerDefect()) ? item.getSampleRaw() : item.getFitlerDefect()); + } else if ("1".equals(item.getMllmResultCode())) { + item.setResult("缺陷"); + item.setResultImg(item.getMllmDefect()); + } +// item.setResult("0".equals(item.getMllmResultCode()) ? "正常" : "缺陷"); return item; }).collect(Collectors.toList());