From 5d3c27f75a529207c54c75e181c31682b259b896 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Thu, 9 Nov 2023 11:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=BB=E9=87=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DmpCallbackServiceImpl.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java index d924d9be..8521c111 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java @@ -234,23 +234,17 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { File unzipFile = new File(unzipPath); File parseFile = Objects.requireNonNull (unzipFile.listFiles())[DefaultNumberConstants.ZERO_NUMBER]; - CsvReader reader = CsvUtil.getReader(); - CsvData read = reader.read(parseFile); - // 将原始内容解析 - List originList = read.getRows().stream().map - (origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList()); - log.info("=============== the parse the data {} ===============", originList.size()); // 追加新内容 - originList.addAll(originalList.stream().map + Set strings = originalList.stream().map (str -> str.size() > DefaultNumberConstants.TWO_NUMBER ? str.get(DefaultNumberConstants.TWO_NUMBER) : - str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList())); - log.info("=============== the addition the data {} ===============", originalList.size()); - FileZipUtil.writeToCsv(Lists.newArrayList(originList), parseFile.getPath(), Boolean.FALSE); + str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet()); + log.info("=============== the addition the data {} ===============", strings.size()); + FileZipUtil.writeToCsv(Lists.newArrayList(strings), parseFile.getPath(), Boolean.TRUE); // 设置压缩文件 CompressUtil.decryptionCompression(path, parseFile.getPath(), null); deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo); - deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originList.size(), SecurityConstants.FROM_IN); + deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, strings.size(), SecurityConstants.FROM_IN); FileUtil.del(unzipPath); return; } @@ -258,11 +252,11 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { String csvPath = file.concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME); CsvWriter writer = CsvUtil.getWriter(csvPath, CharsetUtil.CHARSET_UTF_8); String zipPath = file.concat(FileConstant.ZIP_FILE_SUB_NAME); - List stringList = originalList.stream().map + Set stringSet = originalList.stream().map (str -> str.size() > DefaultNumberConstants.TWO_NUMBER ? str.get(DefaultNumberConstants.TWO_NUMBER) : - str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList()); - writer.write(stringList); + str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet()); + writer.write(stringSet); writer.close(); // 设置压缩文件 CompressUtil.decryptionCompression(zipPath, csvPath, null); @@ -270,8 +264,8 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { (zipPath.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER); FileUtil.del(csvPath); String downUrl = deliveryProperties.getDmpDownPath().concat(filePath); - deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringList.size(), bathNo); - deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringList.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN); + deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringSet.size(), bathNo); + deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringSet.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN); redisUtils.set(CacheKey.DMP_TRIPARTITE_URL.concat(format), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS); }