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

fix:编辑报告生成图片重名覆盖&指标完成状态枚举修改

Browse Source
This commit is contained in:
zhuxinru
2026-03-04 16:25:45 +08:00
parent 8f594691a2
commit 4422e32b34
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
View File

@@ -72,6 +72,9 @@ public class KeyResultReq extends BaseReq {
@Schema(description = "文件类型",implementation = FileBizTypeEnum.class)
private Integer fileType;
@Schema(description = "是否需要覆盖同名文件")
private Boolean isConverSameNameFile;
// ----------------------------------------------------------------
// 很重要，用于设置标签，通过autoFillDictTags切面 ，设置dictTagIdsCache

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

@@ -645,7 +645,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
runPerformance.setId(null);
runPerformance.setRunId(simulationRun.getUuid());
runPerformance.setUuid(RandomUtil.generateString(32));
runPerformance.setCompleteStatus(PerformanceStatusEnum.UNCOMPLETED.getCode());
runPerformance.setCompleteStatus(PerformanceStatusEnum.UNANALYZED.getCode());
runPerformance.setCreator(userId);
runPerformance.setCreateTime(null);
runPerformanceList.add(runPerformance);
@@ -941,14 +941,18 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
SdmResponse response = uploadKeyResultFiles(filesReq);
if (response.isSuccess() && response.getData() != null) {
JSONObject result = JSONObject.from(response.getData());
simulationRunKeyResult.setFileId(Long.valueOf((Integer) result.get("fileId")));
Long fileId = Long.valueOf((Integer) result.get("fileId"));
// 如果是同名文件只是执行了覆盖，不新增关键结果
if (simulationKeyResultService.lambdaQuery().eq(SimulationRunKeyResult::getFileId, fileId).count() <= 0) {
simulationRunKeyResult.setFileId(fileId);
if (!simulationKeyResultService.save(simulationRunKeyResult)) {
return SdmResponse.failed("添加关键结果失败");
}
}
} else {
return SdmResponse.failed("上传文件失败");
}
}
if (!simulationKeyResultService.save(simulationRunKeyResult)) {
return SdmResponse.failed("添加关键结果失败");
}
return SdmResponse.success(simulationRunKeyResult.getUuid());
}
@@ -1803,6 +1807,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(fileBizTypeEnum.getValue()));
filesReq.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName()));
filesReq.setIsConverSameNameFile(true);
SdmResponse sdmResponse = uploadKeyResultFiles(filesReq);
if (!sdmResponse.isSuccess()) {
throw new RuntimeException("生成自动化报告上传任务报告结果目录失败");
@@ -1817,6 +1822,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
resultReq.setFile(multipartFile);
resultReq.setFileName(fileName);
resultReq.setFileType(fileBizTypeEnum.getValue());
resultReq.setIsConverSameNameFile(true);
SdmResponse sdmResponse = addSimulationKeyResult(resultReq);
if (!sdmResponse.isSuccess()) {
throw new RuntimeException("生成自动化报告上传算例报告结果目录失败");

4
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -2834,7 +2834,7 @@ public class TaskServiceImpl implements ITaskService {
CommonGetCompleteFromPerformanceVo commonGetCompleteFromPerformanceVo = new CommonGetCompleteFromPerformanceVo();
commonGetCompleteFromPerformanceVo.setNodeName(eachTaskVo.getDiscipline());
commonGetCompleteFromPerformanceVo.setCompleteStatus(StringUtils.isNotBlank(performanceNodePo.getCompleteStatus()) ?
performanceNodePo.getCompleteStatus() : PerformanceStatusEnum.UNCOMPLETED.getCode());
performanceNodePo.getCompleteStatus() : PerformanceStatusEnum.UNANALYZED.getCode());
commonCompleteStatisticsFromPerformance.add(commonGetCompleteFromPerformanceVo);
}
// 按tag分组统计指标状态
@@ -2913,7 +2913,7 @@ public class TaskServiceImpl implements ITaskService {
commonGetCompleteFromPerformanceVo.setTag(resultTagId);
commonGetCompleteFromPerformanceVo.setNodeName(nodeMap.get(resultTagIdArr[resultTagIdArr.length - 1]));
commonGetCompleteFromPerformanceVo.setCompleteStatus(StringUtils.isNotBlank(performanceNodePo.getCompleteStatus()) ?
performanceNodePo.getCompleteStatus() : PerformanceStatusEnum.UNCOMPLETED.getCode());
performanceNodePo.getCompleteStatus() : PerformanceStatusEnum.UNANALYZED.getCode());
commonCompleteStatisticsFromPerformance.add(commonGetCompleteFromPerformanceVo);
}
// 按tag分组统计指标状态