diff --git a/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java b/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java index caf95f26..ae9d6c93 100644 --- a/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java +++ b/src/main/java/com/sqx/modules/course/controller/app/AppCourseController.java @@ -77,8 +77,8 @@ public class AppCourseController extends AbstractController { @GetMapping("/selectCourseDetailsList") @ApiOperation("查询推荐视频") - public Result selectCourseDetailsList(Integer page, Integer limit, String token, String randomNum, Integer wxShow, Integer dyShow) { - return courseDetailsService.selectCourseDetailsList(page, limit, token, randomNum, wxShow, dyShow); + public Result selectCourseDetailsList(@RequestHeader("token") String token) { + return courseDetailsService.selectCourseDetailsList(token); } @Login diff --git a/src/main/java/com/sqx/modules/course/service/CourseDetailsService.java b/src/main/java/com/sqx/modules/course/service/CourseDetailsService.java index c69fbab4..314c054b 100644 --- a/src/main/java/com/sqx/modules/course/service/CourseDetailsService.java +++ b/src/main/java/com/sqx/modules/course/service/CourseDetailsService.java @@ -25,7 +25,7 @@ public interface CourseDetailsService extends IService { Result selectCourseDetailsById(Long id,String token,String courseDetailsId); - Result selectCourseDetailsList(Integer page,Integer limit,String token,String randomNum,Integer wxShow,Integer dyShow); + Result selectCourseDetailsList(String token); Result courseDetailsListExcelIn(MultipartFile file, Long courseId) throws IOException; diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index 7968cc31..c084bec5 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -354,7 +354,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl() - .eq(CourseDetails::getGood,1) - .eq(CourseDetails::getIsPrice,2)); - if (detailCount != null) { - PageHelper.startPage(RandomUtil.randomInt(1, detailCount / 10), 10); + .eq(CourseDetails::getGood, 1) + .eq(CourseDetails::getIsPrice, 2)); + if (detailCount == null) { + return Result.error("暂无推荐视频。"); } + PageHelper.startPage(RandomUtil.randomInt(1, detailCount / 10), 5); List list = baseMapper.selectList(new LambdaQueryWrapper() - .eq(CourseDetails::getGood,1) - .eq(CourseDetails::getIsPrice,2)); - + .eq(CourseDetails::getGood, 1) + .eq(CourseDetails::getIsPrice, 2)); + if (userId != null) { + Long finalUserId = userId; + list.stream().forEach(s -> { + s.setIsCollect(courseCollectDao.selectCount(new LambdaQueryWrapper() + .eq(CourseCollect::getUserId, finalUserId).eq(CourseCollect::getCourseId, s.getCourseId()) + .eq(CourseCollect::getClassify, 1).last("limit 1"))); + s.setIsGood(courseCollectDao.selectCount(new LambdaQueryWrapper() + .eq(CourseCollect::getUserId, finalUserId).eq(CourseCollect::getCourseId, s.getCourseId()) + .eq(CourseCollect::getCourseDetailsId, s.getCourseDetailsId()) + .eq(CourseCollect::getClassify, 2).last("limit 1"))); + }); + } PageInfo pageInfo = new PageInfo<>(list); - -// if (userId != null) { -// List records = pageInfo.getList(); -// for (CourseDetails courseDetails : records) { -// courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper() -// .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1))); -// courseDetails.setIsGood(courseCollectDao.selectCount(new QueryWrapper() -// .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 2))); -// courseDetails.setCourse(courseDao.selectById(courseDetails.getCourseId())); -// courseDetails.setTitle(courseDetails.getCourse().getTitle()); -// courseDetails.setCourseDetailsCount(baseMapper.selectCount(new QueryWrapper().eq("course_id", courseDetails.getCourseId()))); -// } -// } return Result.success().put("data", PageUtils.page(pageInfo)); }