feat: 下载调整
This commit is contained in:
@@ -1,12 +1,17 @@
|
||||
package org.wfc.file.controller;
|
||||
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.wfc.common.core.domain.R;
|
||||
import org.wfc.common.core.exception.ServiceException;
|
||||
import org.wfc.common.core.utils.file.FileUtils;
|
||||
import org.wfc.file.service.ISysFileService;
|
||||
import org.wfc.file.service.LocalSysFileServiceImpl.FileUploadResult;
|
||||
@@ -14,7 +19,7 @@ import org.wfc.system.api.domain.SysFile;
|
||||
|
||||
/**
|
||||
* 文件请求处理
|
||||
*
|
||||
*
|
||||
* @author wfc
|
||||
*/
|
||||
@RestController
|
||||
@@ -46,4 +51,16 @@ public class SysFileController {
|
||||
return R.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/download")
|
||||
public R<byte[]> download(@RequestParam("filePath") String filePath) {
|
||||
byte[] content = null;
|
||||
if (StrUtil.isNotBlank(filePath)) {
|
||||
content = FileUtil.readBytes(filePath);
|
||||
if (content == null) {
|
||||
throw new ServiceException("file does not exist");
|
||||
}
|
||||
}
|
||||
return R.ok(content);
|
||||
}
|
||||
}
|
||||
@@ -105,7 +105,8 @@ public class UBillServiceImpl extends ServiceImpl<UBillMapper, UBill> implements
|
||||
UBill bill = this.getById(id);
|
||||
String invoiceFilePath = bill.getInvoiceFilePath();
|
||||
if (StrUtil.isNotBlank(invoiceFilePath)) {
|
||||
byte[] content = FileUtil.readBytes(invoiceFilePath);
|
||||
R<byte[]> result = remoteFileService.download(invoiceFilePath);
|
||||
byte[] content = result.getData();
|
||||
if (content == null) {
|
||||
throw new ServiceException("file does not exist");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user