ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!131 代码合并

Browse Source 
Merge pull request !131 from MAC/develop
This commit is contained in:
MAC 2023-02-07 06:18:49 +00:00 committed by Gitee
commit 6a666e48b4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
View File

@ -1,6 +1,7 @@
package com.qiwenshare.file.controller; package com.qiwenshare.file.controller;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.qiwenshare.common.anno.MyLog; import com.qiwenshare.common.anno.MyLog;
import com.qiwenshare.common.result.RestResult; import com.qiwenshare.common.result.RestResult;
import com.qiwenshare.common.util.security.JwtUser; import com.qiwenshare.common.util.security.JwtUser;
@ -46,12 +47,11 @@ public class RecoveryFileController {
@RequestMapping(value = "/deleterecoveryfile", method = RequestMethod.POST) @RequestMapping(value = "/deleterecoveryfile", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public RestResult<String> deleteRecoveryFile(@RequestBody DeleteRecoveryFileDTO deleteRecoveryFileDTO) { public RestResult<String> deleteRecoveryFile(@RequestBody DeleteRecoveryFileDTO deleteRecoveryFileDTO) {
JwtUser sessionUserBean = SessionUtil.getSession(); RecoveryFile recoveryFile = recoveryFileService.getOne(new QueryWrapper<RecoveryFile>().lambda().eq(RecoveryFile::getUserFileId, deleteRecoveryFileDTO.getUserFileId()));
RecoveryFile recoveryFile = recoveryFileService.getById(deleteRecoveryFileDTO.getRecoveryFileId());
asyncTaskComp.deleteUserFile(recoveryFile.getUserFileId()); asyncTaskComp.deleteUserFile(recoveryFile.getUserFileId());
recoveryFileService.removeById(deleteRecoveryFileDTO.getRecoveryFileId()); recoveryFileService.removeById(recoveryFile.getRecoveryFileId());
return RestResult.success().data("删除成功"); return RestResult.success().data("删除成功");
} }
@ -60,10 +60,10 @@ public class RecoveryFileController {
@MyLog(operation = "批量删除回收文件", module = CURRENT_MODULE) @MyLog(operation = "批量删除回收文件", module = CURRENT_MODULE)
@ResponseBody @ResponseBody
public RestResult<String> batchDeleteRecoveryFile(@RequestBody BatchDeleteRecoveryFileDTO batchDeleteRecoveryFileDTO) { public RestResult<String> batchDeleteRecoveryFile(@RequestBody BatchDeleteRecoveryFileDTO batchDeleteRecoveryFileDTO) {
JwtUser sessionUserBean = SessionUtil.getSession(); String userFileIds = batchDeleteRecoveryFileDTO.getUserFileIds();
List<RecoveryFile> recoveryFileList = JSON.parseArray(batchDeleteRecoveryFileDTO.getRecoveryFileIds(), RecoveryFile.class); String[] userFileIdList = userFileIds.split(",");
for (RecoveryFile recoveryFile : recoveryFileList) { for (String userFileId : userFileIdList) {
RecoveryFile recoveryFile1 = recoveryFileService.getById(recoveryFile.getRecoveryFileId()); RecoveryFile recoveryFile1 = recoveryFileService.getById(userFileId);
if (recoveryFile1 != null) { if (recoveryFile1 != null) {
asyncTaskComp.deleteUserFile(recoveryFile1.getUserFileId()); asyncTaskComp.deleteUserFile(recoveryFile1.getUserFileId());

4
src/main/java/com/qiwenshare/file/dto/file/DeleteRecoveryFileDTO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
@Data @Data
@Schema(name = "删除回收文件DTO",required = true) @Schema(name = "删除回收文件DTO",required = true)
public class DeleteRecoveryFileDTO { public class DeleteRecoveryFileDTO {
@Schema(description = "回收文件id") @Schema(description = "用户文件id", required = true)
private Long recoveryFileId; private String userFileId;
} }

4
src/main/java/com/qiwenshare/file/dto/recoveryfile/BatchDeleteRecoveryFileDTO.java
View File

@ -6,6 +6,6 @@ import lombok.Data;
@Data @Data
@Schema(name = "批量删除回收文件DTO",required = true) @Schema(name = "批量删除回收文件DTO",required = true)
public class BatchDeleteRecoveryFileDTO { public class BatchDeleteRecoveryFileDTO {
@Schema(description="恢复文件集合") @Schema(description="用户文件Id集合", required = true)
private String recoveryFileIds; private String userFileIds;
} }