From a7281a90a7443d097cf1acc4de4e597d94ae0f2d Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Wed, 26 Apr 2023 09:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B1=9F-=E4=B8=89=E6=B1=9F=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=8E=AF=E4=BF=9D=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?-=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4/=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SjSafeEnvironmentFileController.java      |  8 ++------
 .../ISjSafeEnvironmentFileService.java        |  4 +++-
 .../SjSafeEnvironmentFileServiceImpl.java     | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java
index a199dc30c..dc6b964e2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java
@@ -99,8 +99,7 @@ public class SjSafeEnvironmentFileController {
     @ApiOperation(value = "批量删除文件", notes = "批量删除文件", httpMethod = "POST")
     @RequestMapping(value = "/batchDeleteFile", method = RequestMethod.POST)
     public Result<String> batchDeleteFile(@RequestBody List<SjSafeEnvironmentFile> list) {
-        sjSafeEnvironmentFileService.batchDeleteFile(list);
-        return Result.ok();
+        return sjSafeEnvironmentFileService.batchDeleteFile(list);
     }
 
     @OperLog(operModul = "项目文件管理", operType = "删除文件", operDesc = "删除文件")
@@ -121,10 +120,7 @@ public class SjSafeEnvironmentFileController {
     @ApiOperation(value = "文件移动", notes = "可以移动文件或者目录", httpMethod = "POST")
     @RequestMapping(value = "/batchmovefile", method = RequestMethod.POST)
     public Result<String> batchMoveFile(@RequestBody List<SjSafeEnvironmentFile> list) {
-        for (SjSafeEnvironmentFile sjSafeEnvironmentFile : list) {
-            sjSafeEnvironmentFileService.moveFile(sjSafeEnvironmentFile);
-        }
-        return Result.ok();
+        return sjSafeEnvironmentFileService.batchMoveFile(list);
     }
 
     @ApiOperation(value = " 获取文件树", notes = "文件移动的时候需要用到该接口，用来展示目录树，展示机制为饱汉模式", httpMethod = "POST")
diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileService.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileService.java
index b6ee6f3b6..1e3197a24 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileService.java
@@ -22,7 +22,7 @@ public interface ISjSafeEnvironmentFileService extends IService<SjSafeEnvironmen
 
     Result<SjSafeEnvironmentFile> renamefile(SjSafeEnvironmentFile sjSafeEnvironmentFile);
 
-    void batchDeleteFile(List<SjSafeEnvironmentFile> list);
+    Result<String> batchDeleteFile(List<SjSafeEnvironmentFile> list);
 
     Result<String> deleteFile(SjSafeEnvironmentFile sjSafeEnvironmentFile);
 
@@ -31,4 +31,6 @@ public interface ISjSafeEnvironmentFileService extends IService<SjSafeEnvironmen
     Result<UploadFileVo> uploadFile(HttpServletRequest request, UploadFileDTO uploadFileDto);
 
     Result<List<SjSafeEnvironmentFile>> getFileList(Map<String, Object> map);
+
+    Result<String> batchMoveFile(List<SjSafeEnvironmentFile> list);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java
index 2dc9df5bb..dc30cb329 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java
@@ -115,10 +115,14 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl<SjSafeEnvironm
     }
 
     @Override
-    public void batchDeleteFile(List<SjSafeEnvironmentFile> list) {
+    public Result batchDeleteFile(List<SjSafeEnvironmentFile> list) {
         for (SjSafeEnvironmentFile sjSafeEnvironmentFile : list) {
-            deleteFile(sjSafeEnvironmentFile);
+            Result result = deleteFile(sjSafeEnvironmentFile);
+            if (!result.isSuccess()) {
+                return result;
+            }
         }
+        return Result.ok();
     }
 
     @Override
@@ -207,6 +211,17 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl<SjSafeEnvironm
         return Result.success(list);
     }
 
+    @Override
+    public Result<String> batchMoveFile(List<SjSafeEnvironmentFile> list) {
+        for (SjSafeEnvironmentFile sjSafeEnvironmentFile : list) {
+            Result result = moveFile(sjSafeEnvironmentFile);
+            if (!result.isSuccess()) {
+                return result;
+            }
+        }
+        return Result.ok();
+    }
+
     /**
      * 查找projectSn，sn（项目SN或企业sn）
      *