فهرست منبع

stype: commit enum 统一命名规范

370774330@qq.com 5 سال پیش
والد
کامیت
3ac3cb7905

+ 3 - 3
web/src/main/java/cn/seecoder/web/controller/gitlab/HookController.java

@@ -3,7 +3,7 @@ package cn.seecoder.web.controller.gitlab;
 import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.web.core.commit.CommitResolver;
 import cn.seecoder.web.core.commit.model.CommitRule;
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.model.po.project.CommitPO;
 import cn.seecoder.web.model.vo.GitWebHookVO;
 import cn.seecoder.web.service.project.BugListService;
@@ -89,11 +89,11 @@ public class HookController {
             switch (rule.getType()){
                 case FEAT:
                     treeNodeService.updateNodeState(rule.getId(),rule.getState());
-                    commitService.save(new CommitPO(commit,projectId, CommitRelatedType.BUG_ID,userId));
+                    commitService.save(new CommitPO(commit,projectId, CommitRelatedEnum.BUG_ID,userId));
                     break;
                 case FIX:
                     bugListService.updateState(rule.getState(), rule.getId());
-                    commitService.save(new CommitPO(commit,projectId, CommitRelatedType.BUG_ID,userId));
+                    commitService.save(new CommitPO(commit,projectId, CommitRelatedEnum.BUG_ID,userId));
                     break;
                 case UNKNOWN:
                     break;

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/project/CommitMapper.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.dao.project;
 
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
@@ -24,7 +24,7 @@ public interface CommitMapper {
     int update(CommitPO commitPO);
 
     @Select("select * from commit where project_id = #{projectId} and related_type = #{type}")
-    List<CommitPO> selectByProjectIdAndType(@Param("projectId") int projectId,@Param("type") CommitRelatedType type);
+    List<CommitPO> selectByProjectIdAndType(@Param("projectId") int projectId,@Param("type") CommitRelatedEnum type);
 
     @Select("select count(*) from commit where id = #{id}")
     int isExist(String id);

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/enums/CommitRelatedType.java → web/src/main/java/cn/seecoder/web/model/enums/CommitRelatedEnum.java

@@ -10,14 +10,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * commit规范中  #id 所关联的id 类型
  * 目前关联的id有两种,一种是需求的TreeId,一种是Bug List里的Bug id
  */
-public enum CommitRelatedType {
+public enum CommitRelatedEnum {
     @JsonProperty("tree_id")
     TREE_ID("tree_id"),
     @JsonProperty("bug_id")
     BUG_ID("bug_id");
 
     private final String value;
-    CommitRelatedType(String value) {
+    CommitRelatedEnum(String value) {
         this.value = value;
     }
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/model/po/project/CommitPO.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.model.po.project;
 
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,9 +24,9 @@ public class CommitPO {
     private String title;
     private String timestamp;
     private String gitlabUsername;
-    private CommitRelatedType relatedType;
+    private CommitRelatedEnum relatedType;
     /**
-     * 关联的id,详见 CommitRelatedType
+     * 关联的id,详见 CommitRelatedEnum
      */
     private Integer relatedId;
 
@@ -40,7 +40,7 @@ public class CommitPO {
      */
     private Integer userId;
 
-    public CommitPO(GitWebHookVO.Commit commit, Integer projectId, CommitRelatedType type, Integer userId){
+    public CommitPO(GitWebHookVO.Commit commit, Integer projectId, CommitRelatedEnum type, Integer userId){
         BeanUtils.copyProperties(commit,this);
         this.gitlabUsername = commit.getAuthor().getName();
         this.projectId = projectId;

+ 2 - 0
web/src/main/java/cn/seecoder/web/service/impl/APITest/APITestServiceImpl.java

@@ -79,6 +79,8 @@ public class APITestServiceImpl implements APITestService {
         int qps = testInfo.getQps();
         String method = testInfo.getMethod();
 
+        //
+
         if (method.equals("GET")) { // GET方法
             handleRequest(url, params, qps, testId, "GET");
         } else if (method.equals("POST")) { // POST方法

+ 2 - 2
web/src/main/java/cn/seecoder/web/service/impl/project/BugListServiceImpl.java

@@ -2,7 +2,7 @@ package cn.seecoder.web.service.impl.project;
 
 import cn.seecoder.web.dao.project.BugListMapper;
 import cn.seecoder.web.model.enums.BugListStateEnum;
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.service.project.BugListService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class BugListServiceImpl implements BugListService {
     @Override
     public List<BugListVO> list(Integer projectId) {
         List<BugListPO> bugs = bugListMapper.selectByProjectId(projectId);
-        List<CommitPO> commits = commitMapper.selectByProjectIdAndType(projectId, CommitRelatedType.BUG_ID);
+        List<CommitPO> commits = commitMapper.selectByProjectIdAndType(projectId, CommitRelatedEnum.BUG_ID);
         Map<Integer, List<CommitPO>> commitsMap = commits.stream().collect(Collectors.groupingBy(CommitPO::getRelatedId));
         List<Integer> userIds = bugs.stream().map(x -> {
             Integer userId = x.getProcessorId();

+ 2 - 2
web/src/main/java/cn/seecoder/web/service/impl/project/CommitServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.service.impl.project;
 
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.seecoder.web.dao.project.CommitMapper;
@@ -30,7 +30,7 @@ public class CommitServiceImpl implements CommitService {
     }
 
     @Override
-    public List<CommitPO> listByProjectAndType(Integer projectId, CommitRelatedType type) {
+    public List<CommitPO> listByProjectAndType(Integer projectId, CommitRelatedEnum type) {
         return commitMapper.selectByProjectIdAndType(projectId,type);
     }
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/service/project/CommitService.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.service.project;
 
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.model.po.project.CommitPO;
 
 import java.util.List;
@@ -14,7 +14,7 @@ public interface CommitService {
 
     void save(CommitPO po);
 
-    List<CommitPO> listByProjectAndType(Integer projectId, CommitRelatedType type);
+    List<CommitPO> listByProjectAndType(Integer projectId, CommitRelatedEnum type);
 
 
     /**

+ 3 - 3
web/src/test/java/cn/seecoder/web/dao/project/CommitMapperTest.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.dao.project;
 
-import cn.seecoder.web.model.enums.CommitRelatedType;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mybatis.spring.annotation.MapperScan;
@@ -36,7 +36,7 @@ class CommitMapperTest {
                 .title("feat: nononono")
                 .projectId(2)
                 .relatedId(3)
-                .relatedType(CommitRelatedType.BUG_ID)
+                .relatedType(CommitRelatedEnum.BUG_ID)
                 .timestamp("2012-01-03T23:36:29+02:00")
                 .build();
         commitMapper.insert(commitPO);
@@ -53,7 +53,7 @@ class CommitMapperTest {
 
     @Test
     void selectByProjectIdAndType() {
-        System.out.println(commitMapper.selectByProjectIdAndType(2,CommitRelatedType.BUG_ID));
+        System.out.println(commitMapper.selectByProjectIdAndType(2, CommitRelatedEnum.BUG_ID));
 
     }