uncln 4 лет назад
Родитель
Сommit
9d2bf6bf77

+ 0 - 1
src/main/java/com/seecoder/dataanalysis/aspect/auth/AuthAspect.java

@@ -74,7 +74,6 @@ public class AuthAspect {
             Object[] objects = joinPoint.getArgs();
             for (Object o : objects) {
                 if (o instanceof User) {
-                    System.out.println(user);
                     BeanUtils.copyProperties(user, o);
                     break;
                 }

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

@@ -22,6 +22,7 @@ public class CompetencyTree {
      * 能力树ID
      **/
     @Id
+    @Field("competency_id")
     private Integer competencyId;
 
     /**

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

@@ -23,6 +23,7 @@ public class EvalExamInfo {
      * 试卷Id
      */
     @Id
+    @Field("exam_id")
     private Integer examId;
 
     /**

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

@@ -24,6 +24,7 @@ public class EvalExamRecord {
      * 记录Id
      */
     @Id
+    @Field("record_id")
     private Integer recordId;
 
     /**

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

@@ -21,8 +21,10 @@ public class User {
      * 学生ID
      **/
     @Id
+    @Field("user_id")
     private Integer userId;
 
+
     /**
      * 学生姓名
      **/

+ 8 - 2
src/main/java/com/seecoder/dataanalysis/logic/user/convertor/UserConvertor.java

@@ -6,14 +6,20 @@ import org.springframework.beans.BeanUtils;
 
 public class UserConvertor {
     public static User convertToEntity(UserVO userVO) {
-        User user = new User();
-        BeanUtils.copyProperties(userVO, user);
+        User user = new User()
+                .setUserId(userVO.getId())
+                .setUsername(userVO.getName())
+                .setEmail(userVO.getEmail())
+                .setPhone(userVO.getPhone())
+                .setRole(userVO.getRole());
+        // BeanUtils.copyProperties(userVO, user);
         return user;
     }
 
     public static UserVO convertToVO(User user) {
         UserVO userVO = new UserVO();
         BeanUtils.copyProperties(user, userVO);
+        userVO.setId(user.getUserId());
         return userVO;
     }
 }

+ 1 - 1
src/main/java/com/seecoder/dataanalysis/web/controller/TestController.java

@@ -18,7 +18,7 @@ public class TestController {
     @Autowired
     public TestController(){}
 
-    @Authorized(roles = {UserRole.STUDENT})
+    @Authorized(roles = {UserRole.SEEC})
     @GetMapping("/test1")
     public String testRequest() {
         return "OK";

+ 5 - 2
src/test/java/com/seecoder/dataanalysis/DataAnalysisApplicationTests.java

@@ -12,6 +12,7 @@ import com.seecoder.dataanalysis.data.entity.eval.EvalExamRecord;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.mongodb.core.MongoTemplate;
 
 import java.util.*;
 
@@ -31,6 +32,9 @@ class DataAnalysisApplicationTests {
     @Autowired
     private EvalExamRecordDao evalExamRecordDao;
 
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
     @Test
     void saveTree(){
         List<KSScore> L1 = new ArrayList<>();
@@ -67,7 +71,7 @@ class DataAnalysisApplicationTests {
         quesScore.put("2", 20.0);
         EvalExamInfo evalExamInfo = new EvalExamInfo()
                 .setExamId(1)
-                .setExamScore(100.0)
+                .setExamScore(900.0)
                 .setDifficulty(1)
                 .setStartTime(new Date())
                 .setEndTime(new Date())
@@ -83,5 +87,4 @@ class DataAnalysisApplicationTests {
                 .setStudentId(1);
         evalExamRecordDao.save(evalExamRecord);
     }
-
 }