|
|
@@ -6,7 +6,6 @@ import cn.cslg.pas.common.utils.FileUtils;
|
|
|
import cn.cslg.pas.common.utils.StringUtils;
|
|
|
import cn.cslg.pas.domain.PatentInstruction;
|
|
|
import cn.cslg.pas.mapper.PatentInstructionMapper;
|
|
|
-import cn.cslg.pas.service.PatentInstructionService;
|
|
|
import cn.cslg.pas.service.PatentService;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
@@ -16,12 +15,9 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.pdfbox.multipdf.PDFMergerUtility;
|
|
|
import org.apache.pdfbox.multipdf.Splitter;
|
|
|
import org.apache.pdfbox.pdmodel.PDDocument;
|
|
|
-import org.apache.pdfbox.rendering.ImageType;
|
|
|
-import org.apache.pdfbox.rendering.PDFRenderer;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.awt.image.BufferedImage;
|
|
|
import java.io.*;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
@@ -77,11 +73,6 @@ public class PatentPDFService extends ServiceImpl<PatentInstructionMapper, Paten
|
|
|
// 合并PDF
|
|
|
pdfMerger.mergeDocuments();
|
|
|
|
|
|
- //最后要记得删除所有pdf首页临时文件
|
|
|
- for (String filePath : filePaths) {
|
|
|
- new File(filePath).delete();
|
|
|
- }
|
|
|
-
|
|
|
InputStream fis = new BufferedInputStream(new FileInputStream(mergedFilePath));
|
|
|
byte[] buffer = new byte[fis.available()];
|
|
|
fis.read(buffer);
|
|
|
@@ -97,8 +88,11 @@ public class PatentPDFService extends ServiceImpl<PatentInstructionMapper, Paten
|
|
|
toClient.flush();
|
|
|
toClient.close();
|
|
|
|
|
|
- //最后要记得删除合并后的pdf临时文件
|
|
|
- new File(mergedFilePath).delete();
|
|
|
+ //最后要记得删除所有文件
|
|
|
+ for (String filePath : filePaths) { //删除每个pdf首页文件
|
|
|
+ new File(filePath).delete();
|
|
|
+ }
|
|
|
+ new File(mergedFilePath).delete(); //删除合并的pdf文件
|
|
|
|
|
|
}
|
|
|
|
chendayu