1
0
Просмотр исходного кода

fix: sonar java check, get quality info of one specific commit

claws 4 лет назад
Родитель
Сommit
7cfabbe126

+ 13 - 2
web/src/main/java/cn/seecoder/web/service/impl/project/CommitServiceImpl.java

@@ -54,6 +54,7 @@ public class CommitServiceImpl implements CommitService {
 
     @Autowired
     private UserMapper userMapper;
+    @Autowired
     private CommitQualityMapper commitQualityMapper;
 
     @Override
@@ -133,7 +134,7 @@ public class CommitServiceImpl implements CommitService {
                 CommitQualityPO commitQualityPO = stringCommitQualityPOMap.getOrDefault(hash, null);
                 if (commitQualityPO == null) {
                     commitVO.setCheckResult(CommitCheckResultEnum.NONE);
-                } else if (commitQualityPO.getCommitHash().equals("OK")) {
+                } else if (commitQualityPO.getCheckResult().equals("OK")) {
                     commitVO.setCheckResult(CommitCheckResultEnum.PASS);
                 } else {
                     commitVO.setCheckResult(CommitCheckResultEnum.FAIL);
@@ -164,6 +165,16 @@ public class CommitServiceImpl implements CommitService {
                 System.out.println("hh");
                 commitVO.setRelatedType(CommitRelatedEnum.NONE);
             }
+
+            CommitQualityPO commitQualityPO = commitQualityMapper.selectByCommitHash(hash);
+            if (commitQualityPO == null) {
+                commitVO.setCheckResult(CommitCheckResultEnum.NONE);
+            } else if (commitQualityPO.getCheckResult().equals("OK")) {
+                commitVO.setCheckResult(CommitCheckResultEnum.PASS);
+            } else {
+                commitVO.setCheckResult(CommitCheckResultEnum.FAIL);
+            }
+
             return commitVO;
         } catch (Exception e){
             e.printStackTrace();
@@ -257,7 +268,7 @@ public class CommitServiceImpl implements CommitService {
             log.error("传入的Sonar Result VO存在问题");
             return false;
         } catch (ParseException e) {
-            log.error("传入的时间格式不争取,期待格式:yyyy-MM-dd'T'HH:mm:ss");
+            log.error("传入的时间格式不正确,期待格式:yyyy-MM-dd'T'HH:mm:ss");
             return false;
         }
     }