From 263bf31a843f0d72775aa575d33a83495dae1b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Tue, 7 Feb 2023 14:15:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C):?= =?UTF-8?q?=20=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/controller/RecoveryFileController.java | 8 ++++---- .../file/dto/recoveryfile/BatchDeleteRecoveryFileDTO.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java b/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java index be010f0..2c4232b 100644 --- a/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java +++ b/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java @@ -60,10 +60,10 @@ public class RecoveryFileController { @MyLog(operation = "批量删除回收文件", module = CURRENT_MODULE) @ResponseBody public RestResult batchDeleteRecoveryFile(@RequestBody BatchDeleteRecoveryFileDTO batchDeleteRecoveryFileDTO) { - JwtUser sessionUserBean = SessionUtil.getSession(); - List recoveryFileList = JSON.parseArray(batchDeleteRecoveryFileDTO.getRecoveryFileIds(), RecoveryFile.class); - for (RecoveryFile recoveryFile : recoveryFileList) { - RecoveryFile recoveryFile1 = recoveryFileService.getById(recoveryFile.getRecoveryFileId()); + String userFileIds = batchDeleteRecoveryFileDTO.getUserFileIds(); + String[] userFileIdList = userFileIds.split(","); + for (String userFileId : userFileIdList) { + RecoveryFile recoveryFile1 = recoveryFileService.getById(userFileId); if (recoveryFile1 != null) { asyncTaskComp.deleteUserFile(recoveryFile1.getUserFileId()); diff --git a/src/main/java/com/qiwenshare/file/dto/recoveryfile/BatchDeleteRecoveryFileDTO.java b/src/main/java/com/qiwenshare/file/dto/recoveryfile/BatchDeleteRecoveryFileDTO.java index 7acf49c..4d25acb 100644 --- a/src/main/java/com/qiwenshare/file/dto/recoveryfile/BatchDeleteRecoveryFileDTO.java +++ b/src/main/java/com/qiwenshare/file/dto/recoveryfile/BatchDeleteRecoveryFileDTO.java @@ -6,6 +6,6 @@ import lombok.Data; @Data @Schema(name = "批量删除回收文件DTO",required = true) public class BatchDeleteRecoveryFileDTO { - @Schema(description="恢复文件集合") - private String recoveryFileIds; + @Schema(description="用户文件Id集合", required = true) + private String userFileIds; } From eebf6f30c99d3b99352dab552ab0fdf57c9702b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Tue, 7 Feb 2023 14:18:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C):?= =?UTF-8?q?=20=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiwenshare/file/controller/RecoveryFileController.java | 6 +++--- .../com/qiwenshare/file/dto/file/DeleteRecoveryFileDTO.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java b/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java index 2c4232b..46b6309 100644 --- a/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java +++ b/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java @@ -1,6 +1,7 @@ package com.qiwenshare.file.controller; import com.alibaba.fastjson2.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qiwenshare.common.anno.MyLog; import com.qiwenshare.common.result.RestResult; import com.qiwenshare.common.util.security.JwtUser; @@ -46,12 +47,11 @@ public class RecoveryFileController { @RequestMapping(value = "/deleterecoveryfile", method = RequestMethod.POST) @ResponseBody public RestResult deleteRecoveryFile(@RequestBody DeleteRecoveryFileDTO deleteRecoveryFileDTO) { - JwtUser sessionUserBean = SessionUtil.getSession(); - RecoveryFile recoveryFile = recoveryFileService.getById(deleteRecoveryFileDTO.getRecoveryFileId()); + RecoveryFile recoveryFile = recoveryFileService.getOne(new QueryWrapper().lambda().eq(RecoveryFile::getUserFileId, deleteRecoveryFileDTO.getUserFileId())); asyncTaskComp.deleteUserFile(recoveryFile.getUserFileId()); - recoveryFileService.removeById(deleteRecoveryFileDTO.getRecoveryFileId()); + recoveryFileService.removeById(recoveryFile.getRecoveryFileId()); return RestResult.success().data("删除成功"); } diff --git a/src/main/java/com/qiwenshare/file/dto/file/DeleteRecoveryFileDTO.java b/src/main/java/com/qiwenshare/file/dto/file/DeleteRecoveryFileDTO.java index dbd5b90..4b689b1 100644 --- a/src/main/java/com/qiwenshare/file/dto/file/DeleteRecoveryFileDTO.java +++ b/src/main/java/com/qiwenshare/file/dto/file/DeleteRecoveryFileDTO.java @@ -6,7 +6,7 @@ import lombok.Data; @Data @Schema(name = "删除回收文件DTO",required = true) public class DeleteRecoveryFileDTO { - @Schema(description = "回收文件id") - private Long recoveryFileId; + @Schema(description = "用户文件id", required = true) + private String userFileId; }