卡格式内容格式修改

src/main/java/cn/com/qmth/scancentral/bean/card/Appendix.java

@@ -0,0 +1,40 @@
+package cn.com.qmth.scancentral.bean.card;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Appendix {
+
+    @JsonProperty("duplex")
+    private boolean duplex;
+
+    @JsonProperty("dpi")
+    private int dpi;
+
+    private PageSize pageSize;
+
+    public int getDpi() {
+        return dpi;
+    }
+
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    public boolean isDuplex() {
+        return duplex;
+    }
+
+    public void setDuplex(boolean duplex) {
+        this.duplex = duplex;
+    }
+
+    public PageSize getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(PageSize pageSize) {
+        this.pageSize = pageSize;
+    }
+}

src/main/java/cn/com/qmth/scancentral/bean/card/CardFile.java

@@ -23,9 +23,7 @@ public class CardFile {
 
     private boolean adapted;
 
-    private Boolean duplex;
-
-    private CardPageSize pageSize;
+    private Appendix appendix;
 
     private List<CardPageWrapper> pages;
 
@@ -112,19 +110,11 @@ public class CardFile {
         return sliceName;
     }
 
-    public Boolean isDuplex() {
-        return duplex;
-    }
-
-    public void setDuplex(Boolean duplex) {
-        this.duplex = duplex;
-    }
-
-    public CardPageSize getPageSize() {
-        return pageSize;
+    public Appendix getAppendix() {
+        return appendix;
     }
 
-    public void setPageSize(CardPageSize pageSize) {
-        this.pageSize = pageSize;
+    public void setAppendix(Appendix appendix) {
+        this.appendix = appendix;
     }
 }

src/main/java/cn/com/qmth/scancentral/bean/card/CardPageSize.java → src/main/java/cn/com/qmth/scancentral/bean/card/PageSize.java

@@ -3,14 +3,15 @@ package cn.com.qmth.scancentral.bean.card;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/**
+ * @author tin.yin
+ * @since 2024/10/8 16:04
+ */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CardPageSize {
+public class PageSize {
 
-    @JsonProperty("dpi")
-    private int dpi;
-
-    @JsonProperty("pageName")
-    private String pageName;
+    @JsonProperty("name")
+    private String name;
 
     @JsonProperty("height")
     private int height;
@@ -18,20 +19,12 @@ public class CardPageSize {
     @JsonProperty("width")
     private int width;
 
-    public int getDpi() {
-        return dpi;
-    }
-
-    public void setDpi(int dpi) {
-        this.dpi = dpi;
-    }
-
-    public String getPageName() {
-        return pageName;
+    public String getName() {
+        return name;
     }
 
-    public void setPageName(String pageName) {
-        this.pageName = pageName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public int getHeight() {

src/main/java/cn/com/qmth/scancentral/service/impl/AnswerCardServiceImpl.java

@@ -154,8 +154,8 @@ public class AnswerCardServiceImpl extends MppServiceImpl<AnswerCardDao, AnswerC
 //        entity.setPaperCount(entity.getSinglePage()?cardFile.getPages().size():cardFile.getPages().size()/2);
         entity.setParameter(info.getParameter());
         entity.setRemark(info.getRemark());
-        if(cardFile.getPageSize()!=null){
-            entity.setDpi(cardFile.getPageSize().getDpi());
+        if(cardFile.getAppendix()!=null){
+            entity.setDpi(cardFile.getAppendix().getDpi());
         }else {
             entity.setDpi(info.getDpi());
         }