add：评卷参数结构保存

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/GroupInfo.java

@@ -28,6 +28,9 @@ public class GroupInfo {
     @JsonSerialize(using = ToStringSerializer.class)
     private List<Marker> markerList;
 
+    @ApiModelProperty(value = "图片配置")
+    private List<PictureConfig> pictureConfigList;
+
     public Integer getGroupNumber() {
         return groupNumber;
     }
@@ -67,4 +70,12 @@ public class GroupInfo {
     public void setMarkerList(List<Marker> markerList) {
         this.markerList = markerList;
     }
+
+    public List<PictureConfig> getPictureConfigList() {
+        return pictureConfigList;
+    }
+
+    public void setPictureConfigList(List<PictureConfig> pictureConfigList) {
+        this.pictureConfigList = pictureConfigList;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/PictureConfig.java

@@ -0,0 +1,65 @@
+package com.qmth.distributed.print.business.bean.marking;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 分组图片设置
+ * @Author: CaoZixuan
+ * @Date: 2022-04-14
+ */
+public class PictureConfig {
+    @ApiModelProperty(value = "图片序号")
+    private Integer i;
+
+    @ApiModelProperty(value = "左上角X坐标")
+    private Integer x;
+
+    @ApiModelProperty(value = "左上角y坐标")
+    private Integer y;
+
+    @ApiModelProperty(value = "裁切区宽度")
+    private Integer w;
+
+    @ApiModelProperty(value = "裁切区高度")
+    private Integer h;
+
+    public Integer getI() {
+        return i;
+    }
+
+    public void setI(Integer i) {
+        this.i = i;
+    }
+
+    public Integer getX() {
+        return x;
+    }
+
+    public void setX(Integer x) {
+        this.x = x;
+    }
+
+    public Integer getY() {
+        return y;
+    }
+
+    public void setY(Integer y) {
+        this.y = y;
+    }
+
+    public Integer getW() {
+        return w;
+    }
+
+    public void setW(Integer w) {
+        this.w = w;
+    }
+
+    public Integer getH() {
+        return h;
+    }
+
+    public void setH(Integer h) {
+        this.h = h;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperGroup.java

@@ -44,7 +44,8 @@ public class ExamPaperGroup extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "题目信息")
     private String questionInfo;
 
-    // TODO: 2022/4/14 坐标 
+    @ApiModelProperty(value = "分组图片设置")
+    private String pictureConfig;
 
     public Long getExamPaperStructureId() {
         return examPaperStructureId;
@@ -109,4 +110,12 @@ public class ExamPaperGroup extends BaseEntity implements Serializable {
     public void setQuestionInfo(String questionInfo) {
         this.questionInfo = questionInfo;
     }
+
+    public String getPictureConfig() {
+        return pictureConfig;
+    }
+
+    public void setPictureConfig(String pictureConfig) {
+        this.pictureConfig = pictureConfig;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperGroupMarker.java

@@ -25,6 +25,9 @@ public class ExamPaperGroupMarker extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long markerId;
 
+    @ApiModelProperty(value = "评卷员登录名")
+    private String loginName;
+
     public Long getGroupId() {
         return groupId;
     }
@@ -40,4 +43,12 @@ public class ExamPaperGroupMarker extends BaseEntity implements Serializable {
     public void setMarkerId(Long markerId) {
         this.markerId = markerId;
     }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
 }