Просмотр исходного кода

refactor: 获取bug list的时候不一并获取commit

370774330@qq.com 5 лет назад
Родитель
Сommit
03700e13a2

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/bug_list/BugListUpdateBasicVO.java

@@ -25,5 +25,5 @@ public class BugListUpdateBasicVO {
     @ApiModelProperty("预计花销时间,单位毫秒")
     private Long timeToTake;
     @ApiModelProperty("负责人")
-    private String processorId;
+    private Integer processorId;
 }

+ 4 - 8
web/src/main/java/cn/seecoder/web/model/vo/bug_list/BugListVO.java

@@ -3,16 +3,12 @@ package cn.seecoder.web.model.vo.bug_list;
 import cn.seecoder.web.model.enums.BugListStateEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;
 import cn.seecoder.web.model.po.bug_list.BugListPO;
-import cn.seecoder.web.model.po.project.CommitPO;
-import cn.seecoder.web.model.vo.project.CommitVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
 import java.sql.Timestamp;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author PuHong Weng
@@ -47,8 +43,8 @@ public class BugListVO {
     @ApiModelProperty("状态")
     private BugListStateEnum state;
 
-    @ApiModelProperty
-    private List<CommitVO> commits;
+//    @ApiModelProperty
+//    private List<CommitVO> commits;
 
     @ApiModelProperty("负责人id")
     private Integer processorId;
@@ -56,8 +52,8 @@ public class BugListVO {
     @ApiModelProperty("负责人名字")
     private String processorName;
 
-    public BugListVO(BugListPO bugListPO, List<CommitPO> commits, String username){
-        this.commits = commits.stream().map(CommitVO::new).collect(Collectors.toList());
+    public BugListVO(BugListPO bugListPO, String username){
+        //this.commits = commits.stream().map(CommitVO::new).collect(Collectors.toList());
         BeanUtils.copyProperties(bugListPO,this);
         processorName = username;
     }

+ 13 - 12
web/src/main/java/cn/seecoder/web/service/impl/bug_list/BugListServiceImpl.java

@@ -1,24 +1,25 @@
 package cn.seecoder.web.service.impl.bug_list;
 
-import cn.seecoder.web.dao.bug_list.BugListMapper;
-import cn.seecoder.web.model.enums.BugListStateEnum;
-import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.service.bug_list.BugListService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import cn.seecoder.web.core.commit.model.CommitState;
+import cn.seecoder.web.dao.bug_list.BugListMapper;
 import cn.seecoder.web.dao.project.CommitMapper;
 import cn.seecoder.web.dao.user.UserMapper;
+import cn.seecoder.web.model.enums.BugListStateEnum;
 import cn.seecoder.web.model.po.bug_list.BugListPO;
-import cn.seecoder.web.model.po.project.CommitPO;
 import cn.seecoder.web.model.po.user.UserPO;
 import cn.seecoder.web.model.vo.bug_list.BugListCreateVO;
 import cn.seecoder.web.model.vo.bug_list.BugListUpdateBasicVO;
 import cn.seecoder.web.model.vo.bug_list.BugListVO;
+import cn.seecoder.web.service.bug_list.BugListService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -61,15 +62,15 @@ public class BugListServiceImpl implements BugListService {
     @Override
     public List<BugListVO> list(Integer projectId) {
         List<BugListPO> bugs = bugListMapper.selectByProjectId(projectId);
-        List<CommitPO> commits = commitMapper.selectByProjectIdAndType(projectId, CommitRelatedEnum.BUG_ID);
-        Map<Integer, List<CommitPO>> commitsMap = commits.stream().collect(Collectors.groupingBy(CommitPO::getRelatedId));
+        //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();
             return userId != null? userId : -1;
         }).filter(x -> x!=-1).collect(Collectors.toList());
         List<UserPO> users = userIds.size()==0? new ArrayList<>() :userMapper.selectByIds(userIds);
         Map<Integer, String> usernameMap = users.stream().collect(Collectors.toMap(UserPO::getId, UserPO::getUsername));
-        return bugs.stream().map(x -> new BugListVO(x, commitsMap.getOrDefault(x.getId(),new ArrayList<>()), usernameMap.getOrDefault(x.getProcessorId(), "no one"))).collect(Collectors.toList());
+        return bugs.stream().map(x -> new BugListVO(x, usernameMap.getOrDefault(x.getProcessorId(), "no one"))).collect(Collectors.toList());
     }