From 207c8cfba9ba7eff9b6c03e641fbf7049edd3a33 Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Mon, 27 Nov 2023 13:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3pdf=20=E4=B8=8D=E5=88=86?=
 =?UTF-8?q?=E7=9B=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.ini                                           | 6 +++---
 src/main/java/com/docus/sw/fenpan/FenpanService.java | 9 +++++----
 src/main/java/com/docus/sw/fenpan/MyApplication.java | 4 ++--
 src/main/java/com/docus/sw/souyin/SuoyinService.java | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config.ini b/config.ini
index 76def4d..d901f1a 100644
--- a/config.ini
+++ b/config.ini
@@ -1,8 +1,8 @@
 file.mode=图片
 file.read.url=C:\jiahsi-saomiao\缩微\ddd_0001\
-a3.length=30
-plate.size=2800
-a3.width=30
+a3.length=300
+plate.size=200
+a3.width=300
 file.save.url=C:\jiahsi-saomiao\缩微\分盘结果\档案图\
 zong.name.prefix=南方医院
 Split.mode=copy/cut
diff --git a/src/main/java/com/docus/sw/fenpan/FenpanService.java b/src/main/java/com/docus/sw/fenpan/FenpanService.java
index 998f3da..149f229 100644
--- a/src/main/java/com/docus/sw/fenpan/FenpanService.java
+++ b/src/main/java/com/docus/sw/fenpan/FenpanService.java
@@ -126,7 +126,7 @@ public class FenpanService {
 
                 piece.put(documentList);
                 //删除对应的temp 文件
-                file.delete();
+                FileUtils.delete(file);
             } else  if (piece.getFileTypeEnum() == FileTypeEnum.DOCX) {
                 //从word 直接提取图片
                 //提取图片为document ，然后用于后面判断
@@ -149,7 +149,7 @@ public class FenpanService {
 
                 piece.put(documentList);
                 //删除对应的temp 文件
-                file.delete();
+                FileUtils.delete(file);
             } else if (piece.getFileTypeEnum() == FileTypeEnum.PDF) {
                 // 从pdf 提取图片,
                 //提取图片为document ，然后用于后面判断
@@ -171,7 +171,7 @@ public class FenpanService {
 
                 piece.put(documentList);
                 //删除对应的temp 文件
-                file.delete();
+                FileUtils.delete(file);
             } else {
                 //是图片，直接从图片提取
                 List<Document> documentList = new ArrayList<>();
@@ -302,12 +302,13 @@ public class FenpanService {
                         || o.getName().endsWith(".tiff")) {
                     Pieces pieces = new Pieces(FileTypeEnum.JPG, o.getParentFile().getAbsolutePath(), o.getParentFile().getName());
                     allDirectory.add(pieces);
+                    break;
                 } else {
 
                     System.out.println("请删除无效的文件：" + o.getAbsolutePath());
 
                 }
-                break;
+
             }
         }
     }
diff --git a/src/main/java/com/docus/sw/fenpan/MyApplication.java b/src/main/java/com/docus/sw/fenpan/MyApplication.java
index 0659b5e..8e51ada 100644
--- a/src/main/java/com/docus/sw/fenpan/MyApplication.java
+++ b/src/main/java/com/docus/sw/fenpan/MyApplication.java
@@ -49,7 +49,7 @@ public class MyApplication {
     }
 
     private static void createAndShowGUI() {
-        JFrame frame = new JFrame("缩微工具");
+        JFrame frame = new JFrame("分盘索引工具");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(600, 400);
 
@@ -70,7 +70,7 @@ public class MyApplication {
         paramPanel.add(zongPreJtf, gbc);
 
         JPanel sizePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        sizePanel.add(new JLabel("A3大小尺寸(厘米) 长:"));
+        sizePanel.add(new JLabel("A3大小尺寸(英寸) 长:"));
         JTextField a3LongJtf = new JTextField(5);
         sizePanel.add(a3LongJtf);
         sizePanel.add(new JLabel("宽:"));
diff --git a/src/main/java/com/docus/sw/souyin/SuoyinService.java b/src/main/java/com/docus/sw/souyin/SuoyinService.java
index f494c8b..6557ea2 100644
--- a/src/main/java/com/docus/sw/souyin/SuoyinService.java
+++ b/src/main/java/com/docus/sw/souyin/SuoyinService.java
@@ -39,7 +39,7 @@ public class SuoyinService {
 
     public static void main(String[] args) throws IOException {
         Config.loadConfig();
-        String path = "C:\\Users\\zhanghai\\Desktop\\桌面\\test\\aa\\南方医院zong";
+        String path = "C:\\Users\\zhanghai\\Desktop\\桌面\\test\\ppp\\ppp";
         new SuoyinService().index(path);
     }