Browse Source

新增resultImg字段

master
wangguangyuan 5 months ago
parent
commit
d6cc4b2375
2 changed files with 11 additions and 1 deletions
  1. +3
    -0
      src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java
  2. +8
    -1
      src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java

+ 3
- 0
src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java View File

@ -44,6 +44,8 @@ public class MessageData {
private String result; private String result;
private String resultImg;
@Override @Override
public String toString() { public String toString() {
return "MessageData{" + return "MessageData{" +
@ -62,6 +64,7 @@ public class MessageData {
", resValue='" + resValue + '\'' + ", resValue='" + resValue + '\'' +
", phyAssetId='" + phyAssetId + '\'' + ", phyAssetId='" + phyAssetId + '\'' +
", result='" + result + '\'' + ", result='" + result + '\'' +
", resultImg='" + resultImg + '\'' +
'}'; '}';
} }
} }

+ 8
- 1
src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java View File

@ -441,7 +441,14 @@ public class PatrolResultServiceImpl implements PatrolResultService {
if (StringUtils.isEmpty(item.getMllmResultCode())) { if (StringUtils.isEmpty(item.getMllmResultCode())) {
item.setMllmResultCode("0"); 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; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());


Loading…
Cancel
Save