删除去重代码

master
bynt 11 months ago
parent af7f3243c2
commit 5d3c27f75a

@ -234,23 +234,17 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
File unzipFile = new File(unzipPath); File unzipFile = new File(unzipPath);
File parseFile = Objects.requireNonNull File parseFile = Objects.requireNonNull
(unzipFile.listFiles())[DefaultNumberConstants.ZERO_NUMBER]; (unzipFile.listFiles())[DefaultNumberConstants.ZERO_NUMBER];
CsvReader reader = CsvUtil.getReader();
CsvData read = reader.read(parseFile);
// 将原始内容解析
List<String> originList = read.getRows().stream().map
(origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList());
log.info("=============== the parse the data {} ===============", originList.size());
// 追加新内容 // 追加新内容
originList.addAll(originalList.stream().map Set<String> strings = originalList.stream().map
(str -> str.size() > DefaultNumberConstants.TWO_NUMBER (str -> str.size() > DefaultNumberConstants.TWO_NUMBER
? str.get(DefaultNumberConstants.TWO_NUMBER) : ? str.get(DefaultNumberConstants.TWO_NUMBER) :
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList())); str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
log.info("=============== the addition the data {} ===============", originalList.size()); log.info("=============== the addition the data {} ===============", strings.size());
FileZipUtil.writeToCsv(Lists.newArrayList(originList), parseFile.getPath(), Boolean.FALSE); FileZipUtil.writeToCsv(Lists.newArrayList(strings), parseFile.getPath(), Boolean.TRUE);
// 设置压缩文件 // 设置压缩文件
CompressUtil.decryptionCompression(path, parseFile.getPath(), null); CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo); deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originList.size(), SecurityConstants.FROM_IN); deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, strings.size(), SecurityConstants.FROM_IN);
FileUtil.del(unzipPath); FileUtil.del(unzipPath);
return; return;
} }
@ -258,11 +252,11 @@ 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);
List<String> stringList = originalList.stream().map Set<String> stringSet = originalList.stream().map
(str -> str.size() > DefaultNumberConstants.TWO_NUMBER (str -> str.size() > DefaultNumberConstants.TWO_NUMBER
? str.get(DefaultNumberConstants.TWO_NUMBER) : ? str.get(DefaultNumberConstants.TWO_NUMBER) :
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList()); str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
writer.write(stringList); writer.write(stringSet);
writer.close(); writer.close();
// 设置压缩文件 // 设置压缩文件
CompressUtil.decryptionCompression(zipPath, csvPath, null); CompressUtil.decryptionCompression(zipPath, csvPath, null);
@ -270,8 +264,8 @@ 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, stringList.size(), bathNo); deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringSet.size(), bathNo);
deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringList.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);
} }

Loading…
Cancel
Save