From 1d8c9b5bae51bf40c6b92c7966245b22cb4e19a2 Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Mon, 8 Jan 2024 17:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=B0=8F=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/config.ini b/config.ini
index d733022..74ba0d3 100644
--- a/config.ini
+++ b/config.ini
@@ -1,6 +1,6 @@
 file.mode=图片
 file.read.url=C:\jiahsi-saomiao\缩微\ddd_0001\
-plate.size=200
+plate.size=4
 a3.width=17
 file.save.url=C:\jiahsi-saomiao\缩微\分盘结果\档案图\
 zong.name.prefix=南方医院
@@ -9,5 +9,5 @@ a3.length=17
 a0.length=47
 a4.width=13
 a4.length=13
-plate33.size=300
+plate33.size=4
 a0.width=47
diff --git a/src/main/java/com/docus/sw/fenpan/FenpanService.java b/src/main/java/com/docus/sw/fenpan/FenpanService.java
index 339e71b..1260df7 100644
--- a/src/main/java/com/docus/sw/fenpan/FenpanService.java
+++ b/src/main/java/com/docus/sw/fenpan/FenpanService.java
@@ -202,10 +202,10 @@ public class FenpanService {
                     List<Document> documentList = new ArrayList<>();
 
                     File sourceFile = new File(piece.getAbsolutePath());
+                    File[] files = sourceFile.listFiles();
                     if(piece.getLevelType()==LevelType.THREE&&piece.getFileTypeEnum()==FileTypeEnum.JPG){
-                         sourceFile = new File(piece.getAbsolutePath()).getParentFile();
+                        files = new File[]{new File(piece.getAbsolutePath())};
                     }
-                    File[] files = sourceFile.listFiles();
                     ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
                     List<Future<Document>> futures = new ArrayList<>();
@@ -419,8 +419,8 @@ public class FenpanService {
                     }else{
                         Pieces pieces = new Pieces(FileTypeEnum.JPG, o.getParentFile().getAbsolutePath(), o.getParentFile().getName(), LevelType.FOUR);
                         allDirectory.add(pieces);
+                        break;
                     }
-                    break;
                 } else {
 
                     System.out.println("请删除无效的文件：" + o.getAbsolutePath());
diff --git a/src/main/java/com/docus/sw/souyin/SuoyinService.java b/src/main/java/com/docus/sw/souyin/SuoyinService.java
index 6ae33b8..97e50e7 100644
--- a/src/main/java/com/docus/sw/souyin/SuoyinService.java
+++ b/src/main/java/com/docus/sw/souyin/SuoyinService.java
@@ -119,7 +119,7 @@ public class SuoyinService {
                             int level =3;
                             if(levelType==LevelType.THREE){
                                 Pieces pieces = new Pieces(FileTypeEnum.JPG, piece.getAbsolutePath(), piece.getName(),LevelType.THREE);
-                                File[] listFiles = piece.getParentFile().listFiles();
+                                File[] listFiles =  new File[]{new File(piece.getAbsolutePath())};
                                 genPieces(pieces, listFiles, FileTypeEnum.JPG);
                                 pieceList.add(pieces);
                             }else{