diff --git a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java index eace275f..04338b80 100644 --- a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java +++ b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java @@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletRequest; @Slf4j public class AppApiMethodAspect { - @Pointcut("execution(public * (com.sqx.modules.*.controller.*).*(..)) " + - "&& " + - "!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..))") + @Pointcut(" execution(public * (com.sqx.modules.*.controller.*).*(..)) " + + "&& execution(public * (com.sqx.modules.app.*.controller.*).*(..))" + + "&& !execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) ") public void pkg() { } diff --git a/src/main/java/com/sqx/modules/course/controller/CourseController.java b/src/main/java/com/sqx/modules/course/controller/CourseController.java index 71d1b22a..6a3ef5a8 100644 --- a/src/main/java/com/sqx/modules/course/controller/CourseController.java +++ b/src/main/java/com/sqx/modules/course/controller/CourseController.java @@ -61,11 +61,11 @@ public class CourseController extends AbstractController { } - @GetMapping("/selectCourseUserbyid") - @ApiOperation("我的短剧") - public Result selectCourseUser(Integer page, Integer limit, Long userId) { - return courseUserService.selectCourseUser(page, limit, userId); - } +// @GetMapping("/selectCourseUserbyid") +// @ApiOperation("我的短剧") +// public Result selectCourseUser(Integer page, Integer limit, Long userId) { +// return courseUserService.selectCourseUser(page, limit, userId); +// } @GetMapping("/updateCourse") @ApiOperation("修改状态") diff --git a/src/main/java/com/sqx/modules/course/controller/app/AppCourseUserController.java b/src/main/java/com/sqx/modules/course/controller/app/AppCourseUserController.java index 03e3d16d..9a5b9108 100644 --- a/src/main/java/com/sqx/modules/course/controller/app/AppCourseUserController.java +++ b/src/main/java/com/sqx/modules/course/controller/app/AppCourseUserController.java @@ -19,12 +19,12 @@ public class AppCourseUserController extends AbstractController { @Autowired private CourseUserService courseUserService; - @Login - @GetMapping("/selectCourseUser") - @ApiOperation("App我的短剧") - public Result selectCourseUser(Integer page, Integer limit, Long userId) { - return courseUserService.selectCourseUser(page, limit, userId); - } +// @Login +// @GetMapping("/selectCourseUser") +// @ApiOperation("App我的短剧") +// public Result selectCourseUser(Integer page, Integer limit, Long userId) { +// return courseUserService.selectCourseUser(page, limit, userId); +// } @Login @GetMapping("/updateTime") @@ -33,12 +33,12 @@ public class AppCourseUserController extends AbstractController { courseUserService.updateTime(courseId); } - @Login - @GetMapping("/selectLatelyCourse") - @ApiOperation("最近学习") - public Result selectLatelyCourse(Integer page, Integer limit, Long userId) { - return courseUserService.selectLatelyCourse(page, limit, userId); - } +// @Login +// @GetMapping("/selectLatelyCourse") +// @ApiOperation("最近学习") +// public Result selectLatelyCourse(Integer page, Integer limit, Long userId) { +// return courseUserService.selectLatelyCourse(page, limit, userId); +// } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java b/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java index 459fa740..de0a5902 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseUserDao.java @@ -13,9 +13,10 @@ import java.util.List; @Mapper public interface CourseUserDao extends BaseMapper { - IPage selectLatelyCourse(Page pages, @Param("userId") Long userId); +// IPage selectLatelyCourse(Page pages, @Param("userId") Long userId); - IPage selectCourseByCourseUser(Page pages, @Param("userId") Long userId); + //子查询不能用 +// IPage selectCourseByCourseUser(Page pages, @Param("userId") Long userId); /** * 查询用户是否订购 diff --git a/src/main/java/com/sqx/modules/course/service/CourseUserService.java b/src/main/java/com/sqx/modules/course/service/CourseUserService.java index 18af6dea..4a972394 100644 --- a/src/main/java/com/sqx/modules/course/service/CourseUserService.java +++ b/src/main/java/com/sqx/modules/course/service/CourseUserService.java @@ -9,9 +9,9 @@ public interface CourseUserService extends IService { void updateTime(Long courseId); - Result selectCourseUser(Integer page, Integer limit, Long userId); +// Result selectCourseUser(Integer page, Integer limit, Long userId); - Result selectLatelyCourse(Integer page, Integer limit, Long userId); +// Result selectLatelyCourse(Integer page, Integer limit, Long userId); Result insertCourseUser(CourseUser courseUser); } diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java index e79d013f..37055fcf 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseUserServiceImpl.java @@ -42,40 +42,40 @@ public class CourseUserServiceImpl extends ServiceImpl courseUserPage = new Page<>(page, limit); - IPage iPage = baseMapper.selectCourseByCourseUser(courseUserPage, userId); +// @Override +// public Result selectCourseUser(Integer page, Integer limit, Long userId) { +// Page courseUserPage = new Page<>(page, limit); +// IPage iPage = baseMapper.selectCourseByCourseUser(courseUserPage, userId); +// +// List 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)); +// } - List 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 pages = new Page<>(page, limit); - IPage iPage = baseMapper.selectLatelyCourse(pages, userId); - List 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 pages = new Page<>(page, limit); +// IPage iPage = baseMapper.selectLatelyCourse(pages, userId); +// List 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 diff --git a/src/main/resources/mapper/course/CourseUserDao.xml b/src/main/resources/mapper/course/CourseUserDao.xml index 4123e5ac..70c86e24 100644 --- a/src/main/resources/mapper/course/CourseUserDao.xml +++ b/src/main/resources/mapper/course/CourseUserDao.xml @@ -2,31 +2,31 @@ - + + + + + + + + + + + - + + + + + + + + + + + + +