Browse Source

fix: 部署问题

mjh 3 years ago
parent
commit
f18628fc66

+ 1 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -111,6 +111,7 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/project/findById",
                         "/api/project/findById",
                         "/api/project/findByCourse",
                         "/api/project/findByCourse",
                         "/api/project/updateState",
                         "/api/project/updateState",
+                        "/api/project/findAllPublicGroupByCourse",
                         "/api/group",
                         "/api/group",
                         "/api/group/one",
                         "/api/group/one",
                         "/api/group/all",
                         "/api/group/all",

+ 2 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -59,4 +59,6 @@ public interface CourseService {
     Boolean uploadCarouselChart(List<String> courses);
     Boolean uploadCarouselChart(List<String> courses);
 
 
     List<CourseVO> queryCarouselChart();
     List<CourseVO> queryCarouselChart();
+
+    CourseVO findCourseByName(String name);
 }
 }

+ 7 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/ProjectService.java

@@ -78,4 +78,11 @@ public interface ProjectService {
      * @return JSONArray
      * @return JSONArray
      */
      */
     JSONArray findProjectMembers(Integer projectId);
     JSONArray findProjectMembers(Integer projectId);
+
+    /**
+     * 查找全部公开项目,并以项目所属课程分类返回
+     *
+     * @return JSONObject course: Array(projects)
+     */
+    JSONObject findAllPublicProjectsGroupByCourse();
 }
 }

+ 5 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/CourseServiceImpl.java

@@ -319,4 +319,9 @@ public class CourseServiceImpl implements CourseService {
             return null;
             return null;
         }
         }
     }
     }
+
+    @Override
+    public CourseVO findCourseByName(String name) {
+        return courseMapper.courseToCourseVO(courseRepository.findCourseByName(name).orElse(null));
+    }
 }
 }

+ 11 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/ProjectServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.seecoder.seecoderportalserver.serviceImpl;
 package cn.seecoder.seecoderportalserver.serviceImpl;
 
 
+import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.domain.CourseProject;
 import cn.seecoder.seecoderportalserver.domain.CourseProject;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
@@ -176,6 +177,16 @@ public class ProjectServiceImpl implements ProjectService {
         return devcloudService.getProjectMembers(projectId);
         return devcloudService.getProjectMembers(projectId);
     }
     }
 
 
+    @Override
+    public JSONObject findAllPublicProjectsGroupByCourse() {
+        List<CourseVO> courseVOList = courseService.findRecommendCourses();
+        JSONObject result = new JSONObject();
+        for (CourseVO courseVO : courseVOList) {
+            result.put(courseVO.getName(), this.findProjectsByCourse(courseVO.getId()).getJSONArray("public"));
+        }
+        return result;
+    }
+
     private void addProjectMember(Integer projectId, String phone) {
     private void addProjectMember(Integer projectId, String phone) {
         JSONObject devcloudRes = devcloudService.addMember(projectId, phone);
         JSONObject devcloudRes = devcloudService.addMember(projectId, phone);
         log.info("devcloudService.addMember: {}", devcloudRes);
         log.info("devcloudService.addMember: {}", devcloudRes);

+ 5 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CourseController.java

@@ -118,4 +118,9 @@ public class CourseController {
     public OkResponse<List<CourseVO>> queryCarouselChart(){
     public OkResponse<List<CourseVO>> queryCarouselChart(){
         return OkResponse.of(courseService.queryCarouselChart());
         return OkResponse.of(courseService.queryCarouselChart());
     }
     }
+
+    @GetMapping("/findCourseByName")
+    public OkResponse<CourseVO> findCourseByName(@RequestParam String name){
+        return OkResponse.of(courseService.findCourseByName(name));
+    }
 }
 }

+ 7 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/ProjectController.java

@@ -72,4 +72,11 @@ public class ProjectController {
     public OkResponse<JSONObject> forkProject(@RequestParam Integer projectId, @RequestParam(defaultValue = "") String name){
     public OkResponse<JSONObject> forkProject(@RequestParam Integer projectId, @RequestParam(defaultValue = "") String name){
         return OkResponse.of(projectService.forkPublicProject(projectId, name));
         return OkResponse.of(projectService.forkPublicProject(projectId, name));
     }
     }
+
+
+    @ApiOperation(value = "查找全部公开项目", httpMethod = "GET")
+    @GetMapping("/findAllPublicGroupByCourse")
+    public OkResponse<JSONObject> findAllPublicProjectsGroupByCourse(){
+        return OkResponse.of(projectService.findAllPublicProjectsGroupByCourse());
+    }
 }
 }