Quellcode durchsuchen

fix: 根据需求对部分实体类进行修改

181250114 vor 4 Jahren
Ursprung
Commit
8742e4b2cb

+ 7 - 0
src/main/java/com/seecoder/dataanalysis/data/dao/devcloud/ProjectDao.java

@@ -0,0 +1,7 @@
+package com.seecoder.dataanalysis.data.dao.devcloud;
+
+import com.seecoder.dataanalysis.data.entity.devcloud.Project;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+public interface ProjectDao extends MongoRepository<Project, Integer> {
+}

+ 6 - 1
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/DevcloudProject.java

@@ -7,12 +7,12 @@ import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 记录项目和学生的对应关系(一个项目中有哪些成员)
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
@@ -30,4 +30,9 @@ public class DevcloudProject {
      */
     @Field("member_ids")
     private List<Integer> userIds;
+
+
+    public DevcloudProject(){
+        this.userIds = new ArrayList<>();
+    }
 }

+ 5 - 1
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/DevcloudUser.java

@@ -7,12 +7,12 @@ import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 记录学生和项目的对应关系
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
@@ -30,4 +30,8 @@ public class DevcloudUser {
      */
     @Field("project_ids")
     private List<Integer> projectIds;
+
+    public DevcloudUser(){
+        this.projectIds = new ArrayList<>();
+    }
 }

+ 19 - 2
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/Project.java

@@ -5,8 +5,13 @@ import lombok.Data;
 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;
 
+/**
+ * 类似于User类,查询devcloud本身的数据库
+ */
+@Document(collection = "project")
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
@@ -23,6 +28,18 @@ public class Project {
     /**
      * 项目名称
      */
-    @Field("project_name")
-    private String projectName;
+    @Field("name")
+    private String name;
+
+    /**
+     * 项目描述
+     */
+    @Field("description")
+    private String description;
+
+    /**
+     * 项目Url
+     */
+    @Field("git_remote_url")
+    private String gitRemoteUrl;
 }

+ 8 - 2
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/display/Commit.java

@@ -5,12 +5,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 用于展示commit分析结果的类
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
@@ -44,5 +44,11 @@ public class Commit {
     /**
      * commit贡献占比(小组中)
      */
-    private Contribution commit_contribution;
+    private List<Contribution> commit_contribution;
+
+
+    public Commit(){
+        this.commit_msg_overview = new ArrayList<>();
+        this.commit_contribution = new ArrayList<>();
+    }
 }

+ 7 - 1
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/display/FormatGroup.java

@@ -7,12 +7,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 用于展示小组分析结果的类
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
@@ -49,4 +49,10 @@ public class FormatGroup {
     private Pipeline pipeline;
 
 
+    public FormatGroup(){
+        this.projects = new ArrayList<>();
+        this.students = new ArrayList<>();
+    }
+
+
 }

+ 6 - 1
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/display/FormatStudent.java

@@ -6,12 +6,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 用于展示学生分析结果的类
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
@@ -53,4 +53,9 @@ public class FormatStudent {
     private Pipeline pipeline;
 
 
+    public FormatStudent(){
+        this.projects = new ArrayList<>();
+    }
+
+
 }

+ 9 - 2
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/display/Pipeline.java

@@ -5,10 +5,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 用于展示pipeline分析结果的类
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
@@ -32,5 +34,10 @@ public class Pipeline {
     /**
      * 流水线贡献占比(小组中)
      */
-    private Contribution pipeline_contribution;
+    private List<Contribution> pipeline_contribution;
+
+    public Pipeline(){
+        this.pipeline_contribution = new ArrayList<>();
+    }
+
 }

+ 13 - 2
src/main/java/com/seecoder/dataanalysis/data/entity/devcloud/display/Test.java

@@ -5,15 +5,22 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 用于展示Test分析结果的类
  */
-@NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Data
 public class Test {
 
+    /**
+     * 测试总次数
+     */
+    private Integer test_times;
+
     /**
      * 测试执行总次数
      */
@@ -32,5 +39,9 @@ public class Test {
     /**
      * 测试贡献占比(小组中)
      */
-    private Contribution test_contribution;
+    private List<Contribution> test_contribution;
+
+    public Test(){
+        this.test_contribution = new ArrayList<>();
+    }
 }