From 3ebbee7b59d0b4c1be7ec764ec9ef7b0f58812fd Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Mon, 1 Aug 2022 11:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=88=A0=E9=99=A4=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?cos=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extRepo/controller/ExtRepoDataController.java  |  6 ++++++
 .../controller/ExtRepoFolderController.java        |  9 +++++++++
 .../extRepo/service/IExtRepoDataService.java       |  8 ++++++++
 .../service/impl/ExtRepoDataServiceImpl.java       | 14 ++++++++++++++
 4 files changed, 37 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
index d35590f6f..4172cf5a9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
@@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.extRepo.entity.ExtRepoData;
 import com.jero.modules.extRepo.entity.ExtRepoDataPage;
 import com.jero.modules.extRepo.service.IExtRepoDataService;
@@ -178,6 +179,7 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) {
                 extRepoDataService.deleteById(id);
+                CosBootUtil.delete(erd.getFileKey());
                 if (CutEnum.CN.getValue().equals(cut)) {
                     return Result.OK("删除成功!");
                 } else {
@@ -219,6 +221,10 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
             }
         }
         this.extRepoDataService.deleteByIds(idsList);
+        for (String id : idsList) {
+            ExtRepoData erd = extRepoDataService.queryById(id);
+            CosBootUtil.delete(erd.getFileKey());
+        }
         if (CutEnum.CN.getValue().equals(cut)) {
             return Result.OK("删除成功!");
         } else {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
index 556a139a9..169f2b8c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
@@ -5,7 +5,9 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.extRepo.entity.ERFTreeData;
+import com.jero.modules.extRepo.entity.ExtRepoData;
 import com.jero.modules.extRepo.entity.ExtRepoFolder;
+import com.jero.modules.extRepo.service.IExtRepoDataService;
 import com.jero.modules.extRepo.service.IExtRepoFolderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,6 +33,9 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
     @Autowired
     private IExtRepoFolderService extRepoFolderService;
 
+    @Autowired
+    private IExtRepoDataService extRepoDataService;
+
     /**
      * 列表查询
      *
@@ -110,6 +115,10 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
         if (extRepoFolderService.haveManageAuth(id)) {
             List<ExtRepoFolder> resList = extRepoFolderService.getListBySupFolder(id);
             if (resList.isEmpty()) {
+                List<ExtRepoData> erdList = extRepoDataService.queryByFolder(id);
+                for (ExtRepoData erd:erdList){
+                    extRepoDataService.deleteById(erd.getId());
+                }
                 extRepoFolderService.deleteById(id);
             } else {
                 if (CutEnum.CN.getValue().equals(cut)) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java
index cb141bd4e..b53f62527 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java
@@ -59,4 +59,12 @@ public interface IExtRepoDataService extends IService<ExtRepoData> {
      * @return
      */
     List<ExtRepoData> queryList();
+
+    /**
+     * 根据文件夹查询
+     *
+     * @param folserId
+     * @return
+     */
+    List<ExtRepoData> queryByFolder(String folserId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java
index 58bbf73cb..a50adc802 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java
@@ -1,6 +1,7 @@
 package com.jero.modules.extRepo.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.extRepo.entity.ExtRepoData;
 import com.jero.modules.extRepo.mapper.ExtRepoDataMapper;
@@ -125,4 +126,17 @@ public class ExtRepoDataServiceImpl extends ServiceImpl<ExtRepoDataMapper, ExtRe
     public List<ExtRepoData> queryList() {
         return list();
     }
+
+    /**
+     * 列表查询
+     *
+     * @param folserId
+     * @return
+     */
+    public List<ExtRepoData> queryByFolder(String folserId) {
+        LambdaQueryWrapper<ExtRepoData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExtRepoData::getSupFolder, folserId);
+        List<ExtRepoData> list = this.list(queryWrapper);
+        return list;
+    }
 }