From 2b2bde61cdbd5d5f693dd95bfd486d1b1f2fe67e Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 28 Aug 2025 09:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mm/AdminResourceController.java           | 119 +++++++-----------
 1 file changed, 45 insertions(+), 74 deletions(-)

diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java
index d6c8c75..c826dd9 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -59,6 +58,9 @@ public class AdminResourceController {
      *
      * 资源新增或修改
      *
+     *
+     * 这里包含移动
+     *
      */
     @RequestMapping("/addOrUpdate")
     public R addOrUpdate(@RequestBody List<VvResourceEntity> resourceAddOrUpdateRequests) {
@@ -73,7 +75,6 @@ public class AdminResourceController {
         return R.ok("保存成功");
     }
 
-
     /***
      * 资源排序
      * @param vvAdminResourceSortRequest
@@ -98,42 +99,32 @@ public class AdminResourceController {
     public R delete(@RequestBody VvAdminResourceDeleteRequest adminResourceDeleteRequest) {
         for (Long resourceId : adminResourceDeleteRequest.getResourceIds()) {
 
-            doChildDelete(resourceId);
 
-            vvResourceDao.deleteVvResourceById(resourceId);
+            doBatchDelete(resourceId);
+
         }
         return R.ok("删除成功");
     }
 
-
-    public void doChildDelete(Long resourceId) {
-        List<VvResourceEntity> vvResourceList = new ArrayList<>();
-        getAllResourceList(resourceId, vvResourceList);
-
-        for (VvResourceEntity vvResourceEntity : vvResourceList) {
-            vvResourceDao.deleteVvResourceById(vvResourceEntity.getId());
-        }
+    public void doBatchDelete(Long resourceId) {
+        VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
+        getChildResourceList(vvResourceEntity);
+        doDeleteChild(vvResourceEntity);
     }
 
 
-    public void getAllResourceList(Long parentId, List<VvResourceEntity> vvResourceList) {
-
-        List<VvResourceEntity> vvResourceEntities = vvResourceDao.selectByParentId(parentId);
-
-        if (CollectionUtils.isEmpty(vvResourceEntities) || vvResourceEntities.size() == 0) {
+    public void doDeleteChild(VVResourceDTO vvResourceDTO) {
+        vvResourceDao.deleteVvResourceById(vvResourceDTO.getId());
 
+        if (CollectionUtils.isEmpty(vvResourceDTO.getChildList())) {
             return;
         }
 
-        vvResourceList.addAll(vvResourceEntities);
-
-        for (VvResourceEntity vvResourceEntity : vvResourceEntities) {
-
-            getAllResourceList(vvResourceEntity.getId(), vvResourceList);
+        for (VVResourceDTO vvResourceEntity : vvResourceDTO.getChildList()) {
+            doDeleteChild(vvResourceEntity);
         }
     }
 
-
     /***
      * 资源复制
      *
@@ -159,12 +150,7 @@ public class AdminResourceController {
 
         VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
 
-        List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(resourceId);
-
-        getChildResourceList(vvResourceEntities);
-
-
-        vvResourceEntity.setChildList(vvResourceEntities);
+        getChildResourceList(vvResourceEntity);
 
 
         return R.ok().setData(vvResourceEntity);
@@ -173,62 +159,47 @@ public class AdminResourceController {
 
 
     public void doCopy(Long resourceId, Long parentId) {
-
-
-        VvResourceEntity vvResourceEntity = vvResourceDao.selectVvResourceById(resourceId);
-
-        List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(resourceId);
-
-        vvResourceEntity.setId(null);
+        VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
         vvResourceEntity.setParentId(parentId);
-        vvResourceDao.insertVvResource(vvResourceEntity);
-
-        getChildResourceList(vvResourceEntities);
-
-
-        doAddChild(vvResourceEntity.getId(), vvResourceEntities);
-
-
 
+        getChildResourceList(vvResourceEntity);
 
+        doAddChild(vvResourceEntity);
 
     }
 
-    public void doAddChild(Long parentId, List<VVResourceDTO> vvResourceEntities) {
+    public void doAddChild(VVResourceDTO vvResourceDTO) {
+        vvResourceDTO.setId(null);
+        vvResourceDao.insertVvResource(vvResourceDTO);
+
+        if (CollectionUtils.isEmpty(vvResourceDTO.getChildList())) {
+
+            return;
+        }
+
+        for (VVResourceDTO vvResourceEntity : vvResourceDTO.getChildList()) {
+            vvResourceEntity.setParentId(vvResourceDTO.getId());
+            doAddChild(vvResourceEntity);
+        }
+    }
+
+
+    public void getChildResourceList(VVResourceDTO vvResourceDTO) {
+
+        List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(vvResourceDTO.getId());
+
+        if (CollectionUtils.isEmpty(vvResourceEntities)) {
+
+            return;
+        }
+
+        vvResourceDTO.setChildList(vvResourceEntities);
 
         for (VVResourceDTO vvResourceEntity : vvResourceEntities) {
 
-            vvResourceEntity.setId(null);
-
-            vvResourceEntity.setParentId(parentId);
-
-            vvResourceDao.insertVvResource(vvResourceEntity);
-
-            if (CollectionUtils.isEmpty(vvResourceEntity.getChildList())) {
-
-                continue;
-            }
-
-            doAddChild(vvResourceEntity.getId(), vvResourceEntity.getChildList());
+            getChildResourceList(vvResourceEntity);
         }
-    }
 
-
-    public void getChildResourceList(List<VVResourceDTO> vvResourceList) {
-        for (VVResourceDTO vvResourceDTO : vvResourceList) {
-
-            List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(vvResourceDTO.getId());
-
-            if (CollectionUtils.isEmpty(vvResourceEntities)) {
-
-                continue;
-            }
-
-            vvResourceDTO.setChildList(vvResourceEntities);
-
-            getChildResourceList(vvResourceEntities);
-
-        }
     }
 
 }