将通识课、实操课、AI生成课方法统一调取

byzs-web/src/main/java/cn/iocoder/byzs/module/web/controller/admin/course/WebCourseController.java

@@ -39,17 +39,6 @@ public class WebCourseController {
     @Resource
     private CourseTypeService courseTypeService;
 
-
-    @GetMapping("/getCourseByTypeId")
-    @Operation(summary = "根据大纲类型获得课程列表")
-    @Parameter(name = "typeId", description = "编号", required = true, example = "1024")
-    public CommonResult<List<WebCourseVO>> getCourseByTypeId(@RequestParam("typeId") Long typeId) {
-//        List<CoursePageReqVO> courseList = courseService.getCourseList(new CoursePageReqVO().setCourseType(typeId));
-
-        List<WebCourseVO> courseVoList = webCourseService.getCourseVoByTypeId(typeId);
-        return success(courseVoList);
-    }
-
     @GetMapping("/getTypeGrade")
     @Operation(summary = "获得大纲-根据年级")
     public CommonResult<List<CourseTypeRespVO>> getTypeGrade() {
@@ -59,10 +48,10 @@ public class WebCourseController {
         return success(listVo);
     }
 
-    @GetMapping("/getTypeScByGradeId")
-    @Operation(summary = "获得实操课大纲-根据年级")
-    public CommonResult<List<CourseTypeRespVO>> getTypeScByGradeId(@RequestParam("id") Integer id) {
-        CourseTypeListReqVO listReqVO = new CourseTypeListReqVO().setCtParentId(id).setCtTypeNode("2");
+    @GetMapping("/getTypeByGradeIdType")
+    @Operation(summary = "获得课程大纲-根据年级、课程类型")
+    public CommonResult<List<CourseTypeRespVO>> getTypeByGradeIdType(@RequestParam("id") Integer gradeId, @RequestParam("typeId") String typeId) {
+        CourseTypeListReqVO listReqVO = new CourseTypeListReqVO().setCtParentId(gradeId).setCtTypeNode(typeId);
         List<CourseTypeDO> list = courseTypeService.getCourseTypeList(listReqVO);
         List<CourseTypeRespVO> listVo = BeanUtils.toBean(list, CourseTypeRespVO.class);
         return success(listVo);
@@ -77,6 +66,25 @@ public class WebCourseController {
         return success(listVo);
     }
 
+    @GetMapping("/getTypeScByGradeId")
+    @Operation(summary = "获得实操课大纲-根据年级")
+    public CommonResult<List<CourseTypeRespVO>> getTypeScByGradeId(@RequestParam("id") Integer id) {
+        CourseTypeListReqVO listReqVO = new CourseTypeListReqVO().setCtParentId(id).setCtTypeNode("2");
+        List<CourseTypeDO> list = courseTypeService.getCourseTypeList(listReqVO);
+        List<CourseTypeRespVO> listVo = BeanUtils.toBean(list, CourseTypeRespVO.class);
+        return success(listVo);
+    }
+
+    @GetMapping("/getCourseByTypeId")
+    @Operation(summary = "根据大纲类型获得课程列表")
+    @Parameter(name = "typeId", description = "编号", required = true, example = "1024")
+    public CommonResult<List<WebCourseVO>> getCourseByTypeId(@RequestParam("typeId") Long typeId) {
+//        List<CoursePageReqVO> courseList = courseService.getCourseList(new CoursePageReqVO().setCourseType(typeId));
+
+        List<WebCourseVO> courseVoList = webCourseService.getCourseVoByTypeId(typeId);
+        return success(courseVoList);
+    }
+
     @GetMapping("/getCourseTypeTree")
     @Operation(summary = "获取课程类型树结构(配置权限使用)")
     public CommonResult<List<TreeNode>> getCourseTypeTree() {