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 batchDeleteFile(@RequestBody List 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 batchMoveFile(@RequestBody List 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 renamefile(SjSafeEnvironmentFile sjSafeEnvironmentFile); - void batchDeleteFile(List list); + Result batchDeleteFile(List list); Result deleteFile(SjSafeEnvironmentFile sjSafeEnvironmentFile); @@ -31,4 +31,6 @@ public interface ISjSafeEnvironmentFileService extends IService uploadFile(HttpServletRequest request, UploadFileDTO uploadFileDto); Result> getFileList(Map map); + + Result batchMoveFile(List 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 list) { + public Result batchDeleteFile(List 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 batchMoveFile(List list) { + for (SjSafeEnvironmentFile sjSafeEnvironmentFile : list) { + Result result = moveFile(sjSafeEnvironmentFile); + if (!result.isSuccess()) { + return result; + } + } + return Result.ok(); + } + /** * 查找projectSn,sn(项目SN或企业sn) *