181250114 4 лет назад
Родитель
Сommit
53c826d2f5

+ 7 - 0
src/main/java/com/seecoder/dataanalysis/analysis/DisplayService.java

@@ -1,6 +1,7 @@
 package com.seecoder.dataanalysis.analysis;
 
 import cn.seecoder.bok.common.vo.QuestionVO;
+import com.seecoder.dataanalysis.data.entity.devcloud.DevcloudInfo;
 import com.seecoder.dataanalysis.data.entity.devcloud.display.FormatGroup;
 import com.seecoder.dataanalysis.data.entity.eval.User;
 import com.seecoder.dataanalysis.data.entity.eval.display.FormatQuestion;
@@ -39,4 +40,10 @@ public interface DisplayService {
      * @return List<QuestionVO>
      */
     List<QuestionVO> getRecommendQuestions(int user_id);
+
+    /**
+     * 返回所有DevcloudInfo
+     * @return List<DevcloudInfo>
+     */
+    List<DevcloudInfo> getAllDevcloudInfo();
 }

+ 10 - 0
src/main/java/com/seecoder/dataanalysis/analysis/impl/DisplayServiceImpl.java

@@ -5,9 +5,11 @@ import com.seecoder.dataanalysis.analysis.DevcloudDataAnalysisService;
 import com.seecoder.dataanalysis.analysis.DisplayService;
 import com.seecoder.dataanalysis.analysis.EvalDataAnalysisService;
 import com.seecoder.dataanalysis.analysis.RecommendService;
+import com.seecoder.dataanalysis.data.dao.devcloud.DevcloudInfoDao;
 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.entity.devcloud.DevcloudInfo;
 import com.seecoder.dataanalysis.data.entity.devcloud.DevcloudUser;
 import com.seecoder.dataanalysis.data.entity.devcloud.ProjectRelate;
 import com.seecoder.dataanalysis.data.entity.devcloud.display.FormatGroup;
@@ -30,6 +32,8 @@ public class DisplayServiceImpl implements DisplayService {
     @Autowired
     private DevcloudUserDao devcloudUserDao;
     @Autowired
+    private DevcloudInfoDao devcloudInfoDao;
+    @Autowired
     private DevcloudDataAnalysisService devcloudDataAnalysisService;
     @Autowired
     private RecommendService recommendService;
@@ -100,4 +104,10 @@ public class DisplayServiceImpl implements DisplayService {
 
         return res;
     }
+
+    @Override
+    public List<DevcloudInfo> getAllDevcloudInfo(){
+        List<DevcloudInfo> devcloudInfos = devcloudInfoDao.findAll();
+        return devcloudInfos;
+    }
 }

+ 8 - 0
src/main/java/com/seecoder/dataanalysis/controller/DisplayController.java

@@ -1,11 +1,14 @@
 package com.seecoder.dataanalysis.controller;
 
 import com.seecoder.dataanalysis.analysis.DisplayService;
+import com.seecoder.dataanalysis.data.entity.devcloud.DevcloudInfo;
 import com.seecoder.dataanalysis.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @CrossOrigin
 @RequestMapping("/display")
@@ -36,4 +39,9 @@ public class DisplayController {
     public ResponseVO getRecommendQuestions(@RequestParam(value = "user_id") Integer user_id){
         return ResponseVO.buildSuccess(displayService.getRecommendQuestions(user_id));
     }
+
+    @GetMapping("/getAllDevcloudInfo")
+    public ResponseVO getAllDevcloudInfo(){
+        return ResponseVO.buildSuccess(displayService.getAllDevcloudInfo());
+    }
 }

+ 56 - 1
src/test/java/com/seecoder/dataanalysis/devcloud/impl/DevcloudDataAnalysisServiceImplTest.java

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