This commit is contained in:
GYJ
2025-01-02 20:45:51 +08:00
parent e3de8c009f
commit d56a5df40e
47 changed files with 221 additions and 382 deletions

View File

@@ -1,8 +1,6 @@
package com.sqx.modules.course.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sqx.modules.course.entity.CourseClassification;
import com.sqx.modules.course.response.ClassificationResponse;
import com.sqx.modules.course.response.CurriculumResponse;
@@ -14,10 +12,7 @@ import java.util.Map;
@Mapper
public interface CourseClassificationDao extends BaseMapper<CourseClassification> {
IPage<Map<String, Object>> selectCourseClassificationPage(Page<Map<String, Object>> pages, @Param("classificationName") String classificationName);
IPage<Map<String, Object>> selectCourseClassificationList(@Param("classificationName") String classificationName);
List<Map<String, Object>> selectCourseClassificationList(@Param("classificationName") String classificationName);
int updateDelete(@Param("id") Long id);

View File

@@ -7,12 +7,13 @@ import com.sqx.modules.course.entity.Course;
import com.sqx.modules.course.entity.CourseCollect;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
public interface CourseCollectDao extends BaseMapper<CourseCollect> {
IPage<Course> selectCourseByCollect(Page<Course> page, @Param("userId") Long userId,@Param("classify") Integer classify);
List<Course> selectCourseByCollect(@Param("userId") Long userId, @Param("classify") Integer classify);
}

View File

@@ -1,12 +1,11 @@
package com.sqx.modules.course.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sqx.modules.course.entity.CourseComment;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@Mapper
@@ -14,7 +13,7 @@ public interface CourseCommentDao extends BaseMapper<CourseComment> {
int updateCourseComment(@Param("type") Integer type, @Param("courseCommentId") Long courseCommentId);
IPage<CourseComment> selectCourseComment(Page<CourseComment> page, @Param("courseId") Long courseId,@Param("userId") Long userId);
List<CourseComment> selectCourseComment(@Param("courseId") Long courseId, @Param("userId") Long userId);
/**
* 删除评论的点赞关联
@@ -22,8 +21,8 @@ public interface CourseCommentDao extends BaseMapper<CourseComment> {
* @return
*/
int deleteCommentGood(@Param("courseCommentId") Long courseCommentId);
IPage<Map<String,Object>> selectCourseCommentByUserId(Page<Map<String,Object>> page,@Param("userId") Long userId);
List<Map<String,Object>> selectCourseCommentByUserId(@Param("userId") Long userId);
}

View File

@@ -1,12 +1,11 @@
package com.sqx.modules.course.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sqx.modules.course.entity.Course;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@Mapper
@@ -14,16 +13,16 @@ public interface CourseDao extends BaseMapper<Course> {
int updateDelete(@Param("id") Long id);
IPage<Map<String, Object>> selectCourse(Page<Map<String, Object>> pages, @Param("classifyId") Long classifyId,
@Param("title") String title,@Param("isRecommend") Integer isRecommend,
@Param("status") Integer status,@Param("bannerId") Long bannerId,
@Param("sort") Integer sort,@Param("startTime") String startTime,
@Param("endTime") String endTime,@Param("userId") Long userId,
@Param("isPrice") Integer isPrice,@Param("over") Integer over,
@Param("wxCourse") Integer wxCourse,@Param("dyCourse") Integer dyCourse,
@Param("wxShow") Integer wxShow,@Param("dyShow") Integer dyShow);
List<Map<String, Object>> selectCourse(@Param("classifyId") Long classifyId,
@Param("title") String title, @Param("isRecommend") Integer isRecommend,
@Param("status") Integer status, @Param("bannerId") Long bannerId,
@Param("sort") Integer sort, @Param("startTime") String startTime,
@Param("endTime") String endTime, @Param("userId") Long userId,
@Param("isPrice") Integer isPrice, @Param("over") Integer over,
@Param("wxCourse") Integer wxCourse, @Param("dyCourse") Integer dyCourse,
@Param("wxShow") Integer wxShow, @Param("dyShow") Integer dyShow);
IPage<Map<String, Object>> selectCourseAdmin(Page<Map<String, Object>> pages, @Param("classifyId") Long classifyId,
List<Map<String, Object>> selectCourseAdmin(@Param("classifyId") Long classifyId,
@Param("title") String title,@Param("isRecommend") Integer isRecommend,
@Param("status") Integer status,@Param("bannerId") Long bannerId,
@Param("sort") Integer sort,@Param("startTime") String startTime,
@@ -34,10 +33,9 @@ public interface CourseDao extends BaseMapper<Course> {
/**
* 根据title 模糊查询短剧
* @param pages
* @param title
* @return
*/
IPage<Map<String, Object>> selectCourseTitle(Page<Map<String, Object>> pages, @Param("title")String title);
List<Map<String, Object>> selectCourseTitle(@Param("title")String title);
}

View File

@@ -1,8 +1,6 @@
package com.sqx.modules.course.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sqx.modules.course.entity.CourseDetails;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,12 +12,12 @@ public interface CourseDetailsDao extends BaseMapper<CourseDetails> {
List<CourseDetails> findByCourseId(@Param("id") Long id,@Param("userId") Long userId);
IPage<CourseDetails> selectCoursePageByCourseId(Page<CourseDetails> page, @Param("id") Long id,@Param("good") Integer good);
List<CourseDetails> selectCoursePageByCourseId(@Param("id") Long id,@Param("good") Integer good);
List<CourseDetails> findByCourseIdNotUrl(@Param("id") Long id,@Param("userId") Long userId);
int deleteCourseDetails(String[] ids);
IPage<CourseDetails> selectCourseDetailsList(Page<CourseDetails> page,String randomNum,Integer wxShow,Integer dyShow);
List<CourseDetails> selectCourseDetailsList(String randomNum,Integer wxShow,Integer dyShow);
}

View File

@@ -1,9 +1,6 @@
package com.sqx.modules.course.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sqx.modules.course.entity.Course;
import com.sqx.modules.course.entity.CourseUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,12 +9,6 @@ import java.util.List;
@Mapper
public interface CourseUserDao extends BaseMapper<CourseUser> {
// IPage<Course> selectLatelyCourse(Page<Course> pages, @Param("userId") Long userId);
//子查询不能用
// IPage<Course> selectCourseByCourseUser(Page<Course> pages, @Param("userId") Long userId);
/**
* 查询用户是否订购
*

View File

@@ -9,9 +9,5 @@ public interface CourseUserService extends IService<CourseUser> {
void updateTime(Long courseId);
// Result selectCourseUser(Integer page, Integer limit, Long userId);
// Result selectLatelyCourse(Integer page, Integer limit, Long userId);
Result insertCourseUser(CourseUser courseUser);
}

View File

@@ -1,8 +1,9 @@
package com.sqx.modules.course.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.course.dao.CourseClassificationDao;
@@ -37,11 +38,16 @@ public class CourseClassificationServiceImpl extends ServiceImpl<CourseClassific
@Override
public Result selectCourseClassification(Integer page, Integer limit, String classificationName) {
if(page==null || limit==null){
return Result.success().put("data", new PageUtils(baseMapper.selectCourseClassificationList( classificationName)));
if (page == null) {
page = 1;
}
Page<Map<String, Object>> pages = new Page<>(page, limit);
return Result.success().put("data", new PageUtils(baseMapper.selectCourseClassificationPage(pages, classificationName)));
if (limit == null) {
limit = 10;
}
PageHelper.startPage(page, limit);
List<Map<String, Object>> list = baseMapper.selectCourseClassificationList(classificationName);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo));
}
@Override

View File

@@ -1,10 +1,11 @@
package com.sqx.modules.course.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.DateUtils;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.course.dao.CourseClassificationDao;
import com.sqx.modules.course.dao.CourseCollectDao;
@@ -100,15 +101,16 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
@Override
@CachePut(value = "app:courseCollect", key = "#userId")
public Result selectByUserId(Integer page, Integer limit, Long userId,Integer classify) {
Page<Course> pages=new Page<>(page,limit);
IPage<Course> courseIPage = baseMapper.selectCourseByCollect(pages, userId,classify);
List<Course> courses = courseIPage.getRecords();
PageHelper.startPage(page,limit);
List<Course> courseIPage = baseMapper.selectCourseByCollect( userId,classify);
PageInfo<Course> pageInfo = new PageInfo<>(courseIPage);
List<Course> courses = pageInfo.getList();
if (courses != null && courses.size() > 0) {
for (Course course : courses) {
course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
}
}
return Result.success().put("data",courseIPage);
return Result.success().put("data", PageUtils.page(pageInfo));
}

View File

@@ -1,7 +1,8 @@
package com.sqx.modules.course.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.course.dao.CourseCommentDao;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
@@ -62,9 +64,11 @@ public class CourseCommentServiceImpl extends ServiceImpl<CourseCommentDao, Cour
}
@Override
public Result selectCourseComment(Integer page, Integer limit, Long courseId,Long userId) {
Page<CourseComment> courseCommentPage = new Page<>(page, limit);
return Result.success().put("data", new PageUtils(baseMapper.selectCourseComment(courseCommentPage, courseId,userId)));
public Result selectCourseComment(Integer page, Integer limit, Long courseId, Long userId) {
PageHelper.startPage(page, limit);
List<CourseComment> commentList = baseMapper.selectCourseComment(courseId, userId);
PageInfo<CourseComment> pageInfo = new PageInfo<>(commentList);
return Result.success().put("data", PageUtils.page(pageInfo));
}
@Override
@@ -77,8 +81,10 @@ public class CourseCommentServiceImpl extends ServiceImpl<CourseCommentDao, Cour
}
@Override
public Result selectCourseCommentUser(Integer page, Integer limit,Long userId) {
Page<Map<String,Object>> pages=new Page(page,limit);
return Result.success().put("data",new PageUtils(baseMapper.selectCourseCommentByUserId(pages,userId)));
public Result selectCourseCommentUser(Integer page, Integer limit, Long userId) {
PageHelper.startPage(page, limit);
List<Map<String, Object>> list = baseMapper.selectCourseCommentByUserId(userId);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo));
}
}

View File

@@ -5,11 +5,11 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.exception.SqxException;
import com.sqx.common.utils.DateUtils;
import com.sqx.common.utils.PageUtils;
@@ -234,6 +234,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
@Override
public Result selectCourseDetailsList(Integer page, Integer limit, String token, String randomNum, Integer wxShow, Integer dyShow) {
PageHelper.startPage(page, limit);
Long userId = null;
if (StringUtils.isNotEmpty(token)) {
Claims claims = jwtUtils.getClaimByToken(token);
@@ -244,10 +245,11 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
if(!Validator.isNumber(randomNum)){
throw new SqxException("随机码必须是数字");
};
IPage<CourseDetails> courseDetailsIPage = baseMapper.selectCourseDetailsList(new Page<>(page, limit), randomNum, wxShow, dyShow);
List<CourseDetails> list = baseMapper.selectCourseDetailsList(randomNum, wxShow, dyShow);
PageInfo<CourseDetails> pageInfo = new PageInfo<>(list);
if (userId != null) {
List<CourseDetails> records = courseDetailsIPage.getRecords();
List<CourseDetails> records = pageInfo.getList();
for (CourseDetails courseDetails : records) {
courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper<CourseCollect>()
.eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1)));
@@ -258,7 +260,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
courseDetails.setCourseDetailsCount(baseMapper.selectCount(new QueryWrapper<CourseDetails>().eq("course_id", courseDetails.getCourseId())));
}
}
return Result.success().put("data", new PageUtils(courseDetailsIPage));
return Result.success().put("data", PageUtils.page(pageInfo));
}
@Override

View File

@@ -10,16 +10,16 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.sqx.common.utils.DateUtils;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.RedisUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.app.entity.InviteAchievement;
import com.sqx.modules.app.service.InviteAchievementService;
import com.sqx.modules.app.utils.JwtUtils;
import com.sqx.modules.common.service.CommonInfoService;
@@ -177,30 +177,36 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
Map<String, Object> data = JSONUtil.toBean(cache, Map.class);
return Result.success().put("data", data);
}
PageHelper.startPage(page, limit);
if (admin == null) {
IPage<Map<String, Object>> mapIPage = baseMapper.selectCourse(pages, classifyId, title, isRecommend, status, bannerId,
List<Map<String, Object>> mapIPage = baseMapper.selectCourse(classifyId, title, isRecommend, status, bannerId,
sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow);
List<Map<String, Object>> records = mapIPage.getRecords();
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(mapIPage);
List<Map<String, Object>> records = pageInfo.getList();
for (Map<String, Object> map : records) {
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));
PageUtils pageUtils = PageUtils.page(pageInfo);
setCache(cacheKey, JSONUtil.toJsonStr(pageUtils));
return Result.success().put("data", pageUtils);
}
IPage<Map<String, Object>> mapIPage = baseMapper.selectCourseAdmin(pages, classifyId, title, isRecommend, status, bannerId,
List<Map<String, Object>> mapIPage = baseMapper.selectCourseAdmin(classifyId, title, isRecommend, status, bannerId,
sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow);
List<Map<String, Object>> records = mapIPage.getRecords();
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(mapIPage);
List<Map<String, Object>> records = pageInfo.getList();
for (Map<String, Object> map : records) {
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));
PageUtils pageUtils = PageUtils.page(pageInfo);
setCache(cacheKey, JSONUtil.toJsonStr(pageUtils));
return Result.success().put("data", pageUtils);
}
/*@Override
@@ -233,8 +239,10 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
@Override
public Result selectCourseById(Integer page, Integer limit, Long id, Integer good) {
Page<CourseDetails> pages = new Page<>(page, limit);
return Result.success().put("data", new PageUtils(courseDetailsDao.selectCoursePageByCourseId(pages, id, good)));
PageHelper.startPage(page, limit);
List<CourseDetails> details = courseDetailsDao.selectCoursePageByCourseId(id, good);
PageInfo<CourseDetails> pageInfo = new PageInfo<>(details);
return Result.success().put("data", PageUtils.page(pageInfo));
}
@Override
@@ -245,15 +253,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
//记录或更新搜索内容
appSearchService.insetAppSearch(title, userId);
}
//拼接模糊查询
String title1 = null;
if (StringUtils.isNotBlank(title)) {
title1 = "%" + title + "%";
return Result.success().put("data", new PageUtils(baseMapper.selectCourseTitle(pages, title1)));
} else {
if (StringUtils.isEmpty(title)) {
return Result.error("请输入要搜索的内容!");
}
PageHelper.startPage(page, limit);
List<Map<String, Object>> list = baseMapper.selectCourseTitle(title);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo));
}
@Override

View File

@@ -2,17 +2,12 @@ package com.sqx.modules.course.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.course.dao.CourseClassificationDao;
import com.sqx.modules.course.dao.CourseUserDao;
import com.sqx.modules.course.entity.Course;
import com.sqx.modules.course.entity.CourseUser;
import com.sqx.modules.course.service.CourseUserService;
import com.sqx.modules.orders.entity.Orders;
import com.sqx.modules.orders.service.OrdersService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +15,6 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@Service
@Slf4j
@@ -42,41 +36,6 @@ public class CourseUserServiceImpl extends ServiceImpl<CourseUserDao, CourseUser
baseMapper.update(bean, updateWrapper);
}
// @Override
// public Result selectCourseUser(Integer page, Integer limit, Long userId) {
// Page<Course> courseUserPage = new Page<>(page, limit);
// IPage<Course> iPage = baseMapper.selectCourseByCourseUser(courseUserPage, userId);
//
// List<Course> courses = iPage.getRecords();
// if (courses != null && courses.size() > 0) {
// for (Course course : courses) {
// Orders orders = ordersService.selectOrdersByCourseIdAndUserId(userId, course.getCourseId());
// if(orders!=null){
// course.setOrders(orders);
// }
// course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
// }
// }
// return Result.success().put("data", new PageUtils(iPage));
// }
// @Override
// public Result selectLatelyCourse(Integer page, Integer limit, Long userId) {
// Page<Course> pages = new Page<>(page, limit);
// IPage<Course> iPage = baseMapper.selectLatelyCourse(pages, userId);
// List<Course> courses = iPage.getRecords();
// if (courses != null && courses.size() > 0) {
// for (Course course : courses) {
// Orders orders = ordersService.selectOrdersByCourseIdAndUserId(userId, course.getCourseId());
// if(orders!=null){
// course.setOrders(orders);
// }
// course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
// }
// }
// return Result.success().put("data", new PageUtils(iPage));
// }
@Override
public Result insertCourseUser(CourseUser courseUser) {