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 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> 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{