helper quiz

seec-data-server/src/main/java/cn/seecoder/data/server/SeecDataServerApplication.java

@@ -1,14 +1,18 @@
 package cn.seecoder.data.server;
 
+import org.python.util.PythonInterpreter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.io.IOException;
+import java.util.Properties;
+
 @SpringBootApplication
 @EnableScheduling
 public class SeecDataServerApplication {
 
-	public static void main(String[] args) {
+	public static void main(String[] args) throws IOException {
 		SpringApplication.run(SeecDataServerApplication.class, args);
 	}
 

seec-data-server/src/main/java/cn/seecoder/data/server/controller/AnalysisController.java

@@ -0,0 +1,32 @@
+package cn.seecoder.data.server.controller;
+
+
+import cn.seecoder.data.server.dto.knowledge.KnowledgeNodeDTO;
+import cn.seecoder.data.server.repository.GeneralRecordRepository;
+import cn.seecoder.data.server.service.Impl.EvaluateServiceImpl;
+import cn.seecoder.data.server.service.Impl.GeneralServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class AnalysisController {
+
+    @Autowired
+    GeneralRecordRepository generalRecordRepository;
+
+    @RequestMapping("/score/{id}")
+    public Map<String,Double> getEvaluate(@PathVariable("id") Integer id){
+        HashMap<String,Double> ans = new HashMap<>();
+        EvaluateServiceImpl evaluateService = new EvaluateServiceImpl(generalRecordRepository);
+        ans.put("helper",evaluateService.getQuestionScore(id,"helper"));
+        ans.put("evaluate",evaluateService.getQuestionScore(id,"evaluate"));
+        return ans;
+    }
+}

seec-data-server/src/main/java/cn/seecoder/data/server/controller/HelperController.java

@@ -0,0 +1,16 @@
+package cn.seecoder.data.server.controller;
+
+import cn.seecoder.data.server.repository.GeneralRecordRepository;
+import cn.seecoder.data.server.service.Impl.EvaluateServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelperController {
+
+    @Autowired
+    private GeneralRecordRepository generalRecordRepository;
+}

seec-data-server/src/main/java/cn/seecoder/data/server/domain/EvaluateDao.java

@@ -18,4 +18,7 @@ public class EvaluateDao {
 
     @Column(name = "exam_id" , nullable = false)
     private Integer examId;
+
+    @Column(name = "difficuty")
+    private Integer difficuty;
 }

seec-data-server/src/main/java/cn/seecoder/data/server/domain/GeneralRecordDao.java

@@ -1,8 +1,12 @@
 package cn.seecoder.data.server.domain;
 
 import lombok.Data;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.springframework.data.annotation.CreatedDate;
 
 import javax.persistence.*;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 @Data
@@ -34,9 +38,11 @@ public class GeneralRecordDao {
     @Column(name = "submit_time")
     private LocalDateTime submitTime;
 
+    @CreationTimestamp
     @Column(name = "create_time")
     private LocalDateTime createTime;
 
+    @UpdateTimestamp
     @Column(name = "update_time")
     private LocalDateTime updateTime;
 

seec-data-server/src/main/java/cn/seecoder/data/server/domain/helper/HelperEventDao.java

@@ -0,0 +1,27 @@
+package cn.seecoder.data.server.domain.helper;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Data
+@Entity
+@Table(name = "helper_event")
+public class HelperEventDao {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "type")
+    private String type;
+
+    @Column(name = "time")
+    private LocalDateTime time;
+
+    @Column(name = "action")
+    private String action;
+
+    @Column(name = "description")
+    private String description;
+}

seec-data-server/src/main/java/cn/seecoder/data/server/domain/HelperQuizDao.java → seec-data-server/src/main/java/cn/seecoder/data/server/domain/helper/HelperQuizDao.java

@@ -1,4 +1,4 @@
-package cn.seecoder.data.server.domain;
+package cn.seecoder.data.server.domain.helper;
 
 
 import lombok.Data;

seec-data-server/src/main/java/cn/seecoder/data/server/repository/helper/HelperEventRepository.java

@@ -0,0 +1,7 @@
+package cn.seecoder.data.server.repository.helper;
+
+import cn.seecoder.data.server.domain.helper.HelperEventDao;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface HelperEventRepository extends JpaRepository<HelperEventDao,Integer> {
+}

seec-data-server/src/main/java/cn/seecoder/data/server/repository/HelperQuizRepository.java → seec-data-server/src/main/java/cn/seecoder/data/server/repository/helper/HelperQuizRepository.java

@@ -1,9 +1,11 @@
-package cn.seecoder.data.server.repository;
+package cn.seecoder.data.server.repository.helper;
 
-import cn.seecoder.data.server.domain.HelperQuizDao;
+import cn.seecoder.data.server.domain.helper.HelperQuizDao;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface HelperQuizRepository extends JpaRepository<HelperQuizDao,Integer> {
 }

seec-data-server/src/main/java/cn/seecoder/data/server/schedule/EvaluateSchedule.java

@@ -16,6 +16,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 @Component
@@ -47,14 +48,14 @@ public class EvaluateSchedule {
             String temp = restTemplate.getForObject(
                     "http://47.111.95.164:8080/api/exam/list/range?startTime={1}&endTime={2}",
                     String.class,
-                    startTime,
-                    endTime
+                    "2010-01-01 00:00:00",
+                    "2021-04-27 00:00:00"
             );
             JSONObject ans = JSON.parseObject(temp);
             JSONArray results = ans.getJSONArray("result");
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             for(int i=0;i<results.size();i++){
                 int examId = results.getJSONObject(i).getInteger("examId");
-                LocalDateTime now = LocalDateTime.now();
                 String recordString = restTemplate.getForObject(
                         "http://47.111.95.164:8080/api/record/{1}",
                         String.class,
@@ -65,11 +66,12 @@ public class EvaluateSchedule {
                     EvaluateDao evaluatedao = new EvaluateDao();
                     GeneralRecordDao generalrecorddao = new GeneralRecordDao();
                     JSONObject recordResult = recordResults.getJSONObject(j);
-                    generalrecorddao.setUpdateTime(now);
-                    generalrecorddao.setCreateTime(now);
+                    generalrecorddao.setStartTime(LocalDateTime.parse(results.getJSONObject(i).getString("startTime"),dtf));
+                    generalrecorddao.setEndTime(LocalDateTime.parse(results.getJSONObject(i).getString("endTime"),dtf));
                     generalrecorddao.setQuestionId(recordResult.getString("questionId"));
                     generalrecorddao.setUserId(recordResult.getInteger("studentId"));
                     generalrecorddao.setAnswer(recordResult.getString("submitAnswer"));
+                    generalrecorddao.setSubmitTime(LocalDateTime.parse(recordResult.getString("submitTime"),dtf));
                     if(recordResult.getString("message")==null)
                         generalrecorddao.setPass(null);
                     else if(recordResult.getString("message").equals("Accepted"))
@@ -102,28 +104,14 @@ public class EvaluateSchedule {
                     int grid = generalrecorddao.getId();
                     evaluatedao.setExamId(examId);
                     evaluatedao.setGeneralId(grid);
+                    evaluatedao.setDifficuty(results.getJSONObject(i).getInteger("difficulty"));
                     EvaluateDao ed = evaluateRepository.save(evaluatedao);
-                    System.out.println(gr.toString());
+                    System.out.println(evaluatedao);
+                    System.out.println(generalrecorddao);
                 }
             }
         }catch (Exception e){
             System.out.println(e);
         }
-
-
-//        try {
-//            RestTemplate restTemplate = new RestTemplate();
-//            String temp = restTemplate.getForObject(
-//                    "http://47.111.95.164:8080/api/exam/list/range?startTime={1}&endTime={2}",
-//                    String.class,
-//                    "2020-01-01 00:00:00",
-//                    "2021-4-14 00:00:00"
-//                    );
-//            JSONObject ans = new JSONObject(temp);
-//            System.out.println(ans.toString());
-//            System.out.println(ans.getString("msg"));
-//        }catch (Exception e){
-//            System.out.println(e);
-//        };
     }
 }

seec-data-server/src/main/java/cn/seecoder/data/server/schedule/HelperSchedule.java

@@ -2,16 +2,20 @@ package cn.seecoder.data.server.schedule;
 
 
 import cn.seecoder.data.server.domain.GeneralRecordDao;
-import cn.seecoder.data.server.domain.HelperQuizDao;
+import cn.seecoder.data.server.domain.helper.HelperEventDao;
+import cn.seecoder.data.server.domain.helper.HelperQuizDao;
 import cn.seecoder.data.server.repository.GeneralRecordRepository;
+import cn.seecoder.data.server.repository.helper.HelperEventRepository;
+import cn.seecoder.data.server.repository.helper.HelperQuizRepository;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import com.alibaba.fastjson.JSONArray;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
 @Component
@@ -20,39 +24,91 @@ public class HelperSchedule {
     @Autowired
     private GeneralRecordRepository generalRecordRepository;
 
+    @Autowired
+    private HelperQuizRepository helperQuizRepository;
+
+    @Autowired
+    private HelperEventRepository helperEventRepository;
+
+    public HelperSchedule(GeneralRecordRepository generalRecordRepository,HelperQuizRepository helperQuizRepository,HelperEventRepository helperEventRepository){
+        this.generalRecordRepository = generalRecordRepository;
+        this.helperQuizRepository = helperQuizRepository;
+        this.helperEventRepository = helperEventRepository;
+    }
+
     @Scheduled(cron = "00 00 00 * * ?")
-    public void HelperQuizExtraction(){
-//        HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
-//        httpRequestFactory.setConnectionRequestTimeout(10*1000);
-//        httpRequestFactory.setConnectTimeout(10*1000);
-//        httpRequestFactory.setReadTimeout(10*1000);
+    public void helperQuizExtraction(){
         RestTemplate restTemplate = new RestTemplate();
-        GeneralRecordDao generalRecordDao = new GeneralRecordDao();
-        HelperQuizDao helperQuizDao = new HelperQuizDao();
         JSONArray temp;
         try{
             temp = restTemplate.getForObject(
                     "http://localhost:8080/api/quiz/quiz-records/all?start={1}&end={2}",
                     JSONArray.class,
-                    "2010-01-01 00:00:00",
-                    "2020-06-01 00:00:00"
+                    "2020-06-01 00:00:00",
+                    "2021-04-27 00:00:00"
             );
             for(int i=0;i<temp.size();i++){
                 JSONObject quiz_record = temp.getJSONObject(i);
                 for (Map.Entry entry : quiz_record.getJSONObject("answers").entrySet()) {
-                    String questionId = entry.getKey().toString();
-                    if(((JSONObject)JSONObject.toJSON(entry.getValue())).getJSONObject("answer").equals("true"))
-                        System.out.println("true");
-                    else
-                        System.out.println("false");
-                    System.out.println(entry.getKey());
-                    System.out.println(entry.getValue());
+                    GeneralRecordDao generalRecordDao = new GeneralRecordDao();
+                    HelperQuizDao helperQuizDao = new HelperQuizDao();
+                    generalRecordDao.setUserId(Integer.parseInt(quiz_record.getString("studentId")));
+                    generalRecordDao.setQuestionId(entry.getKey().toString());
+                    generalRecordDao.setAnswer(((JSONObject)JSONObject.toJSON(entry.getValue())).getString("answer"));
+                    generalRecordDao.setDataSource("helper");
+                    generalRecordDao.setScoreTotal(5);
+                    getTime(generalRecordDao,Integer.parseInt(quiz_record.getString("quizId")),restTemplate,quiz_record.getString("submitAt"));
+                    if(((JSONObject)JSONObject.toJSON(entry.getValue())).getBooleanValue("correct")) {
+                        generalRecordDao.setPass(1);
+                        generalRecordDao.setScore(5);
+                    }
+                    else{
+                        generalRecordDao.setPass(0);
+                        generalRecordDao.setScore(0);
+                    }
+                    GeneralRecordDao ans = generalRecordRepository.save(generalRecordDao);
+                    helperQuizDao.setQuizId(Integer.parseInt(quiz_record.getString("quizId")));
+                    helperQuizDao.setQuizName(quiz_record.getString("quizName"));
+                    helperQuizDao.setGeneralId(ans.getId());
+                    helperQuizDao.setSubmitNumber(quiz_record.getInteger("submitNumber"));
+                    helperQuizRepository.save(helperQuizDao);
+                    System.out.println(generalRecordDao);
+                    System.out.println(helperQuizDao);
                 }
-                generalRecordDao.setUserId(Integer.parseInt(quiz_record.getString("studentId")));
 
             }
         }catch (Exception e){
             System.out.println(e);
         }
     }
+
+    @Scheduled(cron = "00 00 00 * * ?")
+    public void helperEventExtraction(){
+        RestTemplate restTemplate = new RestTemplate();
+        JSONArray jsonArray = restTemplate.getForObject(
+                "http://localhost:8080/api/event/time?start={1}&end={2}",
+                JSONArray.class,
+                "2000-01-01 00:00:00",
+                "2021-04-27 00:00:00"
+        );
+        for(int i=0;i<jsonArray.size();i++){
+            HelperEventDao helperEventDao = jsonArray.getObject(i,HelperEventDao.class);
+            helperEventRepository.save(helperEventDao);
+        }
+    }
+
+    public void getTime(GeneralRecordDao generalRecordDao, int quizId, RestTemplate restTemplate, String submit){
+        try {
+            JSONObject quiz = restTemplate.getForObject("http://localhost:8080/api/quiz/{1}",JSONObject.class,quizId);
+            String start = quiz.getString("createAt").replace('T',' ').split("\\.")[0];
+            String end = quiz.getString("createAt").replace('T',' ').split("\\.")[0];
+            DateTimeFormatter sdf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            generalRecordDao.setStartTime(LocalDateTime.parse(start,sdf2));
+            generalRecordDao.setEndTime(LocalDateTime.parse(end,sdf2));
+            generalRecordDao.setSubmitTime(LocalDateTime.parse(submit));
+        }catch (Exception e){
+            System.out.println(e);
+        }
+    }
+
 }

seec-data-server/src/main/java/cn/seecoder/data/server/service/EvaluateService.java

@@ -2,5 +2,5 @@ package cn.seecoder.data.server.service;
 
 public interface EvaluateService {
 
-    public double getEvaluateScore(int userId);
+    public double getQuestionScore(int userId,String dataSource);
 }

seec-data-server/src/main/java/cn/seecoder/data/server/service/HelperService.java

@@ -0,0 +1,6 @@
+package cn.seecoder.data.server.service;
+
+public interface HelperService {
+
+    public int getHelperScoreById(int id);
+}

seec-data-server/src/main/java/cn/seecoder/data/server/service/Impl/EvaluateServiceImpl.java

@@ -22,9 +22,9 @@ public class EvaluateServiceImpl implements EvaluateService {
     }
 
     @Override
-    public double getEvaluateScore(int userId) {
+    public double getQuestionScore(int userId,String dataSource) {
         SeecoderBokClient seecoderBokClient = new SeecoderBokClient("http://bok.seec.seecoder.cn");
-        List<GeneralRecordDao> generalRecordDaoList = generalRecordRepository.getByUserIdAndDataSource(userId,"evaluate");
+        List<GeneralRecordDao> generalRecordDaoList = generalRecordRepository.getByUserIdAndDataSource(userId,dataSource);
         ArrayList<String> questionIds = new ArrayList<String>();
         for(int i=0;i<generalRecordDaoList.size();i++)
             questionIds.add(generalRecordDaoList.get(i).getQuestionId());
@@ -41,7 +41,7 @@ public class EvaluateServiceImpl implements EvaluateService {
             else
                 score = score + generalRecordDao.getScore() * weight[questionVO.getWeight()];
         }
-        double ans = score/scoreTotal*100;
+        double ans = score/scoreTotal;
         return ans;
     }
 }

seec-data-server/src/main/java/cn/seecoder/data/server/service/Impl/HelperServiceImpl.java

@@ -0,0 +1,26 @@
+package cn.seecoder.data.server.service.Impl;
+
+import cn.seecoder.data.server.domain.GeneralRecordDao;
+import cn.seecoder.data.server.repository.GeneralRecordRepository;
+import cn.seecoder.data.server.service.HelperService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class HelperServiceImpl implements HelperService {
+
+    @Autowired
+    GeneralRecordRepository generalRecordRepository;
+
+    @Override
+    public int getHelperScoreById(int id) {
+        List<GeneralRecordDao> generalRecordDaos = generalRecordRepository.getByUserIdAndDataSource(id,"helper");
+        double scoreGotten = 0;
+        double scoreTotal = 0;
+        for(int i=0;i<generalRecordDaos.size();i++){
+        }
+        return 0;
+    }
+}

seec-data-server/src/test/java/cn/seecoder/data/server/schedule/HelperScheduleTest.java

@@ -1,14 +1,42 @@
 package cn.seecoder.data.server.schedule;
 
+import cn.seecoder.data.server.repository.GeneralRecordRepository;
+import cn.seecoder.data.server.repository.helper.HelperEventRepository;
+import cn.seecoder.data.server.repository.helper.HelperQuizRepository;
 import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.python.util.PythonInterpreter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.jupiter.api.Assertions.*;
+import java.io.IOException;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@Rollback(value = true)
+@SpringBootTest
 
 class HelperScheduleTest {
 
-    @Test
-    void helperQuizExtraction() {
-        HelperSchedule helperSchedule = new HelperSchedule();
-        helperSchedule.HelperQuizExtraction();
-    }
+    @Autowired
+    GeneralRecordRepository generalRecordRepository;
+
+    @Autowired
+    HelperQuizRepository helperQuizRepository;
+
+    @Autowired
+    HelperEventRepository helperEventRepository;
+
+//    @Test
+//    void helperQuizExtraction() {
+//        HelperSchedule helperSchedule = new HelperSchedule(generalRecordRepository,helperQuizRepository,helperEventRepository);
+//        helperSchedule.HelperQuizExtraction();
+//    }
+
+//    @Test
+//    void helperEventExtractionTest(){
+//        HelperSchedule helperSchedule = new HelperSchedule(generalRecordRepository,helperQuizRepository,helperEventRepository);
+//        helperSchedule.helperEventExtraction();
+//    }
 }

seec-data-server/src/test/java/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.java

@@ -9,21 +9,23 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.text.SimpleDateFormat;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@Rollback
-@SpringBootTest
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@Rollback
+//@SpringBootTest
 class EvaluateServiceImplTest {
 
     @Autowired
     GeneralRecordRepository generalRecordRepository;
 
-    @Test
-    void getEvaluateScore() {
-        EvaluateServiceImpl evaluateService = new EvaluateServiceImpl(generalRecordRepository);
-        double score = evaluateService.getEvaluateScore(332);
-        System.out.println(score);
-    }
+//    @Test
+//    void getEvaluateScore() {
+//        EvaluateServiceImpl evaluateService = new EvaluateServiceImpl(generalRecordRepository);
+//        double score = evaluateService.getEvaluateScore(332);
+//        System.out.println(score);
+//    }
 }

seec-data-server/src/test/java/cn/seecoder/data/server/service/Impl/GeneralServiceImplTest.java

@@ -30,9 +30,9 @@ class GeneralServiceImplTest {
     @Autowired
     KnowledgeRepository knowledgeRepository;
 
-    @Test
-    void getTreeNode(){
-        GeneralServiceImpl generalService = new GeneralServiceImpl(generalRecordRepository,knowledgeRepository);
-        generalService.getTreeNode(332);
-    }
+//    @Test
+//    void getTreeNode(){
+//        GeneralServiceImpl generalService = new GeneralServiceImpl(generalRecordRepository,knowledgeRepository);
+//        generalService.getTreeNode(332);
+//    }
 }