删除品牌
This commit is contained in:
+6
-5
@@ -123,8 +123,7 @@ public class SplitRunService {
|
||||
if (!allChunkResults.isEmpty()) {
|
||||
File zipFile = packageTaskSplitResultsAsZip(request.getArchiveName(), successSourceNames, allChunkResults);
|
||||
String ossObjectKey = ossStorageService.uploadResultFile(zipFile, MODULE_TYPE);
|
||||
String downloadUrl = ossStorageService.generateDownloadUrl(ossObjectKey);
|
||||
|
||||
// 只存 objectKey
|
||||
SplitResultItemVo item = new SplitResultItemVo();
|
||||
item.setSourceFilename(folderMode && request.getArchiveName() != null && !request.getArchiveName().isBlank()
|
||||
? request.getArchiveName()
|
||||
@@ -132,7 +131,7 @@ public class SplitRunService {
|
||||
item.setOutputFilename(zipFile.getName());
|
||||
item.setSuccess(true);
|
||||
item.setRowCount(allChunkResults.stream().mapToInt(TaskSplitChunkResult::rowCount).sum());
|
||||
item.setDownloadUrl(downloadUrl);
|
||||
item.setDownloadUrl(ossStorageService.generateFreshDownloadUrl(ossObjectKey));
|
||||
item.setEntryCount(allChunkResults.size());
|
||||
item.setEntries(allChunkResults.stream().map(this::toArchiveEntry).toList());
|
||||
|
||||
@@ -141,7 +140,7 @@ public class SplitRunService {
|
||||
resultEntity.setModuleType(MODULE_TYPE);
|
||||
resultEntity.setSourceFilename(item.getSourceFilename());
|
||||
resultEntity.setResultFilename(zipFile.getName());
|
||||
resultEntity.setResultFileUrl(downloadUrl);
|
||||
resultEntity.setResultFileUrl(ossObjectKey); // 存 objectKey
|
||||
resultEntity.setResultFileSize(zipFile.length());
|
||||
resultEntity.setResultContentType(ZIP_CONTENT_TYPE);
|
||||
resultEntity.setRowCount(item.getRowCount());
|
||||
@@ -179,7 +178,9 @@ public class SplitRunService {
|
||||
vo.setResultId(entity.getId());
|
||||
vo.setSourceFilename(entity.getSourceFilename());
|
||||
vo.setOutputFilename(entity.getResultFilename());
|
||||
vo.setDownloadUrl(entity.getSuccess() != null && entity.getSuccess() == 1 ? entity.getResultFileUrl() : null);
|
||||
vo.setDownloadUrl(entity.getSuccess() != null && entity.getSuccess() == 1
|
||||
? ossStorageService.generateFreshDownloadUrl(entity.getResultFileUrl())
|
||||
: null);
|
||||
vo.setRowCount(entity.getRowCount());
|
||||
vo.setSuccess(entity.getSuccess() != null && entity.getSuccess() == 1);
|
||||
vo.setError(entity.getErrorMessage());
|
||||
|
||||
Reference in New Issue
Block a user