From 4629d196d4e4e6173f22930509eb6a734ba21656 Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Sun, 12 Nov 2023 19:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=88=90=E5=8F=AF=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8Cjar=E3=80=82=E5=B9=B6=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/docus/sw/fenpan/Document.java      |  2 +-
 src/main/java/com/docus/sw/souyin/SuoyinService.java | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/docus/sw/fenpan/Document.java b/src/main/java/com/docus/sw/fenpan/Document.java
index fe32358..1c03f03 100644
--- a/src/main/java/com/docus/sw/fenpan/Document.java
+++ b/src/main/java/com/docus/sw/fenpan/Document.java
@@ -24,7 +24,7 @@ public class Document {
     //写一个方法判断是 A3 还是 A4
 
     public Boolean isA3() {
-        if (width > Integer.parseInt(Config.getParam("a3.width")) || longTh > Integer.parseInt(Config.getParam("a3.length"))) {
+        if (width/dpi*2.54 > Integer.parseInt(Config.getParam("a3.width")) || longTh/dpi*2.54 > Integer.parseInt(Config.getParam("a3.length"))) {
             return true;
         }
         return false;
diff --git a/src/main/java/com/docus/sw/souyin/SuoyinService.java b/src/main/java/com/docus/sw/souyin/SuoyinService.java
index 6e7f17d..2aaf75e 100644
--- a/src/main/java/com/docus/sw/souyin/SuoyinService.java
+++ b/src/main/java/com/docus/sw/souyin/SuoyinService.java
@@ -1,7 +1,6 @@
 package com.docus.sw.souyin;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.util.FileUtils;
 import com.docus.sw.Config;
 import com.docus.sw.fenpan.Document;
 import com.docus.sw.fenpan.FileTypeEnum;
@@ -68,6 +67,13 @@ public class SuoyinService {
                         List<Document> documentList = new ArrayList<>();
                         Pieces pieces = new Pieces(FileTypeEnum.JPG, piece.getAbsolutePath(), piece.getName());
                         for (File docfile : piece.listFiles()) {
+
+                            //非图片模式，跳过。
+                            if(!(docfile.getName().endsWith(".jpg") || docfile.getName().endsWith(".png")
+                                    || docfile.getName().endsWith(".jpeg") || docfile.getName().endsWith(".tif")
+                                    || docfile.getName().endsWith(".tiff"))){
+                                continue;
+                            }
                             try {
                                 ImageInfo imageInfo = Imaging.getImageInfo(docfile);
                                 int height = imageInfo.getHeight();
@@ -292,9 +298,9 @@ public class SuoyinService {
                     }
 
                 } else {
-                    FileUtils.delete(new File(o.getAbsolutePath()));
+
                     System.out.println("请删除无效的文件：" + o.getAbsolutePath());
-                    throw new RuntimeException("请删除无效的文件：" + o.getAbsolutePath());
+
                 }
                 break;
             }