feat: 修改bug_commit和feature_commit的判定方式

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

@@ -766,11 +766,11 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
                         commitTimes[j]++;
                         commit_msg_overview.add(commitInfo.getMessage());
                         //如果是需求的commit
-                        if(commitInfo.getType().toLowerCase().equals("tree_id")){
+                        if(commitInfo.getType().toLowerCase().equals("tree_id")||commitInfo.getMessage().startsWith("feat:")){
                             feature_commit++;
                         }
                         //如果是bug_list的commit
-                        if(commitInfo.getType().toLowerCase().equals("bug_id")){
+                        if(commitInfo.getType().toLowerCase().equals("bug_id")||commitInfo.getMessage().startsWith("fix:")){
                             buglist_commit++;
                         }
                         //判断是否是有效的commit

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

@@ -3,6 +3,7 @@ package com.seecoder.dataanalysis.devcloud.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.seecoder.dataanalysis.analysis.DevcloudDataAnalysisService;
+import com.seecoder.dataanalysis.analysis.DisplayService;
 import com.seecoder.dataanalysis.controller.DevcloudController;
 import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudInfoDao;
 import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudProjectDao;
@@ -45,6 +46,8 @@ public class DevcloudDataAnalysisServiceImplTest {
     @Autowired
     private DevcloudDataAnalysisService devcloudDataAnalysisService;
     @Autowired
+    private DisplayService displayService;
+    @Autowired
     private DevcloudInfoDao devcloudInfoDao;
     @Autowired
     private UserDao userDao;
@@ -291,47 +294,48 @@ 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));
     }
 }