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-02-26 20:20:48 +08:00
parent 067884e4d3
commit 0962c742a4
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -2572,12 +2572,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return response;
} else {
ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId());
// 构建tagMap，从数据字典查
Map<String, String> TagMap = tagMapService.getTagMapName();
List<TaskNodeTag> tagList = TagMap.entrySet().stream()
.map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
.toList();
getTaskTreeReq.setTagMap(tagList);
setTagMap(getTaskTreeReq);
SdmResponse treeRespond = getTaskTree(getTaskTreeReq);
if (treeRespond.getData() != null) {
String viewContents = JSONObject.toJSONString(treeRespond.getData());
@@ -2609,12 +2604,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return response;
} else {
ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId());
// 构建tagMap，从数据字典查
Map<String, String> TagMap = tagMapService.getTagMapName();
List<TaskNodeTag> tagList = TagMap.entrySet().stream()
.map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
.toList();
getTaskTreeReq.setTagMap(tagList);
setTagMap(getTaskTreeReq);
SdmResponse treeRespond = getTaskTree(getTaskTreeReq);
if (treeRespond.getData() != null) {
String viewContents = JSONObject.toJSONString(treeRespond.getData());
@@ -2634,6 +2624,15 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return SdmResponse.success();
}
private void setTagMap(ProjectTreeTagReq getTaskTreeReq) {
// 构建tagMap，从数据字典查
Map<String, String> TagMap = tagMapService.getTagMapName();
List<TaskNodeTag> tagList = TagMap.entrySet().stream()
.map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
.toList();
getTaskTreeReq.setTagMap(tagList);
}
private void addNewVersion(String projectId, String phaseId, String version, String viewContents, Long userId) {
SimulationDesignVersions designVersions = new SimulationDesignVersions();
designVersions.setProjectId(projectId);

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

@@ -1648,6 +1648,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
}
@Override
@Transactional(rollbackFor = Exception.class)
public SdmResponse editReport(EditReportReq req) {
Long userId = ThreadLocalContext.getUserId();
log.info("编辑报告参数为：{}", req);
@@ -1975,6 +1976,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
}
@Override
@Transactional(rollbackFor = Exception.class)
public void editReportAndDownload(EditReportReq req, HttpServletResponse response) {
Long userId = ThreadLocalContext.getUserId();
log.info("编辑报告参数为：{}", req);
@@ -2619,6 +2621,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
}
@Override
@Transactional(rollbackFor = Exception.class)
public SdmResponse syncKeyResultToTask(KeyResultReq req) {
SimulationRun simulationRun = this.lambdaQuery().eq(SimulationRun::getUuid, req.getRunId()).one();
if (simulationRun == null) {
@@ -2672,8 +2675,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
simulationRunKeyResult.setFileId(response.getData());
taskKeyResultList.add(simulationRunKeyResult);
}
simulationKeyResultService.saveBatch(taskKeyResultList);
}
simulationKeyResultService.saveBatch(taskKeyResultList);
} else {
// 将算例下的指标分析值同步到任务指标
List<SimulationPerformance> runPerformanceList = simulationPerformanceService.lambdaQuery()