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

fix:创建任务文件夹tagReq传入taskId

Browse Source
This commit is contained in:
zhuxinru
2026-03-12 16:19:13 +08:00
parent 4a6eaa4caa
commit 5d75ce7908
6 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.pagehelper.util.StringUtil;
import com.google.common.collect.Sets;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext;
@@ -463,6 +464,10 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
dirInfo.setTag9(tagReq.getTag9());
dirInfo.setTag10(tagReq.getTag10());
dirInfo.setTaskId(tagReq.getTaskId());
// 兜底 如果文件夹ownType是task 但是tag没传taskId 设置下taskId为relatedResourceUuid
if (StringUtil.isEmpty(tagReq.getTaskId()) && NodeTypeEnum.TASK.getValue().equals(uuIdOwnType)) {
dirInfo.setTaskId(uuid);
}
dirInfo.setRunId(tagReq.getRunId());
}
return dirInfo;

1
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -1701,6 +1701,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
createDirReq.setDirName(dirName);
TagReq tagReq = new TagReq();
BeanUtils.copyProperties(taskNode,tagReq);
tagReq.setTaskId(taskNode.getUuid());
createDirReq.setTagReq(tagReq);
log.info("下发任务调用创建文件夹的参数为：{}", createDirReq);
SdmResponse response = dataClientFeignClient.createDir(createDirReq);

1
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -1758,6 +1758,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
TagReq tagReq = new TagReq();
BeanUtils.copyProperties(taskNode,tagReq);
tagReq.setTaskId(uuid);
createDirReq.setTagReq(tagReq);
log.info("创建任务时，调用创建文件夹的参数为：{}", createDirReq);
SdmResponse response = dataClientFeignClient.createDir(createDirReq);

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

@@ -2573,6 +2573,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
TagReq tagReq = new TagReq();
BeanUtils.copyProperties(taskNode,tagReq);
if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
tagReq.setTaskId(uuid);
}
createDirReq.setTagReq(tagReq);
log.info("创建项目阶段时，调用创建文件夹的参数为：{}", createDirReq);
SdmResponse response = dataClientFeignClient.createDir(createDirReq);

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

@@ -754,6 +754,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
runPerformance.setRunId(simulationRun.getUuid());
runPerformance.setUuid(RandomUtil.generateString(32));
runPerformance.setCompleteStatus(PerformanceStatusEnum.UNANALYZED.getCode());
runPerformance.setResultValue(null);
runPerformance.setCreator(userId);
runPerformance.setCreateTime(null);
runPerformanceList.add(runPerformance);

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

@@ -2565,6 +2565,9 @@ public class TaskServiceImpl implements ITaskService {
createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
TagReq tagReq = new TagReq();
BeanUtils.copyProperties(spdmProjectNodeEditReq,tagReq);
if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
tagReq.setTaskId(uuid);
}
createDirReq.setTagReq(tagReq);
log.info("同步CID任务调用创建文件夹的参数为：{}", createDirReq);
SdmResponse response = dataClientFeignClient.createDir(createDirReq);
@@ -2581,6 +2584,9 @@ public class TaskServiceImpl implements ITaskService {
createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
TagReq tagReq = new TagReq();
BeanUtils.copyProperties(taskNode,tagReq);
if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
tagReq.setTaskId(uuid);
}
createDirReq.setTagReq(tagReq);
log.info("同步CID任务调用创建文件夹的参数为：{}", createDirReq);
SdmResponse response = dataClientFeignClient.createDir(createDirReq);
@@ -2597,6 +2603,9 @@ public class TaskServiceImpl implements ITaskService {
createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
TagReq tagReq = new TagReq();
BeanUtils.copyProperties(task,tagReq);
if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
tagReq.setTaskId(uuid);
}
createDirReq.setTagReq(tagReq);
log.info("批量修改任务时调用创建文件夹的参数为：{}", createDirReq);
SdmResponse response = dataClientFeignClient.createDir(createDirReq);