diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java index 4ff5da6..604a162 100644 --- a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java +++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java @@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.modules.experimentalData.domain.TsFiles; +import com.yfd.platform.modules.experimentalData.domain.TsNodes; import com.yfd.platform.modules.experimentalData.domain.TsTask; +import com.yfd.platform.modules.experimentalData.mapper.TsFilesMapper; +import com.yfd.platform.modules.experimentalData.mapper.TsNodesMapper; import com.yfd.platform.modules.experimentalData.mapper.TsTaskMapper; import com.yfd.platform.modules.experimentalData.service.ITsFilesService; import com.yfd.platform.modules.experimentalData.service.ITsNodesService; @@ -60,6 +63,12 @@ public class TsTaskServiceImpl extends ServiceImpl impleme @Resource private ITsFilesService tsFilesService; + @Resource + private TsNodesMapper tsNodesMapper; + + @Resource + private TsFilesMapper tsFilesMapper; + @Resource private StorageSourceContext storageSourceContext; @@ -255,19 +264,30 @@ public class TsTaskServiceImpl extends ServiceImpl impleme //循环所有的ID for (String taskId : dataset) { + //删除项目 + + // 删除节点表 + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(TsNodes::getTaskId, taskId); + tsNodesMapper.delete(deleteWrapper); + + // 删除文件表 + LambdaQueryWrapper deleteWrapperFiles = new LambdaQueryWrapper<>(); + deleteWrapperFiles.eq(TsFiles::getTaskId, taskId); + tsFilesMapper.delete(deleteWrapperFiles); TsTask tsTask = tsTaskMapper.selectById(taskId); - String path = "/" + tsTask.getTaskName() + "/"; - //调用删除节点 根据任务ID - Boolean deleteTsnodes = tsNodesService.deleteTsNodesByTaskId(taskId, path); - //如果删除成功 接着删除节点表数据 - if (deleteTsnodes) { - LOGGER.info("tsNodes表结删除改成功"); - value = true; - } else { - LOGGER.error("tsNodes表结构删除失败"); - value = false; - } +// String path = "/" + tsTask.getTaskName() + "/"; +// //调用删除节点 根据任务ID +// Boolean deleteTsnodes = tsNodesService.deleteTsNodesByTaskId(taskId, path); +// //如果删除成功 接着删除节点表数据 +// if (deleteTsnodes) { +// LOGGER.info("tsNodes表结删除改成功"); +// value = true; +// } else { +// LOGGER.error("tsNodes表结构删除失败"); +// value = false; +// } // 删除 local 中的文件夹 项目文件夹