diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index 2f89b1d..c77e7c2 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -488,7 +488,7 @@ public class FileController { } - @Operation(summary = "获取文件树", description = "文件移动的时候需要用到该接口,用来展示目录树,展示机制为饱汉模式", tags = {"file"}) + @Operation(summary = "获取文件树", description = "文件移动的时候需要用到该接口,用来展示目录树", tags = {"file"}) @RequestMapping(value = "/getfiletree", method = RequestMethod.GET) @ResponseBody public RestResult getFileTree(@RequestHeader("token") String token){ diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java index e5b3d63..6fd8e08 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java @@ -103,6 +103,7 @@ public class RecoveryFileController { filePath = PathUtil.getParentPath(filePath); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(UserFile::getFilePath, filePath + "/") + .eq(UserFile::getFileName, fileName) .eq(UserFile::getDeleteFlag, 0) .eq(UserFile::getUserId, sessionUserBean.getUserId()); List userFileList = userFileService.list(lambdaQueryWrapper); diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java b/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java index 00e611f..aef9382 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java @@ -43,28 +43,41 @@ public class ShareController { @PostMapping(value = "/sharefile") @MyLog(operation = "分享文件", module = CURRENT_MODULE) @ResponseBody - public RestResult shareFile(ShareFileDTO shareSecretDTO, @RequestHeader("token") String token) { + public RestResult shareFile( @RequestBody ShareFileDTO shareSecretDTO, @RequestHeader("token") String token) { ShareFileVO shareSecretVO = new ShareFileVO(); UserBean sessionUserBean = userService.getUserBeanByToken(token); - String extractionCode = RandomUtil.randomNumbers(6); + String uuid = UUID.randomUUID().toString(); Share share = new Share(); - BeanUtil.copyProperties(sessionUserBean, share); + BeanUtil.copyProperties(shareSecretDTO, share); share.setShareTime(DateUtil.getCurrentTime()); share.setUserId(sessionUserBean.getUserId()); share.setShareStatus(0); - share.setExtractionCode(extractionCode); - share.setShareBatchNum(uuid); + if (shareSecretDTO.getShareType() == 1) { + String extractionCode = RandomUtil.randomNumbers(6); + share.setExtractionCode(extractionCode); + shareSecretVO.setExtractionCode(share.getExtractionCode()); + } + share.setShareBatchNum(uuid); shareService.save(share); List fileList = JSON.parseArray(shareSecretDTO.getFiles(), ShareFile.class); fileList.forEach(p->p.setShareBatchNum(uuid.replace("-", ""))); shareService.batchInsertShareFile(fileList); shareSecretVO.setShareBatchNum(uuid.replace("-", "")); + return RestResult.success().data(shareSecretVO); } + public static void main(String[] args) { + String sss = "[{\"fileId\":null,\"timeStampName\":null,\"fileUrl\":null,\"fileSize\":null,\"isOSS\":null,\"storageType\":null,\"pointCount\":null,\"identifier\":null,\"userFileId\":619,\"userId\":2,\"fileName\":\"2222\",\"filePath\":\"/\",\"extendName\":null,\"isDir\":1,\"uploadTime\":\"2021-03-15 22:16:26\",\"deleteFlag\":0,\"deleteTime\":null,\"deleteBatchNum\":null}]"; + List fileList = JSON.parseArray(sss, ShareFile.class); + fileList.forEach(p->p.setShareBatchNum("123")); + System.out.println(fileList); + + } + @Operation(summary = "分享列表", description = "分享列表", tags = {"share"}) @GetMapping(value = "/sharefileList") @ResponseBody