diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index c36a4def..ef4456e2 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -88,7 +88,7 @@ public class CourseServiceImpl extends ServiceImpl implements private void setCache(String key, String value) { key = getIndexKey(key); - redisUtils.set(key, value, 600); + redisUtils.set(key, value, 60 * 60 * 3); } private String getCache(String key) { @@ -174,26 +174,10 @@ public class CourseServiceImpl extends ServiceImpl implements sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); List> records = mapIPage.getRecords(); for (Map map : records) { - Object courseDetailsId = map.get("courseDetailsId"); - Object courseId = map.get("courseId"); - if (courseDetailsId != null) { - CourseDetails courseDetails = courseDetailsDao.selectById(Long.parseLong(String.valueOf(courseDetailsId))); - if (courseDetails != null) { - map.put("courseDetailsName", courseDetails.getCourseDetailsName()); - map.put("dyEpisodeId", courseDetails.getDyEpisodeId()); - map.put("wxCourseDetailsId", courseDetails.getWxCourseDetailsId()); - } - } else { - //默认取第一集 - CourseDetails courseDetails = courseDetailsDao.selectOne(new QueryWrapper().eq("course_id", courseId) - .orderByAsc("sort").last(" limit 1")); - if (courseDetails != null) { - map.put("courseDetailsId", courseDetails.getCourseDetailsId()); - map.put("courseDetailsName", courseDetails.getCourseDetailsName()); - map.put("dyEpisodeId", courseDetails.getDyEpisodeId()); - map.put("wxCourseDetailsId", courseDetails.getWxCourseDetailsId()); - } - } + map.put("courseDetailsId", null); + map.put("courseDetailsName", ""); + map.put("dyEpisodeId", ""); + map.put("wxCourseDetailsId", ""); } setCache(cacheKey, JSONUtil.toJsonStr(new PageUtils(mapIPage))); return Result.success().put("data", new PageUtils(mapIPage)); @@ -202,16 +186,10 @@ public class CourseServiceImpl extends ServiceImpl implements sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); List> records = mapIPage.getRecords(); for (Map map : records) { - Object courseId = map.get("courseId"); - //默认取第一集 - CourseDetails courseDetails = courseDetailsDao.selectOne(new QueryWrapper().eq("course_id", courseId) - .orderByAsc("sort").last(" limit 1")); - if (courseDetails != null) { - map.put("courseDetailsId", courseDetails.getCourseDetailsId()); - map.put("courseDetailsName", courseDetails.getCourseDetailsName()); - map.put("dyEpisodeId", courseDetails.getDyEpisodeId()); - map.put("wxCourseDetailsId", courseDetails.getWxCourseDetailsId()); - } + map.put("courseDetailsId", null); + map.put("courseDetailsName", ""); + map.put("dyEpisodeId", ""); + map.put("wxCourseDetailsId", ""); } setCache(cacheKey, JSONUtil.toJsonStr(new PageUtils(mapIPage))); return Result.success().put("data", new PageUtils(mapIPage)); diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index a8118457..274f9437 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -31,39 +31,19 @@ c.course_type as courseType, c.banner_id as bannerId, b.name as bannerName, - (select sum(cd.view_count) from course_details cd where cd.course_id = c.course_id ) as viewCounts, + 0 as viewCounts, c.dy_img_id as dyImgId, c.dy_course_id as dyCourseId, c.wx_course_id as wxCourseId, c.wx_show as wxShow, c.dy_show as dyShow, c.sort, - (select sum(good_num) from course_details d where d.course_id=c.course_id ) as goodNum, - (select count(*) from course_details d where d.course_id=c.course_id ) as courseDetailsCount, - - ( - SELECT - cc.course_details_id - FROM - course_collect cc - WHERE - cc.course_id = c.course_id - AND cc.classify = 3 - and cc.user_id = #{userId} - ORDER BY - cc.update_time desc - LIMIT 1 - ) AS courseDetailsId, - - - null AS courseDetailsName, - null AS courseDetailsId, - - - (select count(*) from course_collect d where d.course_id=c.course_id - and date_format(create_time,'%Y-%m-%d')>=date_format(#{startTime},'%Y-%m-%d') and - date_format(create_time,'%Y-%m-%d')<=date_format(#{endTime},'%Y-%m-%d') ) as weekGoodNum, - (select count(*) from course_details cd where c.course_id=cd.course_id and cd.good=1 ) as isRecommend + 0 as goodNum, + 0 as courseDetailsCount, + null AS courseDetailsName, + null AS courseDetailsId, + 0 as weekGoodNum, + 0 as isRecommend FROM course AS c LEFT JOIN course_classification AS cc ON c.classify_id = cc.classification_id @@ -113,6 +93,8 @@ and c.dy_status=4 + order by c.sort asc,c.create_time desc +