fix: 修改计数逻辑

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

@@ -814,18 +814,22 @@ 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());
-                //如果是需求的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++;
+                if(commitInfo.getUserId() == null){
+                    continue;
+                }else{
+                    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);
@@ -852,10 +856,14 @@ 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();
+                if(testInfo.getUserId() == null){
+                    continue;
+                }else {
+                    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) {
@@ -892,12 +900,16 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
 //                    }
 //                }
                 for(RecordInfo recordInfo : recordInfos){
-                    pipeline_deploy++;
-                    if(recordInfo.getResult().equals("部署成功")){
-                        pipeline_pass++;
-                    }
-                    if(recordInfo.getResult().equals("部署失败")){
-                        pipeline_failure++;
+                    if(recordInfo.getUserId() == null){
+                        continue;
+                    }else {
+                        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);
@@ -913,12 +925,16 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo中的bugList信息
             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++;
+                if(bugInfo.getUserId() == null){
+                    continue;
+                }else {
+                    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);
@@ -939,12 +955,16 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo的treeNode信息
             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++;
+                if(treeNodeInfo.getUserId() == null){
+                    continue;
+                }else {
+                    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);