Pārlūkot izejas kodu

extends IdBase.

deason 6 gadi atpakaļ
vecāks
revīzija
2a6cff70ff
27 mainītis faili ar 113 papildinājumiem un 448 dzēšanām
  1. 5 18
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/AudioTimeConfig.java
  2. 7 19
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Course.java
  3. 7 25
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExamFile.java
  4. 2 17
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExamPaper.java
  5. 3 10
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportServiceManage.java
  6. 6 24
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportStructure.java
  7. 6 24
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExtractConfig.java
  8. 5 29
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Paper.java
  9. 2 19
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetail.java
  10. 3 20
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailStruct.java
  11. 6 23
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailUnit.java
  12. 4 25
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailUnitStruct.java
  13. 3 7
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperSearchInfo.java
  14. 6 25
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperStruct.java
  15. 1 1
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperStructSearchInfo.java
  16. 1 5
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesOption.java
  17. 2 20
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesProperty.java
  18. 4 6
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesResource.java
  19. 5 9
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesTypeName.java
  20. 5 29
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Question.java
  21. 6 11
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionAudio.java
  22. 6 22
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionBak.java
  23. 5 18
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionPkgPath.java
  24. 6 5
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionSearchCondition.java
  25. 1 1
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionType.java
  26. 2 21
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Setting.java
  27. 4 15
      examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Specialty.java

+ 5 - 18
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/AudioTimeConfig.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
+import java.util.Date;
+
 
 /**
  * @author chenken
@@ -12,13 +12,7 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
  * @company QMTH
  * @description 音频播放次数设置
  */
-public class AudioTimeConfig implements Serializable {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = -33466644941641357L;
-    private String id;
+public class AudioTimeConfig extends IdBase {
     /**
      * 考试ID
      */
@@ -59,6 +53,7 @@ public class AudioTimeConfig implements Serializable {
     private String createUser;
 
     public AudioTimeConfig() {
+
     }
 
     public AudioTimeConfig(String examId, String courseCode, String groupCode, String questionId) {
@@ -81,14 +76,6 @@ public class AudioTimeConfig implements Serializable {
         }
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getExamId() {
         return examId;
     }

+ 7 - 19
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Course.java

@@ -1,17 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import org.springframework.data.annotation.Id;
-
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
 /**
  * Created by songyue on 16/12/26.
  */
-public class Course implements Serializable {
-    private static final long serialVersionUID = 7794074467488869343L;
-
-    @Id
-    private String id;
+public class Course extends IdBase {
 
     private String code;
 
@@ -27,12 +21,12 @@ public class Course implements Serializable {
 
     private String enable;
 
-    public String getId() {
-        return id;
+    public Course() {
+
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public Course(String enable) {
+        this.enable = enable;
     }
 
     public String getCode() {
@@ -91,10 +85,4 @@ public class Course implements Serializable {
         this.enable = enable;
     }
 
-    public Course() {
-    }
-
-    public Course(String enable) {
-        this.enable = enable;
-    }
-}
+}

+ 7 - 25
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExamFile.java

@@ -1,18 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestPaper;
+
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
-
-import org.springframework.data.annotation.Id;
-
-import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
-
-import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.ComputerTestPaper;
-import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
+import java.util.Set;
 
 /**
  * @author chenken
@@ -20,14 +17,7 @@ import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
  * @company QMTH
  * @description 考试文件
  */
-public class ExamFile implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 7565454762976257111L;
-
-    @Id
-    private String id;
+public class ExamFile extends IdBase {
 
     /**
      * 机构ID
@@ -164,14 +154,6 @@ public class ExamFile implements Serializable {
         this.orgId = orgId;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getOrgName() {
         return orgName;
     }

+ 2 - 17
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExamPaper.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-
-import org.springframework.data.annotation.Id;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 /**
@@ -11,12 +9,7 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
  * @company QMTH
  * @description 调卷规则关联试卷
  */
-public class ExamPaper implements Serializable {
-
-    private static final long serialVersionUID = 5708319465238504997L;
-
-    @Id
-    private String id;
+public class ExamPaper extends IdBase {
     /**
      * 考试ID
      */
@@ -44,14 +37,6 @@ public class ExamPaper implements Serializable {
      */
     private Integer weight;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Long getExamId() {
         return examId;
     }

+ 3 - 10
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportServiceManage.java

@@ -1,15 +1,8 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
-import org.springframework.data.annotation.Id;
-
-public class ExportServiceManage implements Serializable {
-
-    private static final long serialVersionUID = 561933232237607796L;
-
-    @Id
-    private String id;
+public class ExportServiceManage extends IdBase {
 
     private String orgId;
 
@@ -49,4 +42,4 @@ public class ExportServiceManage implements Serializable {
         this.orgId = orgId;
     }
 
-}
+}

+ 6 - 24
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportStructure.java

@@ -1,14 +1,11 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.data.annotation.Id;
-
+import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
 import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
-import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author chenken
@@ -16,15 +13,7 @@ import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
  * @company QMTH
  * @description 导出结构设置
  */
-public class ExportStructure implements Serializable {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = -2710169914864126547L;
-
-    @Id
-    private String id;
+public class ExportStructure extends IdBase {
     /**
      * 考试类型
      */
@@ -61,6 +50,7 @@ public class ExportStructure implements Serializable {
     private String orgName;
 
     public ExportStructure() {
+
     }
 
     public ExportStructure(ExamType examType) {
@@ -71,14 +61,6 @@ public class ExportStructure implements Serializable {
         this.examId = examId;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public ExamType getExamType() {
         return examType;
     }

+ 6 - 24
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExtractConfig.java

@@ -1,29 +1,18 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
-import org.springframework.data.annotation.Id;
-
 import cn.com.qmth.examcloud.core.questions.base.core.ExamCourseDto;
-
 import cn.com.qmth.examcloud.core.questions.base.enums.ExtractPolicy;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 调卷规则
  *
  * @author chenken
  */
-public class ExtractConfig implements Serializable {
-
-    private static final long serialVersionUID = -5234564748332601375L;
-    /**
-     * 调卷规则ID
-     */
-    @Id
-    private String id;
+public class ExtractConfig extends IdBase {
     /**
      * 考试ID
      */
@@ -103,6 +92,7 @@ public class ExtractConfig implements Serializable {
     private String orgName;
 
     public ExtractConfig() {
+
     }
 
     public ExtractConfig(String id) {
@@ -126,14 +116,6 @@ public class ExtractConfig implements Serializable {
         return examId;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public void setExamId(Long examId) {
         this.examId = examId;
     }

+ 5 - 29
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Paper.java

@@ -1,30 +1,18 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.Map;
-
-import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Specialty;
-
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.Indexed;
-
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+import org.springframework.data.mongodb.core.index.Indexed;
 
-import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
+import java.util.Map;
 
 /**
  * @author songyue
  */
-public class Paper implements Serializable {
-
-    private static final long serialVersionUID = 5259364047220441490L;
-
-    @Id
-    private String id;
-
+public class Paper extends IdBase {
     @Indexed(unique = true)
     private String name;// 试卷名称
 
@@ -72,18 +60,6 @@ public class Paper implements Serializable {
 
     private String examRemark;//考试说明
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }

+ 2 - 19
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetail.java

@@ -1,18 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-
-import org.springframework.data.annotation.Id;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
-
-public class PaperDetail implements Serializable, Comparable<PaperDetail> {
-
-    private static final long serialVersionUID = 6674961232283369404L;
-
-    @Id
-    private String id;
-
+public class PaperDetail extends IdBase implements Comparable<PaperDetail> {
     @DBRef(lazy = false)
     private Paper paper;// 关联的试卷
 
@@ -30,14 +21,6 @@ public class PaperDetail implements Serializable, Comparable<PaperDetail> {
 
     private String createTime;// 创建时间
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Paper getPaper() {
         return paper;
     }

+ 3 - 20
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailStruct.java

@@ -1,24 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyNumberDto;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.PaperDetailUnitStructDto;
 
-import java.io.Serializable;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 试卷结构明细
  * Created by songyue on 16/12/28.
  */
 
-public class PaperDetailStruct implements Serializable {
-
-    private static final long serialVersionUID = -1102384643351847702L;
-
-    private String id;
-
+public class PaperDetailStruct extends IdBase {
     private Integer number;//大题序号
 
     private String name;//大题名称
@@ -59,18 +54,6 @@ public class PaperDetailStruct implements Serializable {
 
     private List<CoursePropertyNumberDto> coursePropertyNumberDtos;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Integer getNumber() {
         return number;
     }

+ 6 - 23
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailUnit.java

@@ -1,27 +1,18 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.DBRef;
-
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+import org.springframework.data.mongodb.core.mapping.DBRef;
 
-public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit> {
-
-    private static final long serialVersionUID = -8854150484922002075L;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
 
+public class PaperDetailUnit extends IdBase implements Comparable<PaperDetailUnit> {
     public static DecimalFormat SCORE_FORMATER = new DecimalFormat("####.#");
 
-    @Id
-    private String id;
-
     @DBRef(lazy = false)
     private Paper paper;// 关联的试卷
 
@@ -68,14 +59,6 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
         this.score = 0d;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Paper getPaper() {
         return paper;
     }

+ 4 - 25
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailUnitStruct.java

@@ -1,20 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.List;
-
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 import cn.com.qmth.examcloud.core.questions.dao.entity.dto.CoursePropertyNumberDto;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import java.util.List;
 
 /**
  * Created by songyue on 17/3/21.
  */
-public class PaperDetailUnitStruct implements Serializable {
-
-    private static final long serialVersionUID = -3766822545462183904L;
-
-    private String id;
+public class PaperDetailUnitStruct extends IdBase {
 
     private Integer number;
 
@@ -32,10 +27,6 @@ public class PaperDetailUnitStruct implements Serializable {
 
     private String propertyGroup; //单个属性组(用来筛选题目)
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public PaperDetailUnitStruct() {
 
     }
@@ -57,14 +48,6 @@ public class PaperDetailUnitStruct implements Serializable {
         return String.valueOf(coursePropertyNumberDto.getPropertyId());
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Integer getNumber() {
         return number;
     }
@@ -105,10 +88,6 @@ public class PaperDetailUnitStruct implements Serializable {
         this.publicity = publicity;
     }
 
-    public static long getSerialversionuid() {
-        return serialVersionUID;
-    }
-
     public String getDifficulty() {
         return difficulty;
     }

+ 3 - 7
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperSearchInfo.java

@@ -1,12 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
 
+import java.io.Serializable;
+
 public class PaperSearchInfo implements Serializable {
 
-    private static final long serialVersionUID = 8273918442524569201L;
+    private static final long serialVersionUID = 1L;
 
     private String name;// 试卷名称
 
@@ -26,10 +26,6 @@ public class PaperSearchInfo implements Serializable {
 
     private String[] paperIds;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public String getName() {
         return name;
     }

+ 6 - 25
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperStruct.java

@@ -1,26 +1,19 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.Indexed;
-
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.GenPaperType;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStructType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 试卷结构 Created by songyue on 16/12/28.
  */
 
-public class PaperStruct implements Serializable {
-
-    private static final long serialVersionUID = 6380530617488717881L;
-
-    @Id
-    private String id;
+public class PaperStruct extends IdBase {
 
     @Indexed(unique = true)
     private String name;// 试卷结构名称
@@ -64,18 +57,6 @@ public class PaperStruct implements Serializable {
 
     private String examRemark;//考试说明
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }

+ 1 - 1
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperStructSearchInfo.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
  */
 public class PaperStructSearchInfo implements Serializable {
 
-    private static final long serialVersionUID = 5282899855557734214L;
+    private static final long serialVersionUID = 1L;
 
     private String name;
 

+ 1 - 5
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesOption.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
  * Created by songyue on 16/12/27.
  */
 public class QuesOption implements Serializable {
-    private static final long serialVersionUID = 6187112681135912330L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 选项编号
@@ -23,10 +23,6 @@ public class QuesOption implements Serializable {
      */
     private short isCorrect;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public String getNumber() {
         return number;
     }

+ 2 - 20
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesProperty.java

@@ -1,14 +1,8 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
-
-public class QuesProperty implements Serializable {
-
-    private static final long serialVersionUID = -2303143377325064933L;
-
-    private String id;
+public class QuesProperty extends IdBase {
 
     private String coursePropertyName;//课程属性名
 
@@ -26,14 +20,6 @@ public class QuesProperty implements Serializable {
         this.coursePropertyName = courseProperty.getName();
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Property getFirstProperty() {
         return firstProperty;
     }
@@ -50,10 +36,6 @@ public class QuesProperty implements Serializable {
         this.secondProperty = secondProperty;
     }
 
-    public static long getSerialversionuid() {
-        return serialVersionUID;
-    }
-
     public String getCoursePropertyName() {
         return coursePropertyName;
     }

+ 4 - 6
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesResource.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
  * Created by songyue on 16/12/27.
  */
 public class QuesResource implements Serializable {
-    private static final long serialVersionUID = -6446084924081997140L;
+    private static final long serialVersionUID = 1L;
 
     private String resourceNo;//资源编号
 
@@ -20,10 +20,6 @@ public class QuesResource implements Serializable {
 
     private ObjectId fileId;//GridFs中存储地址
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public String getResourceNo() {
         return resourceNo;
     }
@@ -65,5 +61,7 @@ public class QuesResource implements Serializable {
     }
 
     public QuesResource() {
+
     }
-}
+
+}

+ 5 - 9
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesTypeName.java

@@ -1,20 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-import org.springframework.data.annotation.Id;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
-import java.io.Serializable;
 import java.util.List;
 
 /**
  * Created by songyue on 17/8/22.
  */
-public class QuesTypeName implements Serializable {
-
-    private static final long serialVersionUID = 2084601289212420962L;
-
-    @Id
-    private String id;
+public class QuesTypeName extends IdBase {
 
     private String orgId;
 
@@ -65,5 +59,7 @@ public class QuesTypeName implements Serializable {
     }
 
     public QuesTypeName() {
+
     }
-}
+
+}

+ 5 - 29
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Question.java

@@ -1,28 +1,17 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+import org.springframework.data.annotation.Transient;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Specialty;
-
-import org.springframework.data.annotation.Id;
-
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-
-import org.springframework.data.annotation.Transient;
-
 /**
  * Created by songyue on 16/12/27.
  */
-public class Question implements Serializable {
-
-    private static final long serialVersionUID = -493414992043982866L;
-
-    @Id
-    private String id;
+public class Question extends IdBase {
 
     private String quesBody;// 题干,默认为html
 
@@ -130,19 +119,6 @@ public class Question implements Serializable {
         this.audioList = audioList;
     }
 
-    public static long getSerialVersionUID() {
-
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getQuesBody() {
         return quesBody;
     }

+ 6 - 11
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionAudio.java

@@ -1,23 +1,17 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Date;
+
 /**
  * @author chenken
  * @date 2017年8月1日 上午10:56:23
  * @company QMTH
  * @description QuestionAudio.java
  */
-public class QuestionAudio implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 7190928471784053821L;
-
-    private String id;
+public class QuestionAudio extends IdBase {
     /**
      * 试题ID
      */
@@ -50,6 +44,7 @@ public class QuestionAudio implements Serializable {
     private String createUser;
 
     public QuestionAudio() {
+
     }
 
     public QuestionAudio(String questionId, String fileName, String fileUrl) {
@@ -117,4 +112,4 @@ public class QuestionAudio implements Serializable {
         this.fileSuffixes = fileSuffixes;
     }
 
-}
+}

+ 6 - 22
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionBak.java

@@ -1,23 +1,15 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.data.annotation.Id;
-
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
-
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 
-public class QuestionBak implements Serializable {
-
-    private static final long serialVersionUID = -1247428210124550964L;
+import java.util.List;
+import java.util.Map;
 
-    @Id
-    private String id;
+public class QuestionBak extends IdBase {
 
     private String quesBody;// 题干,默认为html
 
@@ -55,14 +47,6 @@ public class QuestionBak implements Serializable {
 
     private Map<String, String> quesParams;// 试题属性
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getQuesBody() {
         return quesBody;
     }

+ 5 - 18
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionPkgPath.java

@@ -1,29 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import org.springframework.data.annotation.Id;
-
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
 /**
  * Created by songyue on 17/11/19.
  */
-public class QuestionPkgPath implements Serializable {
-
-    private static final long serialVersionUID = 1462455654557838793L;
-
-    @Id
-    private String id;
+public class QuestionPkgPath extends IdBase {
 
     private byte[] quesPkg;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public byte[] getQuesPkg() {
         return quesPkg;
     }
@@ -33,9 +18,11 @@ public class QuestionPkgPath implements Serializable {
     }
 
     public QuestionPkgPath() {
+
     }
 
     public QuestionPkgPath(byte[] quesPkg) {
         this.quesPkg = quesPkg;
     }
-}
+
+}

+ 6 - 5
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionSearchCondition.java

@@ -1,13 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.util.List;
-import java.util.Map;
-
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import org.apache.commons.lang3.StringUtils;
 
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import java.io.Serializable;
+import java.util.Map;
+
+public class QuestionSearchCondition implements Serializable {
 
-public class QuestionSearchCondition {
+    private static final long serialVersionUID = 1L;
 
     private String id;
 

+ 1 - 1
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionType.java

@@ -10,7 +10,7 @@ import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
  */
 public class QuestionType implements Serializable {
 
-    private static final long serialVersionUID = -4183850561167604080L;
+    private static final long serialVersionUID = 1;
 
     private QuesStructType quesType;// 结构类型
 

+ 2 - 21
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Setting.java

@@ -1,19 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
 import cn.com.qmth.examcloud.core.questions.base.enums.Switch;
-import org.springframework.data.annotation.Id;
-
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
 
 /**
  * Created by songyue on 17/3/27.
  */
-public class Setting implements Serializable {
-
-    private static final long serialVersionUID = 8476640757849637183L;
-
-    @Id
-    private String id;
+public class Setting extends IdBase {
 
     private String code;
 
@@ -23,18 +16,6 @@ public class Setting implements Serializable {
 
     private String params;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getCode() {
         return code;
     }

+ 4 - 15
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Specialty.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
-import java.io.Serializable;
+import cn.com.qmth.examcloud.core.questions.dao.entity.base.IdBase;
+
 import java.util.Date;
 
 /**
@@ -8,11 +9,7 @@ import java.util.Date;
  * @date 2017.10.25
  * @describle 题库 专业    同步基础信息的
  */
-public class Specialty implements Serializable {
-
-    private static final long serialVersionUID = -7144603935406955299L;
-
-    private Long id;
+public class Specialty extends IdBase {
 
     private String code;
 
@@ -26,14 +23,6 @@ public class Specialty implements Serializable {
 
     private Boolean enable;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getCode() {
         return code;
     }
@@ -82,4 +71,4 @@ public class Specialty implements Serializable {
         this.enable = enable;
     }
 
-}
+}