From facd67a69ab07a616bff34dec3bd57c9709214ca Mon Sep 17 00:00:00 2001 From: wujingtao Date: Mon, 9 Aug 2021 19:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4for=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FormdataServiceImpl.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java index bcbdeb4..c66071f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/formdata/service/impl/FormdataServiceImpl.java @@ -52,9 +52,11 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import static java.util.stream.Collectors.toMap; import static me.zhengjie.modules.constant.FileConstant.SPLIT_FILE_SYMBOL; /** @@ -226,23 +228,20 @@ public class FormdataServiceImpl implements FormdataService { */ @Override public void uploadOOS(MultipartFile file, List list) { - List wavList = zipUtil(file); - for (WavDTO wavDTO : wavList) { - for (FormdataDto info : list) { - if (wavDTO.getName().equals(info.getPhone())) { - //上传路径 - String newFileName = buildPathUtils.buildFileOosPath(wavDTO.getSubFixFile()); - OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - ossClient.putObject(bucketName, newFileName, wavDTO.getLine()); - ossClient.shutdown(); - OosDTO oosDTO = toBean(info, newFileName); - //发送下游 - transFormDataTask.doRunTask(oosDTO); - } + Map map = list.stream().collect(toMap(FormdataDto::getPhone, p -> p)); + for (WavDTO wav : wavList) { + if (map.containsKey(wav.getName())) { + //上传路径 + String newFileName = buildPathUtils.buildFileOosPath(wav.getSubFixFile()); + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); + ossClient.putObject(bucketName, newFileName, wav.getLine()); + ossClient.shutdown(); + OosDTO oosDTO = toBean(map.get(wav.getName()), newFileName); + //发送下游 + transFormDataTask.doRunTask(oosDTO); } } - } private List zipUtil(MultipartFile file) {