|
@@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
import com.seecoder.dataanalysis.analysis.DevcloudDataAnalysisService;
|
|
import com.seecoder.dataanalysis.analysis.DevcloudDataAnalysisService;
|
|
|
import com.seecoder.dataanalysis.controller.DevcloudController;
|
|
import com.seecoder.dataanalysis.controller.DevcloudController;
|
|
|
import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudInfoDao;
|
|
import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudInfoDao;
|
|
|
|
|
+import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudProjectDao;
|
|
|
|
|
+import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudUserDao;
|
|
|
|
|
+import com.seecoder.dataanalysis.data.dao.devcloud.ProjectRelateDao;
|
|
|
import com.seecoder.dataanalysis.data.dao.eval.UserDao;
|
|
import com.seecoder.dataanalysis.data.dao.eval.UserDao;
|
|
|
import com.seecoder.dataanalysis.data.entity.devcloud.*;
|
|
import com.seecoder.dataanalysis.data.entity.devcloud.*;
|
|
|
import com.seecoder.dataanalysis.data.entity.devcloud.display.FormatGroup;
|
|
import com.seecoder.dataanalysis.data.entity.devcloud.display.FormatGroup;
|
|
@@ -46,6 +49,12 @@ public class DevcloudDataAnalysisServiceImplTest {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private UserDao userDao;
|
|
private UserDao userDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
|
+ private DevcloudUserDao devcloudUserDao;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private DevcloudProjectDao devcloudProjectDao;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ProjectRelateDao projectRelateDao;
|
|
|
|
|
+ @Autowired
|
|
|
private DevcloudController devcloudController;
|
|
private DevcloudController devcloudController;
|
|
|
|
|
|
|
|
// @Test
|
|
// @Test
|
|
@@ -251,7 +260,7 @@ public class DevcloudDataAnalysisServiceImplTest {
|
|
|
@Test
|
|
@Test
|
|
|
void type111(){
|
|
void type111(){
|
|
|
UserDTO userDTO = new UserDTO();
|
|
UserDTO userDTO = new UserDTO();
|
|
|
- userDTO.setUserId(10);
|
|
|
|
|
|
|
+ userDTO.setUserId(1506);
|
|
|
userDTO.setName("森明");
|
|
userDTO.setName("森明");
|
|
|
userDTO.setRole(UserRole.STUDENT);
|
|
userDTO.setRole(UserRole.STUDENT);
|
|
|
userDTO.setEmail("123456@qq.com");
|
|
userDTO.setEmail("123456@qq.com");
|
|
@@ -279,4 +288,50 @@ public class DevcloudDataAnalysisServiceImplTest {
|
|
|
|
|
|
|
|
formatGroup.display();
|
|
formatGroup.display();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ @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);
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|