From b2e07ce5c6dbd790e9099ad11c3fd9ce3babf95c Mon Sep 17 00:00:00 2001 From: lilin Date: Wed, 28 May 2025 16:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TsNodesServiceImpl.java | 50 ++++--------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java index 82b9fd8..4455f81 100644 --- a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java +++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java @@ -471,46 +471,18 @@ public class TsNodesServiceImpl extends ServiceImpl impl .map(TsFiles::getId) .collect(Collectors.toList())); } - if (dataset.size() <= 0) { - return true; + if (dataset.size() > 0) { + //批量修改 + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.in(TsFiles::getId, dataset).set(TsFiles::getWorkPath, ""); + tsFilesMapper.update(null, updateWrapper1); + + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.in(TsFiles::getId, dataset) + .and(wrapper -> wrapper.isNull(TsFiles::getBackupPath).or().eq(TsFiles::getBackupPath, "")) + .and(wrapper -> wrapper.isNull(TsFiles::getWorkPath).or().eq(TsFiles::getWorkPath, "")); + tsFilesMapper.delete(deleteWrapper); } - - //批量修改 - LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); - updateWrapper1.in(TsFiles::getId, dataset).set(TsFiles::getWorkPath, ""); - tsFilesMapper.update(null, updateWrapper1); - //批量删除 -// LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); -// deleteWrapper.in(TsFiles::getId, dataset).isNull(TsFiles::getBackupPath).eq(TsFiles::getBackupPath, "").isNull(TsFiles::getWorkPath).eq(TsFiles::getWorkPath, ""); -// tsFilesMapper.delete(deleteWrapper); -// -// LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); -// deleteWrapper.in(TsFiles::getId, dataset) -// .and(wrapper -> wrapper.isNull(TsFiles::getBackupPath).or().eq(TsFiles::getBackupPath, "")) -// .and(wrapper -> wrapper.isNull(TsFiles::getWorkPath).or().eq(TsFiles::getWorkPath, "")); -// tsFilesMapper.delete(deleteWrapper); - - LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); - deleteWrapper.in(TsFiles::getId, dataset) - .and(wrapper -> wrapper.isNull(TsFiles::getBackupPath).or().eq(TsFiles::getBackupPath, "")) - .and(wrapper -> wrapper.isNull(TsFiles::getWorkPath).or().eq(TsFiles::getWorkPath, "")); - tsFilesMapper.delete(deleteWrapper); - -// //批量修改TsFiles表结构 -// if (dataset.size() > 0) { -// QueryWrapper updateWrapper = new QueryWrapper<>(); -// updateWrapper.in("id", dataset); -// // 创建 TsFiles 实体对象,设置要更新的字段 -// TsFiles tsFiles1 = new TsFiles(); -// tsFiles1.setWorkPath(""); // 将 work_path 更新为 "" -// tsFilesMapper.update(tsFiles1, updateWrapper); -// LOGGER.info("tsFiles一共删除 {}跳", dataset.size()); -// } -// -//// // 递归删除子节点 -// deleteChildren(tsNodes.getNodeId(), tsNodes.getTaskId()); - - //删除当前节点的文件夹 todo 这个地方改动 // 删除 sdlocal 中的文件夹 List deleteItemList = new ArrayList<>();