|
|
|
@ -122,11 +122,9 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
// 异步方式下载
|
|
|
|
|
List<String> finalResponseList = responseList;
|
|
|
|
|
CompletableFuture.runAsync(() -> downResource(bathNo, byTaskName, originalList, finalResponseList));
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, finalResponseList.size(), bathNo);
|
|
|
|
|
}
|
|
|
|
|
if (byTaskName.getType() == DefaultNumberConstants.FOUR_NUMBER) {
|
|
|
|
|
CompletableFuture.runAsync(() -> downReceptionResource(bathNo, byTaskName, originalList));
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 兑换结果失败也将结果返回
|
|
|
|
@ -199,6 +197,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
FileZipUtil.writeToCsv(csvList, parseFile.getPath(), Boolean.TRUE);
|
|
|
|
|
// 设置压缩文件
|
|
|
|
|
CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, responseList.size(), taskName);
|
|
|
|
|
FileUtil.del(unzipPath);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
@ -219,6 +218,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
FileUtil.del(csvPath);
|
|
|
|
|
String downUrl = deliveryProperties.getDmpDownPath().concat(filePath);
|
|
|
|
|
deliveryRecordClient.updatePath(zipPath, downUrl, byTaskName.getDownId(), SecurityConstants.FROM_IN);
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, responseList.size(), taskName);
|
|
|
|
|
redisUtils.set(CacheKey.DMP_DOWN_URL.concat(String.valueOf(byTaskName.getDownId())), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -250,8 +250,8 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
Integer.parseInt(downNum.toString()) + strings.size() : strings.size();
|
|
|
|
|
// 设置压缩文件
|
|
|
|
|
CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
|
|
|
|
|
|
|
|
|
|
deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, size, SecurityConstants.FROM_IN);
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
|
|
|
|
|
redisUtils.set(CacheKey.DMP_TRIPARTITE_NUM.concat(format), size, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
|
|
|
|
|
FileUtil.del(unzipPath);
|
|
|
|
|
return;
|
|
|
|
@ -272,6 +272,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, 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);
|
|
|
|
|
redisUtils.set(CacheKey.DMP_TRIPARTITE_NUM.concat(format), originalList.size(), DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
|
|
|
|
|