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

!18 代码合并

Browse Source 
Merge pull request !18 from MAC/develop
This commit is contained in:
MAC 2021-03-31 23:55:14 +08:00 committed by Gitee
commit 7013f0cde5
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file-web/src/main/java/com/qiwenshare/file/controller/FileController.java
View File

@ -488,7 +488,7 @@ public class FileController {
} }
@Operation(summary = "获取文件树", description = "文件移动的时候需要用到该接口，用来展示目录树，展示机制为饱汉模式", tags = {"file"}) @Operation(summary = "获取文件树", description = "文件移动的时候需要用到该接口，用来展示目录树", tags = {"file"})
@RequestMapping(value = "/getfiletree", method = RequestMethod.GET) @RequestMapping(value = "/getfiletree", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public RestResult<TreeNode> getFileTree(@RequestHeader("token") String token){ public RestResult<TreeNode> getFileTree(@RequestHeader("token") String token){

1
file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
View File

@ -103,6 +103,7 @@ public class RecoveryFileController {
filePath = PathUtil.getParentPath(filePath); filePath = PathUtil.getParentPath(filePath);
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(UserFile::getFilePath, filePath + "/") lambdaQueryWrapper.eq(UserFile::getFilePath, filePath + "/")
.eq(UserFile::getFileName, fileName)
.eq(UserFile::getDeleteFlag, 0) .eq(UserFile::getDeleteFlag, 0)
.eq(UserFile::getUserId, sessionUserBean.getUserId()); .eq(UserFile::getUserId, sessionUserBean.getUserId());
List<UserFile> userFileList = userFileService.list(lambdaQueryWrapper); List<UserFile> userFileList = userFileService.list(lambdaQueryWrapper);

21
file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java
View File

@ -43,28 +43,41 @@ public class ShareController {
@PostMapping(value = "/sharefile") @PostMapping(value = "/sharefile")
@MyLog(operation = "分享文件", module = CURRENT_MODULE) @MyLog(operation = "分享文件", module = CURRENT_MODULE)
@ResponseBody @ResponseBody
public RestResult<ShareFileVO> shareFile(ShareFileDTO shareSecretDTO, @RequestHeader("token") String token) { public RestResult<ShareFileVO> shareFile( @RequestBody ShareFileDTO shareSecretDTO, @RequestHeader("token") String token) {
ShareFileVO shareSecretVO = new ShareFileVO(); ShareFileVO shareSecretVO = new ShareFileVO();
UserBean sessionUserBean = userService.getUserBeanByToken(token); UserBean sessionUserBean = userService.getUserBeanByToken(token);
String extractionCode = RandomUtil.randomNumbers(6);
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
Share share = new Share(); Share share = new Share();
BeanUtil.copyProperties(sessionUserBean, share); BeanUtil.copyProperties(shareSecretDTO, share);
share.setShareTime(DateUtil.getCurrentTime()); share.setShareTime(DateUtil.getCurrentTime());
share.setUserId(sessionUserBean.getUserId()); share.setUserId(sessionUserBean.getUserId());
share.setShareStatus(0); share.setShareStatus(0);
if (shareSecretDTO.getShareType() == 1) {
String extractionCode = RandomUtil.randomNumbers(6);
share.setExtractionCode(extractionCode); share.setExtractionCode(extractionCode);
share.setShareBatchNum(uuid); shareSecretVO.setExtractionCode(share.getExtractionCode());
}
share.setShareBatchNum(uuid);
shareService.save(share); shareService.save(share);
List<ShareFile> fileList = JSON.parseArray(shareSecretDTO.getFiles(), ShareFile.class); List<ShareFile> fileList = JSON.parseArray(shareSecretDTO.getFiles(), ShareFile.class);
fileList.forEach(p->p.setShareBatchNum(uuid.replace("-", ""))); fileList.forEach(p->p.setShareBatchNum(uuid.replace("-", "")));
shareService.batchInsertShareFile(fileList); shareService.batchInsertShareFile(fileList);
shareSecretVO.setShareBatchNum(uuid.replace("-", "")); shareSecretVO.setShareBatchNum(uuid.replace("-", ""));
return RestResult.success().data(shareSecretVO); 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<ShareFile> fileList = JSON.parseArray(sss, ShareFile.class);
fileList.forEach(p->p.setShareBatchNum("123"));
System.out.println(fileList);
}
@Operation(summary = "分享列表", description = "分享列表", tags = {"share"}) @Operation(summary = "分享列表", description = "分享列表", tags = {"share"})
@GetMapping(value = "/sharefileList") @GetMapping(value = "/sharefileList")
@ResponseBody @ResponseBody