子查询 以及 扫描路径
This commit is contained in:
@@ -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() {
|
||||
}
|
||||
|
||||
|
||||
@@ -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("修改状态")
|
||||
|
||||
@@ -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);
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -13,9 +13,10 @@ import java.util.List;
|
||||
@Mapper
|
||||
public interface CourseUserDao extends BaseMapper<CourseUser> {
|
||||
|
||||
IPage<Course> selectLatelyCourse(Page<Course> pages, @Param("userId") Long userId);
|
||||
// IPage<Course> selectLatelyCourse(Page<Course> pages, @Param("userId") Long userId);
|
||||
|
||||
IPage<Course> selectCourseByCourseUser(Page<Course> pages, @Param("userId") Long userId);
|
||||
//子查询不能用
|
||||
// IPage<Course> selectCourseByCourseUser(Page<Course> pages, @Param("userId") Long userId);
|
||||
|
||||
/**
|
||||
* 查询用户是否订购
|
||||
|
||||
@@ -9,9 +9,9 @@ public interface CourseUserService extends IService<CourseUser> {
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -42,40 +42,40 @@ 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);
|
||||
// @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));
|
||||
// }
|
||||
|
||||
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 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
|
||||
|
||||
Reference in New Issue
Block a user