From 27fa62eaefce704d275ece601f17853592e20d95 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Wed, 3 Dec 2025 18:02:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=80=92=E5=BD=92=E5=88=A0=E9=99=A4=E5=AD=90?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=B9=B6=E5=88=A0=E9=99=A4=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/NodeServiceImpl.java | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

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 537f3feb..0ad986a5 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
@@ -14,6 +14,7 @@ import com.sdm.common.entity.constants.TagConstant;
 import com.sdm.common.entity.enums.DirTypeEnum;
 import com.sdm.common.entity.enums.NodeTypeEnum;
 import com.sdm.common.entity.req.data.CreateDirReq;
+import com.sdm.common.entity.req.data.DelDirReq;
 import com.sdm.common.entity.req.data.RenameDirReq;
 import com.sdm.common.entity.req.data.UploadFilesReq;
 import com.sdm.common.entity.req.project.*;
@@ -199,10 +200,26 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return SdmResponse.failed("操作节点失败，原因：删除节点时失败！");
             }
+            deleteDirNew(deleteNodeIdList);
         }
         return SdmResponse.success();
     }
 
+    // 删除文件夹
+    public boolean deleteDirNew(List<String> uuidList) {
+        for (String uuid : uuidList) {
+            DelDirReq req = new DelDirReq();
+            req.setDelUuid(uuid);
+            log.info("调用删除文件夹的参数为：{}", req);
+            SdmResponse response = dataClientFeignClient.delDir(req);
+            log.info("调用删除文件夹的返回值为：{}", response);
+            if (response.getCode() != ResultCode.SUCCESS.getCode()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
 
     private boolean deleteNode(List<String> deleteNodeIdList) {
         List<ProjectNodePo> projectNodePoList = nodeMapper.allList(deleteNodeIdList);
@@ -235,7 +252,11 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         List<Long> performanceIdList = performanceNodePoList.stream().map(PerformanceNodePo::getId).toList();
         nodeMapper.deletePerformanceBatch(performanceIdList);
         nodeMapper.deletePerformanceExtraBatch(performanceIdList);
-        return true;
+        List<SpdmNodeVo> childrenNodeList = nodeMapper.getNodeListByNodeIdList(deleteNodeIdList);
+        if (CollectionUtils.isEmpty(childrenNodeList)) {
+            return true;
+        }
+        return deleteNode(childrenNodeList.stream().map(SpdmNodeVo::getUuid).toList());
     }
 
     @Override