uncln 4 лет назад
Родитель
Сommit
0bbe0eaf76

+ 4 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/competency/CompetencyTree.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.util.List;
 
@@ -21,16 +22,19 @@ public class CompetencyTree {
      * 能力树ID
      **/
     @Id
+    @Field("competency_id")
     private Integer competencyId;
 
     /**
      * 学生ID
      **/
+    @Field("student_id")
     private Integer studentId;
 
     /**
      * 一级子能力树
      **/
+    @Field("sub_competency_tree")
     private List<KSDScore> subCompetencyTree;
 
 }

+ 3 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/competency/DScore.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 @NoArgsConstructor
 @AllArgsConstructor
@@ -14,10 +15,12 @@ public class DScore {
     /**
      * deposition 名称
      */
+    @Field("name")
     private String name;
 
     /**
      * deposition 分数
      */
+    @Field("score")
     private Double score;
 }

+ 5 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/competency/KSDScore.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.util.List;
 
@@ -17,18 +18,22 @@ public class KSDScore {
     /**
      * 能力名称
      **/
+    @Field("competency")
     private String competency;
     /**
      * 总分
      **/
+    @Field("total_score")
     private Double totalScore;
     /**
      * 知识-knowledge
      **/
+    @Field("ks_score")
     private List<KSScore> KSScore;
 
     /**
      * 性情-deposition
      **/
+    @Field("d_score")
     private List<DScore> DScore;
 }

+ 3 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/competency/KSScore.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.util.List;
 
@@ -16,10 +17,12 @@ public class KSScore {
     /**
      * 知识点名称
      */
+    @Field("knowledge")
     private String knowledge;
 
     /**
      * 所在技能分数
      */
+    @Field("skills_and_score")
     private List<Double> skillsAndScore;
 }

+ 8 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/eval/EvalExamInfo.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.util.Date;
 import java.util.Map;
@@ -22,35 +23,42 @@ public class EvalExamInfo {
      * 试卷Id
      */
     @Id
+    @Field("exam_id")
     private Integer examId;
 
     /**
      * 试卷总分
      */
+    @Field("exam_score")
     private Double examScore;
 
     /**
      * 试题id及分值
      */
+    @Field("question_and_score")
     private Map<Integer, Double> questionAndScore;
 
     /**
      * 试题难度
      */
+    @Field("difficulty")
     private Integer difficulty;
 
     /**
      * 试卷更新时间
      */
+    @Field("update_time")
     private Date updateTime;
 
     /**
      * 考试开始时间
      */
+    @Field("start_time")
     private Date startTime;
 
     /**
      * 考试结束时间
      */
+    @Field("end_time")
     private Date endTime;
 }

+ 7 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/eval/EvalExamRecord.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.util.Date;
 import java.util.Map;
@@ -23,35 +24,41 @@ public class EvalExamRecord {
      * 记录Id
      */
     @Id
+    @Field("record_id")
     private Integer recordId;
 
     /**
      * 试卷Id
      */
     @JSONField(name="exam_id")
+    @Field("exam_id")
     private Integer examId;
 
     /**
      * 用户Id
      */
     @JSONField(name="student_id")
+    @Field("student_id")
     private Integer studentId;
 
     /**
      * 提交时间
      */
     @JSONField(name="submit_time", format="yyyy-MM-dd HH:mm:ss")
+    @Field("submit_time")
     private Date submitTime;
 
     /**
      * 得分
      */
     @JSONField(name="score")
+    @Field("score")
     private Double score;
 
     /**
      * 得分
      */
     @JSONField(name="error_ques")
+    @Field("error_ques")
     private Map<Integer, Double> errorQuestions;
 }

+ 3 - 0
src/main/java/com/seecoder/dataanalysis/data/entity/eval/User.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 @Document(collection = "user")
 @NoArgsConstructor
@@ -19,10 +20,12 @@ public class User {
      * 学生ID
      **/
     @Id
+    @Field("user_id")
     private Integer userId;
 
     /**
      * 学生姓名
      **/
+    @Field("username")
     private String username;
 }

+ 3 - 1
src/test/java/com/seecoder/dataanalysis/DataAnalysisApplicationTests.java

@@ -35,9 +35,11 @@ class DataAnalysisApplicationTests {
     void saveTree(){
         List<KSScore> L1 = new ArrayList<>();
         List<DScore> L2 = new ArrayList<>();
+        List<Double> L4 = new ArrayList<>();
+        L4.add(1.0);
         KSScore ksScore = new KSScore()
                 .setKnowledge("test1")
-                .setSkillsAndScore(null);
+                .setSkillsAndScore(L4);
         DScore dScore = new DScore()
                 .setName("active")
                 .setScore(10.0);