1、调整数据总览新增节点和任务的逻辑

This commit is contained in:
2025-12-29 16:12:26 +08:00
parent d7e2c6ca78
commit 44733b07fb

View File

@@ -1358,7 +1358,13 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
)
));
log.info("tagMap为{}",tagMap);
List<SpdmProjectNodeEditReq> result = addNodeForData(req.getAddNodeList(), tagMap);
List<SpdmProjectNodeEditReq> result;
try {
result = addNodeForData(req.getAddNodeList(), tagMap);
}catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return SdmResponse.failed(e.getMessage());
}
if (CollectionUtils.isEmpty(result)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return SdmResponse.failed("数据总览新增节点失败!");
@@ -1453,11 +1459,18 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
log.error("保存节点额外信息失败");
return null;
}
SdmResponse createDirResult;
for (SpdmProjectNodeEditReq projectNode : topNodeList) {
createDir(projectNode.getUuid(), projectNode.getNodeType(), null, projectNode.getNodeName());
createDirResult = createDir(projectNode.getUuid(), projectNode.getNodeType(), null, projectNode.getNodeName());
if (createDirResult.getCode() != ResultCode.SUCCESS.getCode()) {
throw new RuntimeException(createDirResult.getMessage());
}
}
for (SpdmProjectNodeEditReq projectNode : nodeList) {
createDir(projectNode.getUuid(), projectNode.getNodeType(), projectNode.getPid(), projectNode.getNodeName());
createDirResult = createDir(projectNode.getUuid(), projectNode.getNodeType(), projectNode.getPid(), projectNode.getNodeName());
if (createDirResult.getCode() != ResultCode.SUCCESS.getCode()) {
throw new RuntimeException(createDirResult.getMessage());
}
}
return addNodeList;
}
@@ -1502,10 +1515,17 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public SdmResponse addTaskForData(SpdmTaskReq req) {
log.info("addTaskForData参数为{}",req);
List<TaskNode> result = handleAddTaskForData(req.getAddTaskList());
List<TaskNode> result;
try {
result = handleAddTaskForData(req.getAddTaskList());
}catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return SdmResponse.failed(e.getMessage());
}
if (CollectionUtils.isEmpty(result)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return SdmResponse.failed("数据总览新增任务失败!");
@@ -1567,8 +1587,12 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
log.error("保存任务额外信息失败");
return null;
}
SdmResponse createDirResult;
for (TaskNode taskNode : addTaskList) {
createDir(taskNode.getUuid(), taskNode.getNodeType(), taskNode.getPid(), taskNode.getNodeName());
createDirResult = createDir(taskNode.getUuid(), taskNode.getNodeType(), taskNode.getPid(), taskNode.getNodeName());
if (createDirResult.getCode() != ResultCode.SUCCESS.getCode()) {
throw new RuntimeException(createDirResult.getMessage());
}
}
return addTaskList;
}