From c5405964f05206b31967bc7d8b8f10f06c5c137b Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Sun, 7 Jan 2024 16:10:44 +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                                    | 12 +++---
 .../java/com/docus/sw/fenpan/Document.java    | 38 +++++++++----------
 src/main/java/com/docus/sw/fenpan/Plate.java  |  2 +-
 .../com/docus/sw/souyin/CheckService.java     |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/config.ini b/config.ini
index d6ab3ea..d733022 100644
--- a/config.ini
+++ b/config.ini
@@ -1,13 +1,13 @@
 file.mode=图片
 file.read.url=C:\jiahsi-saomiao\缩微\ddd_0001\
 plate.size=200
-a3.width=300
+a3.width=17
 file.save.url=C:\jiahsi-saomiao\缩微\分盘结果\档案图\
 zong.name.prefix=南方医院
 Split.mode=copy/cut
-a3.length=300
-a0.length=200
-a4.width=200
-a4.length=200
+a3.length=17
+a0.length=47
+a4.width=13
+a4.length=13
 plate33.size=300
-a0.width=200
+a0.width=47
diff --git a/src/main/java/com/docus/sw/fenpan/Document.java b/src/main/java/com/docus/sw/fenpan/Document.java
index bc58c57..37f8d35 100644
--- a/src/main/java/com/docus/sw/fenpan/Document.java
+++ b/src/main/java/com/docus/sw/fenpan/Document.java
@@ -28,13 +28,13 @@ public class Document {
     //写一个方法判断是 A3 还是 A4
 
     public Boolean isA3() {
-        if(rollModel.equals("16mm规格")){
+        if (rollModel.equals("16mm规格")) {
             if (width / dpi > Integer.parseInt(Config.getParam("a4.width"))
                     || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))) {
                 return true;
             }
             return false;
-        }else{
+        } else {
             if (width / dpi > Integer.parseInt(Config.getParam("a0.width"))
                     || longTh / dpi > Integer.parseInt(Config.getParam("a0.length"))) {
                 return true;
@@ -45,43 +45,43 @@ public class Document {
     }
 
 
-    public String toSize(){
-        if(width / dpi > Integer.parseInt(Config.getParam("a4.width"))
-                || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))){
-            return "A3";
-        }else if(width / dpi > Integer.parseInt(Config.getParam("a3.width"))
-                || longTh / dpi > Integer.parseInt(Config.getParam("a3.length"))){
+    public String toSize() {
+        if (width / dpi > Integer.parseInt(Config.getParam("a3.width"))
+                || longTh / dpi > Integer.parseInt(Config.getParam("a3.length"))) {
             return "A3以上";
-        }else {
+        } else if (width / dpi > Integer.parseInt(Config.getParam("a4.width"))
+                || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))) {
+            return "A3";
+        } else {
             return "A4";
         }
     }
 
 
-    public Double useStore(){
-        if(width / dpi > Integer.parseInt(Config.getParam("a4.width"))
-                || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))){
-            return 2d;
-        }else if(width / dpi > Integer.parseInt(Config.getParam("a3.width"))
-                || longTh / dpi > Integer.parseInt(Config.getParam("a3.length"))){
+    public Double useStore() {
+        if (width / dpi > Integer.parseInt(Config.getParam("a3.width"))
+                || longTh / dpi > Integer.parseInt(Config.getParam("a3.length"))) {
             return 4.2d;
-        }else {
+        } else if (width / dpi > Integer.parseInt(Config.getParam("a4.width"))
+                || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))) {
+            return 2d;
+        } else {
             return 1d;
         }
     }
 
 
-    public Document(Integer width, Integer longTh, Integer dpi, String name,String rollModel) {
+    public Document(Integer width, Integer longTh, Integer dpi, String name, String rollModel) {
         this.width = width;
         this.longTh = longTh;
         this.dpi = dpi;
         this.name = name;
 
-        if(this.dpi==-1){
+        if (this.dpi == -1) {
             this.dpi = 300;
         }
         this.rollModel = rollModel;
-        if(rollModel==null){
+        if (rollModel == null) {
             this.rollModel = "16mm规格";
         }
     }
diff --git a/src/main/java/com/docus/sw/fenpan/Plate.java b/src/main/java/com/docus/sw/fenpan/Plate.java
index 7b18377..0e31d0b 100644
--- a/src/main/java/com/docus/sw/fenpan/Plate.java
+++ b/src/main/java/com/docus/sw/fenpan/Plate.java
@@ -28,7 +28,7 @@ public class Plate {
 
     //是否还可以放下新的卷
     public Boolean put(Roll roll) {
-        if(already + roll.getSize() - totalLength >= 0){
+        if(already + roll.getSize() - totalLength > 0){
             return  false;
         }
         this.already  = already+roll.getSize();
diff --git a/src/main/java/com/docus/sw/souyin/CheckService.java b/src/main/java/com/docus/sw/souyin/CheckService.java
index 231eff4..e0f0f05 100644
--- a/src/main/java/com/docus/sw/souyin/CheckService.java
+++ b/src/main/java/com/docus/sw/souyin/CheckService.java
@@ -139,7 +139,7 @@ public class CheckService {
 
                             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{