From a9d40fd813e904f5fcf7a7e2b75915c49889af63 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Sat, 21 Oct 2023 09:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B0=83=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DmpCallbackServiceImpl.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 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 a38327cc..c3693e76 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 @@ -120,7 +120,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { downResource(bathNo, byTaskName, originalList, responseList); } if (byTaskName.getType() == DefaultNumberConstants.FOUR_NUMBER) { - downReceptionResource(bathNo, byTaskName, responseList); + downReceptionResource(bathNo, byTaskName, originalList); } } // 兑换结果失败也将结果返回 @@ -219,7 +219,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { } @SneakyThrows - private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List responseList) { + private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List> originalList) { String uuid = IdUtil.fastSimpleUUID(); String format = DateUtil.format(DateUtil.date(), DatePattern.NORM_DATE_PATTERN); @@ -240,12 +240,14 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { Set originSet = read.getRows().stream().map (origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet()); // 追加新内容 - originSet.addAll(responseList.stream().map - (str -> EncryptUtil.aesEncrypt(str, AdPlatFormConstants.PLAT_DECRYPTION)).collect(Collectors.toSet())); - FileZipUtil.writeToCsv(Lists.newArrayList(originSet), parseFile.getPath(), Boolean.TRUE); + originSet.addAll(originalList.stream().map + (str -> str.size() > DefaultNumberConstants.TWO_NUMBER + ? str.get(DefaultNumberConstants.TWO_NUMBER) : + str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet())); + FileZipUtil.writeToCsv(Lists.newArrayList(originSet), parseFile.getPath(), Boolean.FALSE); // 设置压缩文件 CompressUtil.decryptionCompression(path, parseFile.getPath(), null); - deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, responseList.size(), bathNo); + deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo); deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originSet.size(), SecurityConstants.FROM_IN); FileUtil.del(unzipPath); return; @@ -254,8 +256,10 @@ 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); - Set stringSet = responseList.stream().map - (str -> EncryptUtil.aesEncrypt(str, AdPlatFormConstants.PLAT_DECRYPTION)).collect(Collectors.toSet()); + Set stringSet = originalList.stream().map + (str -> str.size() > DefaultNumberConstants.TWO_NUMBER + ? str.get(DefaultNumberConstants.TWO_NUMBER) : + str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet()); writer.write(stringSet); writer.close(); // 设置压缩文件 @@ -264,7 +268,7 @@ 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, responseList.size(), bathNo); + 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); }