|
|
|
@ -237,18 +237,20 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
CsvReader reader = CsvUtil.getReader();
|
|
|
|
|
CsvData read = reader.read(parseFile);
|
|
|
|
|
// 将原始内容解析
|
|
|
|
|
Set<String> originSet = read.getRows().stream().map
|
|
|
|
|
(origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
|
|
|
|
|
List<String> originList = read.getRows().stream().map
|
|
|
|
|
(origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList());
|
|
|
|
|
log.info("=============== the parse the data {} ===============", originList.size());
|
|
|
|
|
// 追加新内容
|
|
|
|
|
originSet.addAll(originalList.stream().map
|
|
|
|
|
originList.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);
|
|
|
|
|
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);
|
|
|
|
|
// 设置压缩文件
|
|
|
|
|
CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
|
|
|
|
|
deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originSet.size(), SecurityConstants.FROM_IN);
|
|
|
|
|
deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originList.size(), SecurityConstants.FROM_IN);
|
|
|
|
|
FileUtil.del(unzipPath);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
@ -256,11 +258,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);
|
|
|
|
|
Set<String> stringSet = originalList.stream().map
|
|
|
|
|
List<String> stringList = 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);
|
|
|
|
|
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList());
|
|
|
|
|
writer.write(stringList);
|
|
|
|
|
writer.close();
|
|
|
|
|
// 设置压缩文件
|
|
|
|
|
CompressUtil.decryptionCompression(zipPath, csvPath, null);
|
|
|
|
@ -268,8 +270,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, stringSet.size(), bathNo);
|
|
|
|
|
deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringSet.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN);
|
|
|
|
|
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringList.size(), bathNo);
|
|
|
|
|
deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringList.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN);
|
|
|
|
|
redisUtils.set(CacheKey.DMP_TRIPARTITE_URL.concat(format), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|