fix: 修改计数逻辑

src/main/java/com/seecoder/dataanalysis/analysis/impl/DevcloudDataAnalysisServiceImpl.java

@@ -814,13 +814,13 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
 //            System.out.println("commitInfosSize: "+commitInfos.size());
             commit_times += commitInfos.size();
             for(CommitInfo commitInfo : commitInfos){
+                commit_msg_overview.add(commitInfo.getMessage());
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
                     if(commitInfo.getUserId() == null) {
                         continue;
                     }else if(commitInfo.getUserId().equals(user_id)){
                         commitTimes[j]++;
-                        commit_msg_overview.add(commitInfo.getMessage());
                         //如果是需求的commit
                         if(commitInfo.getType().toLowerCase().equals("tree_id")||commitInfo.getMessage().startsWith("feat:")){
                             feature_commit++;
@@ -861,10 +861,10 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
                     for(RecordInfo recordInfo : recordInfos){
+                        pipeline_deploy++;
                         if(recordInfo.getUserId() == null) {
                             continue;
                         }else if(recordInfo.getUserId().equals(user_id)){
-                            pipeline_deploy++;
                             pipeTimes[j]++;
                             if(recordInfo.getResult().equals("部署成功")){
                                 pipeline_pass++;
@@ -880,13 +880,13 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo中的bugList信息
             List<BugInfo> bugInfos = devcloudInfo.getBugList();
             for(BugInfo bugInfo : bugInfos){
+                bug_times++;
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
                     if(bugInfo.getUserId() == null){
                         continue;
                     }else if(bugInfo.getUserId().equals(user_id)){
                         bugTimes[j]++;
-                        bug_times++;
                         if(bugInfo.getPriority().toLowerCase().equals("high")){
                             high_times++;
                         }
@@ -900,13 +900,13 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo的treeNode信息
             List<TreeNodeInfo> treeNodeInfos = devcloudInfo.getTreeNodeList();
             for(TreeNodeInfo treeNodeInfo : treeNodeInfos){
+                treeNode_times++;
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
                     if(treeNodeInfo.getUserId() == null){
                         continue;
                     }else if(treeNodeInfo.getUserId().equals(user_id)){
                         treeNodeTimes[j]++;
-                        treeNode_times++;
                         if(treeNodeInfo.getPriority().toLowerCase().equals("high")){
                             high_treeNode_times++;
                         }

src/test/java/com/seecoder/dataanalysis/devcloud/impl/DevcloudDataAnalysisServiceImplTest.java

@@ -294,48 +294,142 @@ public class DevcloudDataAnalysisServiceImplTest {
 
     @Test
     void analyzeGroup6(){
-//        List<Integer> projectIds = new ArrayList<>();
-//        projectIds.add(2959);
-//        projectIds.add(2958);
-//        DevcloudUser devcloudUser1 = new DevcloudUser();
-//        devcloudUser1.setUserId(1566);
-//        devcloudUser1.setProjectIds(projectIds);
-//        DevcloudUser devcloudUser2 = new DevcloudUser();
-//        devcloudUser2.setUserId(1681);
-//        devcloudUser2.setProjectIds(projectIds);
-//        DevcloudUser devcloudUser3 = new DevcloudUser();
-//        devcloudUser3.setUserId(1587);
-//        devcloudUser3.setProjectIds(projectIds);
-//        DevcloudUser devcloudUser4 = new DevcloudUser();
-//        devcloudUser4.setUserId(1729);
-//        devcloudUser4.setProjectIds(projectIds);
-//
-//        devcloudUserDao.save(devcloudUser1);
-//        devcloudUserDao.save(devcloudUser2);
-//        devcloudUserDao.save(devcloudUser3);
-//        devcloudUserDao.save(devcloudUser4);
-//
-//        List<Integer> members = new ArrayList<>();
-//        members.add(1566);
-//        members.add(1681);
-//        members.add(1587);
-//        members.add(1729);
-//        DevcloudProject devcloudProject1 = new DevcloudProject();
-//        devcloudProject1.setProjectId(2959);
-//        devcloudProject1.setUserIds(members);
-//        DevcloudProject devcloudProject2 = new DevcloudProject();
-//        devcloudProject2.setProjectId(2958);
-//        devcloudProject2.setUserIds(members);
-//
-//        devcloudProjectDao.save(devcloudProject1);
-//        devcloudProjectDao.save(devcloudProject2);
-//
-//        ProjectRelate projectRelate1 = new ProjectRelate();
-//        projectRelate1.setProjectId(2959);
-//        projectRelate1.setRelateId(2958);
-//
-//        projectRelateDao.save(projectRelate1);
+        List<Integer> projectIds = new ArrayList<>();
+        projectIds.add(2959);
+        projectIds.add(2958);
+        DevcloudUser devcloudUser1 = new DevcloudUser();
+        devcloudUser1.setUserId(1566);
+        devcloudUser1.setProjectIds(projectIds);
+        DevcloudUser devcloudUser2 = new DevcloudUser();
+        devcloudUser2.setUserId(1681);
+        devcloudUser2.setProjectIds(projectIds);
+        DevcloudUser devcloudUser3 = new DevcloudUser();
+        devcloudUser3.setUserId(1587);
+        devcloudUser3.setProjectIds(projectIds);
+        DevcloudUser devcloudUser4 = new DevcloudUser();
+        devcloudUser4.setUserId(1729);
+        devcloudUser4.setProjectIds(projectIds);
+
+        devcloudUserDao.save(devcloudUser1);
+        devcloudUserDao.save(devcloudUser2);
+        devcloudUserDao.save(devcloudUser3);
+        devcloudUserDao.save(devcloudUser4);
+
+        List<Integer> members = new ArrayList<>();
+        members.add(1566);
+        members.add(1681);
+        members.add(1587);
+        members.add(1729);
+        DevcloudProject devcloudProject1 = new DevcloudProject();
+        devcloudProject1.setProjectId(2959);
+        devcloudProject1.setUserIds(members);
+        DevcloudProject devcloudProject2 = new DevcloudProject();
+        devcloudProject2.setProjectId(2958);
+        devcloudProject2.setUserIds(members);
+
+        devcloudProjectDao.save(devcloudProject1);
+        devcloudProjectDao.save(devcloudProject2);
+
+        ProjectRelate projectRelate1 = new ProjectRelate();
+        projectRelate1.setProjectId(2959);
+        projectRelate1.setRelateId(2958);
+
+        projectRelateDao.save(projectRelate1);
 
         System.out.println(displayService.getGroupAnalysisById(1566));
     }
+
+    @Test
+    void analyzeGroup45(){
+        List<Integer> projectIds = new ArrayList<>();
+        projectIds.add(3049);
+        projectIds.add(3048);
+        DevcloudUser devcloudUser1 = new DevcloudUser();
+        devcloudUser1.setUserId(1709);
+        devcloudUser1.setProjectIds(projectIds);
+        DevcloudUser devcloudUser2 = new DevcloudUser();
+        devcloudUser2.setUserId(1654);
+        devcloudUser2.setProjectIds(projectIds);
+        DevcloudUser devcloudUser3 = new DevcloudUser();
+        devcloudUser3.setUserId(1649);
+        devcloudUser3.setProjectIds(projectIds);
+        DevcloudUser devcloudUser4 = new DevcloudUser();
+        devcloudUser4.setUserId(1668);
+        devcloudUser4.setProjectIds(projectIds);
+
+        devcloudUserDao.save(devcloudUser1);
+        devcloudUserDao.save(devcloudUser2);
+        devcloudUserDao.save(devcloudUser3);
+        devcloudUserDao.save(devcloudUser4);
+
+        List<Integer> members = new ArrayList<>();
+        members.add(1709);
+        members.add(1654);
+        members.add(1649);
+        members.add(1668);
+        DevcloudProject devcloudProject1 = new DevcloudProject();
+        devcloudProject1.setProjectId(3049);
+        devcloudProject1.setUserIds(members);
+        DevcloudProject devcloudProject2 = new DevcloudProject();
+        devcloudProject2.setProjectId(3048);
+        devcloudProject2.setUserIds(members);
+
+        devcloudProjectDao.save(devcloudProject1);
+        devcloudProjectDao.save(devcloudProject2);
+
+        ProjectRelate projectRelate1 = new ProjectRelate();
+        projectRelate1.setProjectId(3048);
+        projectRelate1.setRelateId(3049);
+
+        projectRelateDao.save(projectRelate1);
+
+        System.out.println(displayService.getGroupAnalysisById(1709));
+    }
+
+    @Test
+    void analyzeGroup1(){
+        List<Integer> projectIds = new ArrayList<>();
+        projectIds.add(3071);
+        projectIds.add(3072);
+        DevcloudUser devcloudUser1 = new DevcloudUser();
+        devcloudUser1.setUserId(1594);
+        devcloudUser1.setProjectIds(projectIds);
+        DevcloudUser devcloudUser2 = new DevcloudUser();
+        devcloudUser2.setUserId(1637);
+        devcloudUser2.setProjectIds(projectIds);
+        DevcloudUser devcloudUser3 = new DevcloudUser();
+        devcloudUser3.setUserId(1598);
+        devcloudUser3.setProjectIds(projectIds);
+        DevcloudUser devcloudUser4 = new DevcloudUser();
+        devcloudUser4.setUserId(1601);
+        devcloudUser4.setProjectIds(projectIds);
+
+        devcloudUserDao.save(devcloudUser1);
+        devcloudUserDao.save(devcloudUser2);
+        devcloudUserDao.save(devcloudUser3);
+        devcloudUserDao.save(devcloudUser4);
+
+        List<Integer> members = new ArrayList<>();
+        members.add(1594);
+        members.add(1637);
+        members.add(1598);
+        members.add(1601);
+        DevcloudProject devcloudProject1 = new DevcloudProject();
+        devcloudProject1.setProjectId(3071);
+        devcloudProject1.setUserIds(members);
+        DevcloudProject devcloudProject2 = new DevcloudProject();
+        devcloudProject2.setProjectId(3072);
+        devcloudProject2.setUserIds(members);
+
+        devcloudProjectDao.save(devcloudProject1);
+        devcloudProjectDao.save(devcloudProject2);
+
+        ProjectRelate projectRelate1 = new ProjectRelate();
+        projectRelate1.setProjectId(3071);
+        projectRelate1.setRelateId(3072);
+
+        projectRelateDao.save(projectRelate1);
+
+        System.out.println(displayService.getGroupAnalysisById(1594 ));
+    }
 }