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 0dab0dc..17d35cc 100644 --- a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java @@ -445,63 +445,63 @@ public class PatrolResultServiceImpl implements PatrolResultService { return item; }).collect(Collectors.toList()); -// if ("1".equals(isBase64)) { -// Set images = new HashSet<>(); -// for (MessageData sample : samples) { -// String fitlerDefect = sample.getFitlerDefect(); -// String fitlerDiffBase = sample.getFitlerDiffBase(); -// String mllmDefect = sample.getMllmDefect(); -// String sampleRaw = sample.getSampleRaw(); -// if (StringUtils.isNotBlank(fitlerDefect)) { -// images.add(fitlerDefect); -// } -// if (StringUtils.isNotBlank(fitlerDiffBase)) { -// images.add(fitlerDiffBase); -// } -// if (StringUtils.isNotBlank(mllmDefect)) { -// images.add(mllmDefect); -// } -// if (StringUtils.isNotBlank(sampleRaw)) { -// images.add(sampleRaw); -// } -// -// } -// Map streamHashMap = new HashMap<>(); -// -// for (String algorithmBaseImagePath : images) { -// try { -// sftpClient.downLoad(algorithmBaseImagePath, (inputStream) -> { -// byte[] bytes = streamHashMap.get(algorithmBaseImagePath); -// byte[] byInputStream = getBytesFromInputStream(inputStream); -// if (bytes == null) { -// streamHashMap.put(algorithmBaseImagePath, byInputStream); -// } -// -// }); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } -// for (MessageData sample : samples) { -// String fitlerDefect = sample.getFitlerDefect(); -// String fitlerDiffBase = sample.getFitlerDiffBase(); -// String mllmDefect = sample.getMllmDefect(); -// String sampleRaw = sample.getSampleRaw(); -// if (StringUtils.isNotBlank(fitlerDefect)) { -// sample.setFitlerDefectBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(fitlerDefect, new byte[0]))); -// } -// if (StringUtils.isNotBlank(fitlerDiffBase)) { -// sample.setFitlerDiffBaseBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(fitlerDiffBase, new byte[0]))); -// } -// if (StringUtils.isNotBlank(mllmDefect)) { -// sample.setMllmDefectBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(mllmDefect, new byte[0]))); -// } -// if (StringUtils.isNotBlank(sampleRaw)) { -// sample.setSampleRawBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(sampleRaw, new byte[0]))); -// } -// } -// -// } + if ("1".equals(isBase64)) { + Set images = new HashSet<>(); + for (MessageData sample : samples) { + String fitlerDefect = sample.getFitlerDefect(); + String fitlerDiffBase = sample.getFitlerDiffBase(); + String mllmDefect = sample.getMllmDefect(); + String sampleRaw = sample.getSampleRaw(); + if (StringUtils.isNotBlank(fitlerDefect)) { + images.add(fitlerDefect); + } + if (StringUtils.isNotBlank(fitlerDiffBase)) { + images.add(fitlerDiffBase); + } + if (StringUtils.isNotBlank(mllmDefect)) { + images.add(mllmDefect); + } + if (StringUtils.isNotBlank(sampleRaw)) { + images.add(sampleRaw); + } + + } + Map streamHashMap = new HashMap<>(); + + for (String algorithmBaseImagePath : images) { + try { + sftpClient.downLoad(algorithmBaseImagePath, (inputStream) -> { + byte[] bytes = streamHashMap.get(algorithmBaseImagePath); + byte[] byInputStream = getBytesFromInputStream(inputStream); + if (bytes == null) { + streamHashMap.put(algorithmBaseImagePath, byInputStream); + } + + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + for (MessageData sample : samples) { + String fitlerDefect = sample.getFitlerDefect(); + String fitlerDiffBase = sample.getFitlerDiffBase(); + String mllmDefect = sample.getMllmDefect(); + String sampleRaw = sample.getSampleRaw(); + if (StringUtils.isNotBlank(fitlerDefect)) { + sample.setFitlerDefectBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(fitlerDefect, new byte[0]))); + } + if (StringUtils.isNotBlank(fitlerDiffBase)) { + sample.setFitlerDiffBaseBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(fitlerDiffBase, new byte[0]))); + } + if (StringUtils.isNotBlank(mllmDefect)) { + sample.setMllmDefectBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(mllmDefect, new byte[0]))); + } + if (StringUtils.isNotBlank(sampleRaw)) { + sample.setSampleRawBase64(Base64.getEncoder().encodeToString(streamHashMap.getOrDefault(sampleRaw, new byte[0]))); + } + } + + } messageBody.setOrignCheckData(samples); log.info("samples size: {}", samples.size()); return messageBody;