From 3f481005be717250a2ea87ff9367aa84d6a3eb13 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 14 九月 2024 10:55:52 +0800 Subject: [PATCH] 课程代码 --- xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java index 4e59057..f2735a5 100644 --- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java +++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java @@ -11,6 +11,7 @@ import com.xinquan.course.domain.TutorSpecialColumn; import com.xinquan.course.domain.TutorSpecialColumnCourse; import com.xinquan.course.domain.vo.ClientCourseVO; +import com.xinquan.course.domain.vo.TutorCourseVO; import com.xinquan.course.domain.vo.TutorVo; import com.xinquan.course.service.CourseCategoryService; import com.xinquan.course.service.CourseService; @@ -25,8 +26,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * <p> @@ -50,30 +54,28 @@ private CourseService courseService; @PostMapping("/getCoursePageList") @ApiOperation(value = "导师专栏",tags = "导师专栏") - @ApiImplicitParams({ - @ApiImplicitParam(value = "分页参数,当前页码", name = "pageCurr", required = true, dataType = "Integer"), - @ApiImplicitParam(value = "分页参数,每页数量", name = "pageSize", required = true, dataType = "Integer") - }) - public R<TutorVo> getCourseList( - @RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr, - @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + + public R<TutorVo> getCourseList() { TutorVo tutorVo = new TutorVo(); TutorSpecialColumn one = tutorSpecialColumnService.lambdaQuery().one(); + List<TutorCourseVO> clientCourseVOS = new ArrayList<>(); if (one!=null){ TutorSpecialColumnCourse one1 = tutorSpecialColumnCourseService.lambdaQuery().eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, one.getId()).one(); BeanUtils.copyProperties(one, tutorVo); - Page<Course> page = courseService.lambdaQuery() + List<Course> page = courseService.lambdaQuery() .in(Course::getId, Arrays.asList(one1.getCourseId().split(","))) - .orderByDesc(Course::getSortNum) - .page(new Page<>(pageCurr, pageSize)); - if (CollUtils.isEmpty(page.getRecords())) { - PageDTO.empty(page); + .orderByDesc(Course::getSortNum).list().stream().limit(2).collect(Collectors.toList()); + for (Course course : page) { + TutorCourseVO tutorCourseVO = new TutorCourseVO(); + BeanUtils.copyProperties(course, tutorCourseVO); + clientCourseVOS.add(tutorCourseVO); } - tutorVo.setList(PageDTO.of(page, ClientCourseVO.class)); + tutorVo.setList(clientCourseVOS); + return R.ok(tutorVo); }else{ + tutorVo.setList(clientCourseVOS); return R.ok(tutorVo); } - return R.ok(); } -- Gitblit v1.7.1