BY-Team
/
ad-platform
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改回调方式

Browse Source
master
bynt 11 months ago
parent 8a8598321b
commit a9d40fd813
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File

22
ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java
Unescape Escape View File

@ -120,7 +120,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
downResource(bathNo, byTaskName, originalList, responseList); downResource(bathNo, byTaskName, originalList, responseList);
} }
if (byTaskName.getType() == DefaultNumberConstants.FOUR_NUMBER) { if (byTaskName.getType() == DefaultNumberConstants.FOUR_NUMBER) {
downReceptionResource(bathNo, byTaskName, responseList); downReceptionResource(bathNo, byTaskName, originalList);
} }
} }
// 兑换结果失败也将结果返回 // 兑换结果失败也将结果返回
@ -219,7 +219,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
} }
@SneakyThrows @SneakyThrows
private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List<String> responseList) { private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List<List<String>> originalList) {
String uuid = IdUtil.fastSimpleUUID(); String uuid = IdUtil.fastSimpleUUID();
String format = DateUtil.format(DateUtil.date(), DatePattern.NORM_DATE_PATTERN); String format = DateUtil.format(DateUtil.date(), DatePattern.NORM_DATE_PATTERN);
@ -240,12 +240,14 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
Set<String> originSet = read.getRows().stream().map Set<String> originSet = read.getRows().stream().map
(origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet()); (origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
// 追加新内容 // 追加新内容
originSet.addAll(responseList.stream().map originSet.addAll(originalList.stream().map
(str -> EncryptUtil.aesEncrypt(str, AdPlatFormConstants.PLAT_DECRYPTION)).collect(Collectors.toSet())); (str -> str.size() > DefaultNumberConstants.TWO_NUMBER
FileZipUtil.writeToCsv(Lists.newArrayList(originSet), parseFile.getPath(), Boolean.TRUE); ? 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); 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); deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originSet.size(), SecurityConstants.FROM_IN);
FileUtil.del(unzipPath); FileUtil.del(unzipPath);
return; return;
@ -254,8 +256,10 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
String csvPath = file.concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME); String csvPath = file.concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME);
CsvWriter writer = CsvUtil.getWriter(csvPath, CharsetUtil.CHARSET_UTF_8); CsvWriter writer = CsvUtil.getWriter(csvPath, CharsetUtil.CHARSET_UTF_8);
String zipPath = file.concat(FileConstant.ZIP_FILE_SUB_NAME); String zipPath = file.concat(FileConstant.ZIP_FILE_SUB_NAME);
Set<String> stringSet = responseList.stream().map Set<String> stringSet = originalList.stream().map
(str -> EncryptUtil.aesEncrypt(str, AdPlatFormConstants.PLAT_DECRYPTION)).collect(Collectors.toSet()); (str -> str.size() > DefaultNumberConstants.TWO_NUMBER
? str.get(DefaultNumberConstants.TWO_NUMBER) :
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
writer.write(stringSet); writer.write(stringSet);
writer.close(); writer.close();
// 设置压缩文件 // 设置压缩文件
@ -264,7 +268,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
(zipPath.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER); (zipPath.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
FileUtil.del(csvPath); FileUtil.del(csvPath);
String downUrl = deliveryProperties.getDmpDownPath().concat(filePath); 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); 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); redisUtils.set(CacheKey.DMP_TRIPARTITE_URL.concat(format), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
} }

Write Preview
Loading…
Cancel
Save