|
|
|
@ -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<String> responseList) {
|
|
|
|
|
private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List<List<String>> 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<String> 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<String> stringSet = responseList.stream().map
|
|
|
|
|
(str -> EncryptUtil.aesEncrypt(str, AdPlatFormConstants.PLAT_DECRYPTION)).collect(Collectors.toSet());
|
|
|
|
|
Set<String> 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);
|
|
|
|
|
}
|
|
|
|
|