fix:生成报告文件名去除空格
This commit is contained in:
@@ -1977,7 +1977,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
|
|||||||
SdmResponse<FileMetadataInfoResp> fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq);
|
SdmResponse<FileMetadataInfoResp> fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq);
|
||||||
String originalName = fileBaseInfoResp.getData().getOriginalName();
|
String originalName = fileBaseInfoResp.getData().getOriginalName();
|
||||||
dataFeignClient.downloadFileToLocal(reportTemplateFileId, TEMP_REPORT_PATH + randomId);
|
dataFeignClient.downloadFileToLocal(reportTemplateFileId, TEMP_REPORT_PATH + randomId);
|
||||||
return originalName;
|
return originalName.replaceAll("\\s+", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1985,7 +1985,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
|
|||||||
* @param taskName 任务名称,用作报告文件名前缀
|
* @param taskName 任务名称,用作报告文件名前缀
|
||||||
*/
|
*/
|
||||||
private String generateReportName(String taskName) {
|
private String generateReportName(String taskName) {
|
||||||
String prefix = StringUtils.isNotEmpty(taskName) ? taskName : "report";
|
String prefix = StringUtils.isNotEmpty(taskName) ? taskName.replaceAll("\\s+", "") : "report";
|
||||||
return prefix + "_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + ".docx";
|
return prefix + "_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + ".docx";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2060,10 +2060,11 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
|
|||||||
|
|
||||||
// 归档图片
|
// 归档图片
|
||||||
List<String> imageNames = extractPicNames(reportContent);
|
List<String> imageNames = extractPicNames(reportContent);
|
||||||
|
log.info("[archiveGeneratedReport] imageNames:{}", imageNames);
|
||||||
if (CollectionUtils.isNotEmpty(imageNames)) {
|
if (CollectionUtils.isNotEmpty(imageNames)) {
|
||||||
int sortOrder = 1;
|
int sortOrder = 1;
|
||||||
for (String imageName : imageNames) {
|
for (String imageName : imageNames) {
|
||||||
archiveReportAndImage(null, taskId, runId, randomId, FileBizTypeEnum.CLOUD_FILE, imageName, sortOrder++);
|
archiveReportAndImage(null, taskId, runId, randomId, FileBizTypeEnum.CLOUD_FILE, imageName.replaceAll("\\s+", ""), sortOrder++);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user