toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2026-03-23 15:06:44 +08:00
parent 020dca8696 d78e7cfc2e
commit 54b4467ef3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -1977,7 +1977,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
SdmResponse<FileMetadataInfoResp> fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq);
String originalName = fileBaseInfoResp.getData().getOriginalName();
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 任务名称，用作报告文件名前缀
*/
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";
}
@@ -2060,10 +2060,11 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
// 归档图片
List<String> imageNames = extractPicNames(reportContent);
log.info("[archiveGeneratedReport] imageNames:{}", imageNames);
if (CollectionUtils.isNotEmpty(imageNames)) {
int sortOrder = 1;
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++);
}
}
}