uncln před 5 roky
rodič
revize
0bdad4ea83
42 změnil soubory, kde provedl 126 přidání a 11 odebrání
  1. 1 1
      .idea/misc.xml
  2. 16 1
      seec-data-server/pom.xml
  3. 8 6
      seec-data-server/src/main/java/cn/seecoder/data/server/domain/GeneralRecordDao.java
  4. 27 0
      seec-data-server/src/main/java/cn/seecoder/data/server/domain/HelperQuizDao.java
  5. 2 0
      seec-data-server/src/main/java/cn/seecoder/data/server/repository/EvaluateRepository.java
  6. 9 0
      seec-data-server/src/main/java/cn/seecoder/data/server/repository/HelperQuizRepository.java
  7. 2 0
      seec-data-server/src/main/java/cn/seecoder/data/server/repository/KnowledgeRepository.java
  8. 2 3
      seec-data-server/src/main/java/cn/seecoder/data/server/schedule/EvaluateSchedule.java
  9. 45 0
      seec-data-server/src/main/java/cn/seecoder/data/server/schedule/HelperSchedule.java
  10. 14 0
      seec-data-server/src/test/java/cn/seecoder/data/server/schedule/HelperScheduleTest.java
  11. binární
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/EvaluateRepository.class
  12. binární
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/GeneralRecordRepository.class
  13. binární
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/KnowledgeRepository.class
  14. binární
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/BugListRepository.class
  15. binární
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/CommitRepository.class
  16. binární
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/TreeRepository.class
  17. binární
      seec-data-server/target/classes/cn/seecoder/data/server/SeecDataServerApplication.class
  18. binární
      seec-data-server/target/classes/cn/seecoder/data/server/controller/EvaluateController.class
  19. binární
      seec-data-server/target/classes/cn/seecoder/data/server/domain/EvaluateDao.class
  20. binární
      seec-data-server/target/classes/cn/seecoder/data/server/domain/GeneralRecordDao.class
  21. binární
      seec-data-server/target/classes/cn/seecoder/data/server/domain/KnowledgeDao.class
  22. binární
      seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/BugListDao.class
  23. binární
      seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/CommitDao.class
  24. binární
      seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/TreeDao.class
  25. binární
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO$BugListDTOBuilder.class
  26. binární
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO.class
  27. binární
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/CommitDTO.class
  28. binární
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/Response.class
  29. binární
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/TreeDTO.class
  30. binární
      seec-data-server/target/classes/cn/seecoder/data/server/dto/knowledge/KnowledgeNodeDTO.class
  31. binární
      seec-data-server/target/classes/cn/seecoder/data/server/schedule/DevcloudSchedule.class
  32. binární
      seec-data-server/target/classes/cn/seecoder/data/server/schedule/EvaluateSchedule.class
  33. binární
      seec-data-server/target/classes/cn/seecoder/data/server/service/GeneralService.class
  34. binární
      seec-data-server/target/classes/cn/seecoder/data/server/service/Impl/GeneralServiceImpl.class
  35. binární
      seec-data-server/target/classes/cn/seecoder/data/server/service/Impl/evaluateServiceImpl.class
  36. binární
      seec-data-server/target/classes/cn/seecoder/data/server/service/evaluateService.class
  37. binární
      seec-data-server/target/test-classes/cn/seecoder/data/server/dto/devcloud/BugListDTOTest.class
  38. binární
      seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/DevcloudScheduleTest.class
  39. binární
      seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/EvaluateScheduleTest.class
  40. binární
      seec-data-server/target/test-classes/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.class
  41. binární
      seec-data-server/target/test-classes/cn/seecoder/data/server/service/Impl/GeneralServiceImplTest.class
  42. binární
      seec-data-server/target/test-classes/config/PropertyTestConfig.class

+ 1 - 1
.idea/misc.xml

@@ -12,7 +12,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

+ 16 - 1
seec-data-server/pom.xml

@@ -14,7 +14,7 @@
 	<name>seec-data-server</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>1.8</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -74,6 +74,19 @@
 			<artifactId>seecoder-bok-client</artifactId>
 			<version>0.1.1</version>
 		</dependency>
+<!--		&lt;!&ndash; https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore &ndash;&gt;-->
+<!--		<dependency>-->
+<!--			<groupId>org.apache.httpcomponents</groupId>-->
+<!--			<artifactId>httpcore</artifactId>-->
+<!--			<version>4.4.10</version>-->
+<!--		</dependency>-->
+
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.6</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -81,6 +94,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.3.2.RELEASE</version>
 				<configuration>
 					<excludes>
 						<exclude>
@@ -93,4 +107,5 @@
 		</plugins>
 	</build>
 
+
 </project>

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

@@ -3,8 +3,7 @@ package cn.seecoder.data.server.domain;
 import lombok.Data;
 
 import javax.persistence.*;
-import java.util.Date;
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 @Data
 @Entity
@@ -27,16 +26,19 @@ public class GeneralRecordDao {
     private Integer pass;
 
     @Column(name = "start_time")
-    private Timestamp startTime;
+    private LocalDateTime startTime;
 
     @Column(name = "end_time")
-    private Timestamp endTime;
+    private LocalDateTime endTime;
+
+    @Column(name = "submit_time")
+    private LocalDateTime submitTime;
 
     @Column(name = "create_time")
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
     @Column(name = "update_time")
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 
     @Column(name = "data_source" , nullable = false)
     private String dataSource;

+ 27 - 0
seec-data-server/src/main/java/cn/seecoder/data/server/domain/HelperQuizDao.java

@@ -0,0 +1,27 @@
+package cn.seecoder.data.server.domain;
+
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@Table(name = "helper_quiz")
+public class HelperQuizDao {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "general_id",nullable = false)
+    private Integer generalId;
+
+    @Column(name = "quiz_id",nullable = false)
+    private Integer quizId;
+
+    @Column(name = "quiz_name",nullable = false)
+    private String quizName;
+
+    @Column(name = "submit_number")
+    private Integer submitNumber;
+}

+ 2 - 0
seec-data-server/src/main/java/cn/seecoder/data/server/repository/EvaluateRepository.java

@@ -2,6 +2,8 @@ package cn.seecoder.data.server.repository;
 
 import cn.seecoder.data.server.domain.EvaluateDao;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface EvaluateRepository extends JpaRepository<EvaluateDao,Integer> {
 }

+ 9 - 0
seec-data-server/src/main/java/cn/seecoder/data/server/repository/HelperQuizRepository.java

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

+ 2 - 0
seec-data-server/src/main/java/cn/seecoder/data/server/repository/KnowledgeRepository.java

@@ -2,9 +2,11 @@ package cn.seecoder.data.server.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import cn.seecoder.data.server.domain.KnowledgeDao;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface KnowledgeRepository extends JpaRepository<KnowledgeDao,Integer> {
 
     public List<KnowledgeDao> findByAbbreviation(String abbreviation);

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

@@ -15,10 +15,9 @@ import org.springframework.web.client.RestTemplate;
 
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Calendar;
 import java.util.Date;
-import java.sql.Timestamp;
-
 @Component
 public class EvaluateSchedule {
 
@@ -55,7 +54,7 @@ public class EvaluateSchedule {
             JSONArray results = ans.getJSONArray("result");
             for(int i=0;i<results.size();i++){
                 int examId = results.getJSONObject(i).getInteger("examId");
-                Timestamp now = new Timestamp(new Date().getTime());
+                LocalDateTime now = LocalDateTime.now();
                 String recordString = restTemplate.getForObject(
                         "http://47.111.95.164:8080/api/record/{1}",
                         String.class,

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

@@ -0,0 +1,45 @@
+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.repository.GeneralRecordRepository;
+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;
+
+@Component
+public class HelperSchedule {
+
+    @Autowired
+    private GeneralRecordRepository generalRecordRepository;
+
+    @Scheduled(cron = "00 00 00 * * ?")
+    public void HelperQuizExtraction(){
+//        HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
+//        httpRequestFactory.setConnectionRequestTimeout(10*1000);
+//        httpRequestFactory.setConnectTimeout(10*1000);
+//        httpRequestFactory.setReadTimeout(10*1000);
+        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"
+            );
+            for(int i=0;i<temp.size();i++){
+                JSONObject quiz_record = temp.getJSONObject(i);
+            }
+        }catch (Exception e){
+            System.out.println(e);
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+package cn.seecoder.data.server.schedule;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class HelperScheduleTest {
+
+    @Test
+    void helperQuizExtraction() {
+        HelperSchedule helperSchedule = new HelperSchedule();
+        helperSchedule.HelperQuizExtraction();
+    }
+}

binární
seec-data-server/target/classes/cn/seecoder/data/server/Repository/EvaluateRepository.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/Repository/GeneralRecordRepository.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/Repository/KnowledgeRepository.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/BugListRepository.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/CommitRepository.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/TreeRepository.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/SeecDataServerApplication.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/controller/EvaluateController.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/domain/EvaluateDao.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/domain/GeneralRecordDao.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/domain/KnowledgeDao.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/BugListDao.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/CommitDao.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/TreeDao.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO$BugListDTOBuilder.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/CommitDTO.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/Response.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/TreeDTO.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/dto/knowledge/KnowledgeNodeDTO.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/schedule/DevcloudSchedule.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/schedule/EvaluateSchedule.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/service/GeneralService.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/service/Impl/GeneralServiceImpl.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/service/Impl/evaluateServiceImpl.class


binární
seec-data-server/target/classes/cn/seecoder/data/server/service/evaluateService.class


binární
seec-data-server/target/test-classes/cn/seecoder/data/server/dto/devcloud/BugListDTOTest.class


binární
seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/DevcloudScheduleTest.class


binární
seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/EvaluateScheduleTest.class


binární
seec-data-server/target/test-classes/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.class


binární
seec-data-server/target/test-classes/cn/seecoder/data/server/service/Impl/GeneralServiceImplTest.class


binární
seec-data-server/target/test-classes/config/PropertyTestConfig.class