Просмотр исходного кода

fix: 修改能力树的主键,并将student_id统一改成user_id

181250114 4 лет назад
Родитель
Сommit
b43cc41559

+ 1 - 1
src/main/java/com/seecoder/dataanalysis/analysis/impl/EvalDataAnalysisServiceImpl.java

@@ -48,7 +48,7 @@ public class EvalDataAnalysisServiceImpl implements EvalDataAnalysisService {
         //TODO 修改成逐条添加的形式
         EvalExamRecord evalExamRecord = evalExamRecordDao.findById(exam_id).get();
         EvalExamInfo evalExamInfo = evalExamInfoDao.findById(exam_id).get();
-        CompetencyTree competencyTree = competencyTreeDao.findByStudentId(evalExamRecord.getStudentId());
+        CompetencyTree competencyTree = competencyTreeDao.findById(evalExamRecord.getUserId()).get();
 
         //数据取完,开始进行KSD分析和入库
         List<KSDScore> subTree = competencyTree.getSubCompetencyTree();

+ 0 - 1
src/main/java/com/seecoder/dataanalysis/data/dao/competency/CompetencyTreeDao.java

@@ -4,5 +4,4 @@ import com.seecoder.dataanalysis.data.entity.competency.CompetencyTree;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 public interface CompetencyTreeDao extends MongoRepository<CompetencyTree, Integer> {
-    CompetencyTree findByStudentId(Integer studentId);
 }

+ 14 - 10
src/main/java/com/seecoder/dataanalysis/data/entity/competency/CompetencyTree.java

@@ -9,27 +9,21 @@ 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.ArrayList;
 import java.util.List;
 
 @Document(collection = "competency_tree")
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
 public class CompetencyTree {
 
     /**
-     * 能力树ID
+     * 学生ID,一个学生只能有一棵能力树
      **/
     @Id
-    @Field("competency_id")
-    private Integer competencyId;
-
-    /**
-     * 学生ID
-     **/
-    @Field("student_id")
-    private Integer studentId;
+    @Field("user_id")
+    private Integer userId;
 
     /**
      * 能力树的总分
@@ -43,4 +37,14 @@ public class CompetencyTree {
     @Field("sub_competency_tree")
     private List<KSDScore> subCompetencyTree;
 
+
+    public CompetencyTree(){
+        this.subCompetencyTree = new ArrayList<>();
+    }
+
+    public CompetencyTree initModelTree(){
+        CompetencyTree competencyTree = new CompetencyTree();
+        return null;
+    }
+
 }

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

@@ -38,9 +38,9 @@ public class EvalExamRecord {
     /**
      * 用户Id
      */
-    @JSONField(name="student_id")
-    @Field("student_id")
-    private Integer studentId;
+    @JSONField(name="user_id")
+    @Field("user_id")
+    private Integer userId;
 
     /**
      * 提交时间