Explorar o código

Merge branch 'zxr_fix_requirement' of WengPuHong/seecoder-devcloud into master

LiuYiYe %!s(int64=5) %!d(string=hai) anos
pai
achega
4572bb497c

+ 6 - 0
web/src/main/java/cn/seecoder/web/controller/gitlab/CommitController.java

@@ -121,4 +121,10 @@ public class CommitController {
         return Response.buildSuccess(commitService.getBugCommit(bugId));
     }
 
+    @ApiOperation(value = "获取指定项目的所有commit信息", httpMethod = "GET")
+    @GetMapping("/commits/list")
+    @ApiImplicitParam(name = "projectId", dataType = "int", paramType = "query")
+    public Response<List<CommitVO>> getCommits(@RequestParam("projectId") Integer projectId) {
+        return Response.buildSuccess(commitService.getCommits(projectId));
+    }
 }

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

@@ -31,4 +31,7 @@ public interface CommitMapper {
     @Select("select * from commit where related_id = #{id} and related_type = #{type}")
     List<CommitPO> selectByRelatedIdAndType(@Param("id") int id,@Param("type") CommitRelatedEnum type);
 
+    @Select("select * from commit where project_id = #{projectId}")
+    List<CommitPO> selectByProjectId(Integer projectId);
+
 }

+ 3 - 0
web/src/main/java/cn/seecoder/web/model/vo/project/CommitVO.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.model.vo.project;
 
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.model.po.project.CommitPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +25,8 @@ public class CommitVO {
     private String timestamp;
     @ApiModelProperty("commit 用户的gitlab用户名")
     private String gitlabUsername;
+    @ApiModelProperty("commit type")
+    private CommitRelatedEnum relatedType;
 
     public CommitVO(CommitPO po) {
         BeanUtils.copyProperties(po,this);

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

@@ -55,4 +55,11 @@ public class CommitServiceImpl implements CommitService {
                 .map(CommitVO::new)
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public List<CommitVO> getCommits(Integer projectId) {
+        return commitMapper.selectByProjectId(projectId).stream()
+                .map(CommitVO::new)
+                .collect(Collectors.toList());
+    }
 }

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

@@ -27,4 +27,6 @@ public interface CommitService {
     List<CommitVO> getTreeCommit(Integer treeId);
 
     List<CommitVO> getBugCommit(Integer bugId);
+
+    List<CommitVO> getCommits(Integer projectId);
 }