解决大小计算不正确问题

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
+a3.length=17
-a0.length=200
+a0.length=47
-a4.width=200
+a4.width=13
-a4.length=200
+a4.length=13
 plate33.size=300
-a0.width=200
+a0.width=47

src/main/java/com/docus/sw/fenpan/Document.java

@@ -46,12 +46,12 @@ public class Document {
 
 
     public String toSize() {
-        if(width / dpi > Integer.parseInt(Config.getParam("a4.width"))
+        if (width / dpi > Integer.parseInt(Config.getParam("a3.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"))) {
             return "A3以上";
+        } else if (width / dpi > Integer.parseInt(Config.getParam("a4.width"))
+                || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))) {
+            return "A3";
         } else {
             return "A4";
         }
@@ -59,12 +59,12 @@ public class Document {
 
 
     public Double useStore() {
-        if(width / dpi > Integer.parseInt(Config.getParam("a4.width"))
+        if (width / dpi > Integer.parseInt(Config.getParam("a3.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"))) {
             return 4.2d;
+        } else if (width / dpi > Integer.parseInt(Config.getParam("a4.width"))
+                || longTh / dpi > Integer.parseInt(Config.getParam("a4.length"))) {
+            return 2d;
         } else {
             return 1d;
         }

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();

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{