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

!113 批量下载: 改为打包压缩为 zip 文件下载

Browse Source 
Merge pull request !113 from 小鲤鱼听听/develop
This commit is contained in:
小鲤鱼听听 2022-04-12 06:27:04 +00:00 committed by Gitee
commit 4470ed95d3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/qiwenshare/file/api/IFiletransferService.java
View File

@ -18,7 +18,7 @@ public interface IFiletransferService {
void uploadFile(HttpServletRequest request, UploadFileDTO UploadFileDto, Long userId);
void downloadFile(HttpServletResponse httpServletResponse, DownloadFileDTO downloadFileDTO);
void downloadUserFileList(HttpServletResponse httpServletResponse, String filePath, String fileName, List<UserFile> userFileList);
void downloadUserFileList(HttpServletResponse httpServletResponse, String filePath, String fileName, List<Long> userFileIds);
void previewFile(HttpServletResponse httpServletResponse, PreviewDTO previewDTO);
void previewPictureFile(HttpServletResponse httpServletResponse, PreviewDTO previewDTO);
void deleteFile(FileBean fileBean);

44
src/main/java/com/qiwenshare/file/controller/FiletransferController.java
View File

@ -1,6 +1,7 @@
package com.qiwenshare.file.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qiwenshare.common.anno.MyLog;
import com.qiwenshare.common.result.RestResult;
import com.qiwenshare.common.util.DateUtil;
@ -16,6 +17,7 @@ import com.qiwenshare.file.dto.file.BatchDeleteFileDTO;
import com.qiwenshare.file.dto.file.DownloadFileDTO;
import com.qiwenshare.file.dto.file.PreviewDTO;
import com.qiwenshare.file.dto.file.UploadFileDTO;
import com.qiwenshare.file.dto.file.BatchDownloadFileDTO;
import com.qiwenshare.file.mapper.ImageMapper;
import com.qiwenshare.file.service.StorageService;
import com.qiwenshare.file.vo.file.UploadFileVo;
@ -39,6 +41,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.ArrayList;
import java.util.Date;
import java.util.stream.Collectors;
@Slf4j
@Tag(name = "filetransfer", description = "该接口为文件传输接口，主要用来做文件的上传、下载和预览")
@ -146,22 +151,37 @@ public class FiletransferController {
}
@Operation(summary = "批量下载文件", description = "批量下载文件", tags = {"filetransfer"})
@RequestMapping(value = "/batchdeletefile", method = RequestMethod.POST)
@MyLog(operation = "批量删除文件", module = CURRENT_MODULE)
@RequestMapping(value = "/batchDownloadFile", method = RequestMethod.GET)
@MyLog(operation = "批量下载文件", module = CURRENT_MODULE)
@ResponseBody
public RestResult<String> batchDownloadFile(HttpServletResponse httpServletResponse, @RequestBody BatchDeleteFileDTO batchDeleteFileDto) {
public void batchDownloadFile(HttpServletResponse httpServletResponse, BatchDownloadFileDTO batchDownloadFileDTO) {
List<UserFile> userFiles = JSON.parseArray(batchDeleteFileDto.getFiles(), UserFile.class);
if (userFiles == null || userFiles.isEmpty()) {
return RestResult.fail().message("文件列表为空！");
String files = batchDownloadFileDTO.getUserFileIds();
String[] userFileIdStrs = files.split(",");
List<Long> userFileIds = new ArrayList<>();
for(String userFileIdStr : userFileIdStrs) {
Long userFileId = Long.parseLong(userFileIdStr);
UserFile userFile = userFileService.getById(userFileId);
if (userFile.getIsDir() == 0) {
userFileIds.add(userFileId);
} else {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.likeRight(UserFile::getFilePath, userFile.getFilePath() + userFile.getFileName() + "/")
.eq(UserFile::getUserId, userFile.getUserId())
.eq(UserFile::getIsDir, 0)
.eq(UserFile::getDeleteFlag, 0);
List<UserFile> userFileList = userFileService.list(lambdaQueryWrapper);
List<Long> userFileIds1 = userFileList.stream().map(UserFile::getUserFileId).collect(Collectors.toList());
userFileIds.addAll(userFileIds1);
}
}
UserFile userFile = userFileService.getById(userFiles.get(0).getUserFileId());
UserFile userFile = userFileService.getById(userFileIds.get(0));
httpServletResponse.setContentType("application/force-download");// 设置强制下载不打开
String fileName = DateUtil.getCurrentTime();
httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
filetransferService.downloadUserFileList(httpServletResponse, userFile.getFilePath(), fileName, userFiles);
return RestResult.success().message("批量下载文件成功");
Date date = new Date();
String fileName = String.valueOf(date.getTime());
httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName + ".zip");// 设置文件名
filetransferService.downloadUserFileList(httpServletResponse, userFile.getFilePath(), fileName, userFileIds);
}
@Operation(summary="预览文件", description="用于文件预览", tags = {"filetransfer"})

2
src/main/java/com/qiwenshare/file/dto/file/BatchDownloadFileDTO.java
View File

@ -7,6 +7,6 @@ import lombok.Data;
@Schema(name = "批量下载文件DTO",required = true)
public class BatchDownloadFileDTO {
@Schema(description="文件集合", required = true)
private String files;
private String userFileIds;
}

9
src/main/java/com/qiwenshare/file/service/FiletransferService.java
View File

@ -48,6 +48,7 @@ import java.util.zip.Adler32;
import java.util.zip.CheckedOutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import java.util.stream.Collectors;
@Slf4j
@Service
@ -289,13 +290,14 @@ public class FiletransferService implements IFiletransferService {
.eq(UserFile::getIsDir, 0)
.eq(UserFile::getDeleteFlag, 0);
List<UserFile> userFileList = userFileMapper.selectList(lambdaQueryWrapper);
List<Long> userFileIds = userFileList.stream().map(UserFile::getUserFileId).collect(Collectors.toList());
downloadUserFileList(httpServletResponse, userFile.getFilePath(), userFile.getFileName(), userFileList);
downloadUserFileList(httpServletResponse, userFile.getFilePath(), userFile.getFileName(), userFileIds);
}
}
@Override
public void downloadUserFileList(HttpServletResponse httpServletResponse, String filePath, String fileName, List<UserFile> userFileList) {
public void downloadUserFileList(HttpServletResponse httpServletResponse, String filePath, String fileName, List<Long> userFileIds) {
String staticPath = UFOPUtils.getStaticPath();
String tempPath = staticPath + "temp" + File.separator;
File tempDirFile = new File(tempPath);
@ -314,7 +316,8 @@ public class FiletransferService implements IFiletransferService {
BufferedOutputStream out = new BufferedOutputStream(zos);
try {
for (UserFile userFile1 : userFileList) {
for (Long userFileId : userFileIds) {
UserFile userFile1 = userFileMapper.selectById(userFileId);
FileBean fileBean = fileMapper.selectById(userFile1.getFileId());
Downloader downloader = ufopFactory.getDownloader(fileBean.getStorageType());
if (downloader == null) {