diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index 33652a75..b84976f9 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -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; @@ -1040,6 +1045,9 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { fileUserPermissionService.getMergedPermission(fileMetadataInfo.getId(), ThreadLocalContext.getUserId()) ); + // 填充文件ta1-tag10的信息 + hierarchyHelper.setTagReqFromFileMetadata(fileMetadataInfo,fileMetadataInfoResp); + return SdmResponse.success(fileMetadataInfoResp); } diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 27f2ba88..34378ccf 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -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); diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index f941119a..46729fb2 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -1758,6 +1758,7 @@ public class NodeServiceImpl extends ServiceImpl standardDeleteTask = new ArrayList<>(); //需要删除标准库的task uuid for(TaskPoolItem taskPoolItem:updateTasks) //删除更新分析项的关联关系 { mapper.deleteTaskFlowRelateByTaskUuid(taskPoolItem.uuid, poolName, currentVersion); + standardDeleteTask.add(taskPoolItem.uuid); //更新的task需要将绑定的标准库删除 } for(String taskUuid:deleteTaskUuids) //删除已删除分析项的关联关系 { mapper.deleteTaskFlowRelateByTaskUuid(taskUuid,poolName,currentVersion); + standardDeleteTask.add(taskUuid);//删除的task需要将绑定的标准库删除 + } + //删除task绑定的标准库 + if(!standardDeleteTask.isEmpty()) { + List deleteFileSimulationMappingReqs = new ArrayList<>(); + for(String taskUuid:standardDeleteTask) + { + DeleteFileSimulationMappingReq req = new DeleteFileSimulationMappingReq(); + req.setSimulationPoolTaskId(taskUuid); + req.setSimulationPoolId(currentBrief.id); + req.setSimulationPoolVersion(currentVersion); + deleteFileSimulationMappingReqs.add(req); + } + simulationMappingFeignClient.deleteFileSimulationMapping(deleteFileSimulationMappingReqs); } //将添加和更新task合并一起后一起添加关联关系,需要检查关系是否重复绑定 addTasks.addAll(updateTasks);