三江-三江安全环保资料中心-批量删除/移动文件接口

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 sjSafeEnvironmentFileService.batchDeleteFile(list);
-        return Result.ok();
     }
 
     @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) {
+        return sjSafeEnvironmentFileService.batchMoveFile(list);
-            sjSafeEnvironmentFileService.moveFile(sjSafeEnvironmentFile);
-        }
-        return Result.ok();
     }
 
     @ApiOperation(value = " 获取文件树", notes = "文件移动的时候需要用到该接口，用来展示目录树，展示机制为饱汉模式", httpMethod = "POST")

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);
 }

src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java

@@ -115,11 +115,15 @@ 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
     public Result deleteFile(SjSafeEnvironmentFile sjSafeEnvironmentFile) {
@@ -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）
      *