fix: 更新计数逻辑2

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

@@ -815,24 +815,36 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             commit_times += commitInfos.size();
             for(CommitInfo commitInfo : commitInfos){
                 commit_msg_overview.add(commitInfo.getMessage());
+                //如果是需求的commit
+                if(commitInfo.getType().toLowerCase().equals("tree_id")||commitInfo.getMessage().startsWith("feat:")){
+                    feature_commit++;
+                }
+                //如果是bug_list的commit
+                if(commitInfo.getType().toLowerCase().equals("bug_id")||commitInfo.getMessage().startsWith("fix:")){
+                    buglist_commit++;
+                }
+                //判断是否是有效的commit
+                if(commitInfo.getMessage().startsWith("feat:")||commitInfo.getMessage().startsWith("fix:")){
+                    valid_commit_time++;
+                }
                 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
-                        if(commitInfo.getType().toLowerCase().equals("tree_id")||commitInfo.getMessage().startsWith("feat:")){
-                            feature_commit++;
-                        }
-                        //如果是bug_list的commit
-                        if(commitInfo.getType().toLowerCase().equals("bug_id")||commitInfo.getMessage().startsWith("fix:")){
-                            buglist_commit++;
-                        }
-                        //判断是否是有效的commit
-                        if(commitInfo.getMessage().startsWith("feat:")||commitInfo.getMessage().startsWith("fix:")){
-                            valid_commit_time++;
-                        }
+//                        //如果是需求的commit
+//                        if(commitInfo.getType().toLowerCase().equals("tree_id")||commitInfo.getMessage().startsWith("feat:")){
+//                            feature_commit++;
+//                        }
+//                        //如果是bug_list的commit
+//                        if(commitInfo.getType().toLowerCase().equals("bug_id")||commitInfo.getMessage().startsWith("fix:")){
+//                            buglist_commit++;
+//                        }
+//                        //判断是否是有效的commit
+//                        if(commitInfo.getMessage().startsWith("feat:")||commitInfo.getMessage().startsWith("fix:")){
+//                            valid_commit_time++;
+//                        }
                     }
                 }
             }
@@ -840,16 +852,20 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             List<TestInfo> testInfos = devcloudInfo.getTestList();
             test_times += testInfos.size();
             for(TestInfo testInfo : testInfos){
+                test_success += testInfo.getSuccess();
+                test_failure += testInfo.getFailure();
+                test_concurrency_count += testInfo.getSuccess();
+                test_concurrency_count += testInfo.getFailure();
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
                     if(testInfo.getUserId() == null) {
                         continue;
                     }else if(testInfo.getUserId().equals(user_id)){
                         testTimes[j]++;
-                        test_success += testInfo.getSuccess();
-                        test_failure += testInfo.getFailure();
-                        test_concurrency_count += testInfo.getSuccess();
-                        test_concurrency_count += testInfo.getFailure();
+//                        test_success += testInfo.getSuccess();
+//                        test_failure += testInfo.getFailure();
+//                        test_concurrency_count += testInfo.getSuccess();
+//                        test_concurrency_count += testInfo.getFailure();
                     }
                 }
             }
@@ -858,20 +874,37 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             for(PipelineInfo pipelineInfo : pipelineInfos){
                 //遍历每个流水线中的部署记录
                 List<RecordInfo> recordInfos = pipelineInfo.getRecordList();
-                for(int j=0;j<userIds.size();j++){
-                    Integer user_id = userIds.get(j);
-                    for(RecordInfo recordInfo : recordInfos){
-                        pipeline_deploy++;
+//                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)){
+//                            pipeTimes[j]++;
+//                            if(recordInfo.getResult().equals("部署成功")){
+//                                pipeline_pass++;
+//                            }
+//                            if(recordInfo.getResult().equals("部署失败")){
+//                                pipeline_failure++;
+//                            }
+//                        }
+//                    }
+//                }
+                for(RecordInfo recordInfo : recordInfos){
+                    pipeline_deploy++;
+                    if(recordInfo.getResult().equals("部署成功")){
+                        pipeline_pass++;
+                    }
+                    if(recordInfo.getResult().equals("部署失败")){
+                        pipeline_failure++;
+                    }
+                    for(int j=0;j<userIds.size();j++){
+                        Integer user_id = userIds.get(j);
                         if(recordInfo.getUserId() == null) {
                             continue;
                         }else if(recordInfo.getUserId().equals(user_id)){
                             pipeTimes[j]++;
-                            if(recordInfo.getResult().equals("部署成功")){
-                                pipeline_pass++;
-                            }
-                            if(recordInfo.getResult().equals("部署失败")){
-                                pipeline_failure++;
-                            }
                         }
                     }
                 }
@@ -881,18 +914,24 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             List<BugInfo> bugInfos = devcloudInfo.getBugList();
             for(BugInfo bugInfo : bugInfos){
                 bug_times++;
+                if(bugInfo.getPriority().toLowerCase().equals("high")){
+                    high_times++;
+                }
+                if(bugInfo.getBugState().toLowerCase().equals("finished")){
+                    finished_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]++;
-                        if(bugInfo.getPriority().toLowerCase().equals("high")){
-                            high_times++;
-                        }
-                        if(bugInfo.getBugState().toLowerCase().equals("finished")){
-                            finished_times++;
-                        }
+//                        if(bugInfo.getPriority().toLowerCase().equals("high")){
+//                            high_times++;
+//                        }
+//                        if(bugInfo.getBugState().toLowerCase().equals("finished")){
+//                            finished_times++;
+//                        }
                     }
                 }
             }
@@ -901,18 +940,24 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             List<TreeNodeInfo> treeNodeInfos = devcloudInfo.getTreeNodeList();
             for(TreeNodeInfo treeNodeInfo : treeNodeInfos){
                 treeNode_times++;
+                if(treeNodeInfo.getPriority().toLowerCase().equals("high")){
+                    high_treeNode_times++;
+                }
+                if(treeNodeInfo.getState().toLowerCase().equals("finished")){
+                    finished_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]++;
-                        if(treeNodeInfo.getPriority().toLowerCase().equals("high")){
-                            high_treeNode_times++;
-                        }
-                        if(treeNodeInfo.getState().toLowerCase().equals("finished")){
-                            finished_treeNode_times++;
-                        }
+//                        if(treeNodeInfo.getPriority().toLowerCase().equals("high")){
+//                            high_treeNode_times++;
+//                        }
+//                        if(treeNodeInfo.getState().toLowerCase().equals("finished")){
+//                            finished_treeNode_times++;
+//                        }
                     }
                 }
             }