xiaofei 1 an în urmă
părinte
comite
c492a499b7

+ 49 - 22
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkTrack.java

@@ -1,15 +1,15 @@
 package com.qmth.teachcloud.mark.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 轨迹给分表
@@ -19,14 +19,18 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 2023-09-22
  */
 @TableName("mark_track")
-@ApiModel(value="MarkTrack对象", description="轨迹给分表")
+@ApiModel(value = "MarkTrack对象", description = "轨迹给分表")
 public class MarkTrack implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "评卷任务ID")
-    @TableId(value = "task_id")
     private Long taskId;
 
     @ApiModelProperty(value = "完整题号")
@@ -77,6 +81,14 @@ public class MarkTrack implements Serializable {
     @ApiModelProperty(value = "裁切图Y轴坐标")
     private Integer offsetY;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getTaskId() {
         return taskId;
     }
@@ -84,6 +96,7 @@ public class MarkTrack implements Serializable {
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
+
     public String getQuestionNumber() {
         return questionNumber;
     }
@@ -91,6 +104,7 @@ public class MarkTrack implements Serializable {
     public void setQuestionNumber(String questionNumber) {
         this.questionNumber = questionNumber;
     }
+
     public Integer getNumber() {
         return number;
     }
@@ -98,6 +112,7 @@ public class MarkTrack implements Serializable {
     public void setNumber(Integer number) {
         this.number = number;
     }
+
     public Long getStudentId() {
         return studentId;
     }
@@ -105,6 +120,7 @@ public class MarkTrack implements Serializable {
     public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
+
     public Long getExamId() {
         return examId;
     }
@@ -112,6 +128,7 @@ public class MarkTrack implements Serializable {
     public void setExamId(Long examId) {
         this.examId = examId;
     }
+
     public String getPaperNumber() {
         return paperNumber;
     }
@@ -119,6 +136,7 @@ public class MarkTrack implements Serializable {
     public void setPaperNumber(String paperNumber) {
         this.paperNumber = paperNumber;
     }
+
     public Integer getGroupNumber() {
         return groupNumber;
     }
@@ -126,6 +144,7 @@ public class MarkTrack implements Serializable {
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
+
     public Long getUserId() {
         return userId;
     }
@@ -133,6 +152,7 @@ public class MarkTrack implements Serializable {
     public void setUserId(Long userId) {
         this.userId = userId;
     }
+
     public String getType() {
         return type;
     }
@@ -140,6 +160,7 @@ public class MarkTrack implements Serializable {
     public void setType(String type) {
         this.type = type;
     }
+
     public Double getScore() {
         return score;
     }
@@ -147,6 +168,7 @@ public class MarkTrack implements Serializable {
     public void setScore(Double score) {
         this.score = score;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -154,6 +176,7 @@ public class MarkTrack implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
     public Double getPositionX() {
         return positionX;
     }
@@ -161,6 +184,7 @@ public class MarkTrack implements Serializable {
     public void setPositionX(Double positionX) {
         this.positionX = positionX;
     }
+
     public Double getPositionY() {
         return positionY;
     }
@@ -168,6 +192,7 @@ public class MarkTrack implements Serializable {
     public void setPositionY(Double positionY) {
         this.positionY = positionY;
     }
+
     public Integer getOffsetIndex() {
         return offsetIndex;
     }
@@ -175,6 +200,7 @@ public class MarkTrack implements Serializable {
     public void setOffsetIndex(Integer offsetIndex) {
         this.offsetIndex = offsetIndex;
     }
+
     public Integer getOffsetX() {
         return offsetX;
     }
@@ -182,6 +208,7 @@ public class MarkTrack implements Serializable {
     public void setOffsetX(Integer offsetX) {
         this.offsetX = offsetX;
     }
+
     public Integer getOffsetY() {
         return offsetY;
     }
@@ -193,22 +220,22 @@ public class MarkTrack implements Serializable {
     @Override
     public String toString() {
         return "MarkTrack{" +
-            "taskId=" + taskId +
-            ", questionNumber=" + questionNumber +
-            ", number=" + number +
-            ", studentId=" + studentId +
-            ", examId=" + examId +
-            ", paperNumber=" + paperNumber +
-            ", groupNumber=" + groupNumber +
-            ", userId=" + userId +
-            ", type=" + type +
-            ", score=" + score +
-            ", remark=" + remark +
-            ", positionX=" + positionX +
-            ", positionY=" + positionY +
-            ", offsetIndex=" + offsetIndex +
-            ", offsetX=" + offsetX +
-            ", offsetY=" + offsetY +
-        "}";
+                "taskId=" + taskId +
+                ", questionNumber=" + questionNumber +
+                ", number=" + number +
+                ", studentId=" + studentId +
+                ", examId=" + examId +
+                ", paperNumber=" + paperNumber +
+                ", groupNumber=" + groupNumber +
+                ", userId=" + userId +
+                ", type=" + type +
+                ", score=" + score +
+                ", remark=" + remark +
+                ", positionX=" + positionX +
+                ", positionY=" + positionY +
+                ", offsetIndex=" + offsetIndex +
+                ", offsetX=" + offsetX +
+                ", offsetY=" + offsetY +
+                "}";
     }
 }

+ 2 - 1
teachcloud-mark/src/main/resources/mapper/MarkTrackMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkTrack">
-        <id column="task_id" property="taskId" />
+        <id column="id" property="id" />
+        <result column="task_id" property="taskId" />
         <result column="question_number" property="questionNumber" />
         <result column="number" property="number" />
         <result column="student_id" property="studentId" />