181250114 4 лет назад
Родитель
Сommit
28307bda13

+ 7 - 19
src/main/java/com/seecoder/dataanalysis/analysis/impl/DevcloudDataAnalysisServiceImpl.java

@@ -575,7 +575,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
         //如果devcloudUser不存在,说明用户还没有加入任何项目
         //但如果存在对应的User信息,则帮用户新建devcloudUser
         if(!result.isPresent()){
-            System.out.println("没有查找到学生id");
+//            System.out.println("没有查找到学生id");
         }else {
             devcloudUser = devcloudUserDao.findById(user_id).get();
         }
@@ -610,9 +610,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo中的commit信息
             List<CommitInfo> commitInfos = devcloudInfo.getCommitList();
             for(CommitInfo commitInfo : commitInfos){
-                if(commitInfo.getUserId().equals(null)){
-                    continue;
-                }else if(commitInfo.getUserId().equals(user_id)){
+                if(commitInfo.getUserId().equals(user_id)){
                     commit_times++;
                     commit_msg_overview.add(commitInfo.getMessage());
                     //如果是需求的commit
@@ -632,9 +630,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo中的test信息
             List<TestInfo> testInfos = devcloudInfo.getTestList();
             for(TestInfo testInfo : testInfos){
-                if(testInfo.getUserId().equals(null)) {
-                    continue;
-                }else if(testInfo.getUserId().equals(user_id)){
+                if(testInfo.getUserId().equals(user_id)){
                     test_times++;
                     test_success += testInfo.getSuccess();
                     test_failure += testInfo.getFailure();
@@ -648,9 +644,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
                 //遍历每个流水线中的部署记录
                 List<RecordInfo> recordInfos = pipelineInfo.getRecordList();
                 for(RecordInfo recordInfo : recordInfos){
-                    if(recordInfo.getUserId().equals(null)) {
-                        continue;
-                    }else if(recordInfo.getUserId().equals(user_id)){
+                    if(recordInfo.getUserId().equals(user_id)){
                         pipeline_deploy++;
                         if(recordInfo.getResult().equals("部署成功")){
                             pipeline_pass++;
@@ -741,9 +735,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             for(CommitInfo commitInfo : commitInfos){
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
-                    if(commitInfo.getUserId().equals(null)) {
-                        continue;
-                    }else if(commitInfo.getUserId().equals(user_id)){
+                    if(commitInfo.getUserId().equals(user_id)){
                         commitTimes[j]++;
                         commit_msg_overview.add(commitInfo.getMessage());
                         //如果是需求的commit
@@ -767,9 +759,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             for(TestInfo testInfo : testInfos){
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
-                    if(testInfo.getUserId().equals(null)) {
-                        continue;
-                    }else if(testInfo.getUserId().equals(user_id)){
+                    if(testInfo.getUserId().equals(user_id)){
                         testTimes[j]++;
                         test_success += testInfo.getSuccess();
                         test_failure += testInfo.getFailure();
@@ -786,9 +776,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
                 for(int j=0;j<userIds.size();j++){
                     Integer user_id = userIds.get(j);
                     for(RecordInfo recordInfo : recordInfos){
-                        if(recordInfo.getUserId().equals(null)) {
-                            continue;
-                        }else if(recordInfo.getUserId().equals(user_id)){
+                        if(recordInfo.getUserId().equals(user_id)){
                             pipeline_deploy++;
                             pipeTimes[j]++;
                             if(recordInfo.getResult().equals("部署成功")){