|
@@ -276,23 +276,21 @@ public class LargeFileEndpoint {
|
|
|
System.out.println("jieshu===================================="+(l1-l));
|
|
|
|
|
|
File file1 = new File(filePath + param.getFilename());
|
|
|
-
|
|
|
+ MultipartFile multipartFile = getMultipartFile(file1);
|
|
|
NewBladeFile newBladeFile = new NewBladeFile();
|
|
|
if(param.getFilename().contains("pdf")){
|
|
|
- FileInputStream inputStream1 = new FileInputStream(filePath + param.getFilename());
|
|
|
- PDDocument document = PDDocument.load(inputStream1);
|
|
|
+// FileInputStream inputStream1 = new FileInputStream(filePath + param.getFilename());
|
|
|
+ PDDocument document = PDDocument.load(multipartFile.getInputStream());
|
|
|
//获取文件页数
|
|
|
newBladeFile.setPage(document.getPages().getCount());
|
|
|
//pdf的路径就是文件上传的路径
|
|
|
newBladeFile.setPdfUrl(bladeFile.getLink());
|
|
|
}else if(param.getFilename().contains("xlsx") || param.getFilename().contains("xls")){
|
|
|
- MultipartFile multipartFile = getMultipartFile(file1);
|
|
|
newBladeFile = this.commonFileClient.excelToPdf(multipartFile);
|
|
|
}else if(param.getFilename().contains("docx")){
|
|
|
- MultipartFile multipartFile = getMultipartFile(file1);
|
|
|
newBladeFile = this.commonFileClient.wordToPdf(multipartFile);
|
|
|
}else if(param.getFilename().contains("png") || param.getFilename().contains("jpg")){
|
|
|
- MultipartFile multipartFile = getMultipartFile(file1);
|
|
|
+
|
|
|
newBladeFile = this.commonFileClient.pngOrJpgToPdf(multipartFile);
|
|
|
}
|
|
|
BeanUtils.copyProperties(bladeFile, newBladeFile);
|