Merge remote-tracking branch 'origin/huji'

src/main/java/com/ads/business/service/impl/DocServiceImpl.java

@@ -342,7 +342,8 @@ public class DocServiceImpl extends ServiceImpl<DocDao, Doc> implements DocServi
         log.info("createPath---路径：{}", createPath);
         // 生成图片
         LinkedList<String> images = getPdfImages(createPath, path + imageFilePath);
-        if (CollectionUtils.isEmpty(images)) {
+        int pdfNumberPage = PdfUtil.getPdfNumberPage(createPath);
+        if (images.size() != pdfNumberPage) {
             int pageSize = PdfUtil.toImages(createPath);
             log.info("toImages :" + pageSize);
             if (pageSize > 0) {

src/main/java/com/ads/common/util/PdfUtil.java

@@ -195,6 +195,23 @@ public class PdfUtil {
         return numberOfPages;
     }
 
+    /**
+     * 获取PDF总页数
+     *
+     * @param sourcePdf
+     * @return
+     */
+    public static int getPdfNumberPage(String sourcePdf) {
+        try {
+            byte[] pdfBytes = Files.readAllBytes(Paths.get(sourcePdf));
+            PDDocument pdDocument = PDDocument.load(pdfBytes);
+            return pdDocument.getNumberOfPages();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
 
     public static void main(String[] args) throws Exception {