|
|
@@ -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());
|
|
|
}
|
|
|
|
|
|
|