1
This commit is contained in:
@@ -1,20 +1,30 @@
|
||||
package com.peanut.modules.sociology.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.sociology.service.CourseService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@RestController("sociologyCourse")
|
||||
@RequestMapping("sociology/course")
|
||||
public class CourseController {
|
||||
@Autowired
|
||||
private CourseService courseService;
|
||||
|
||||
|
||||
@RequestMapping("/getUserLateCourseList")
|
||||
public R getUserLateCourseList(@RequestBody ParamTo param){
|
||||
Integer userId = ShiroUtils.getUId();
|
||||
param.setId(userId);
|
||||
Page userLateCourseList = courseService.getUserLateCourseList(param);
|
||||
return R.ok().put("page",userLateCourseList);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.peanut.modules.sociology.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseSociologyEntity;
|
||||
@@ -38,6 +39,12 @@ public class HomeController {
|
||||
return R.ok().put("labels",sociologyLabels);
|
||||
}
|
||||
|
||||
@RequestMapping("/getSociologyCourseList")
|
||||
public R getSociologyCourseList(@RequestBody ParamTo param){
|
||||
Page sociologyCourseList = courseService.getSociologyCourseList(param);
|
||||
return R.ok().put("courses",sociologyCourseList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.peanut.modules.sociology.controller;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@Slf4j
|
||||
@RestController("sociologyProduct")
|
||||
@RequestMapping("sociology/product")
|
||||
public class ProductController {
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
package com.peanut.modules.sociology.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -11,4 +13,8 @@ public interface CourseService extends IService<CourseEntity> {
|
||||
|
||||
List<CourseEntity> getCourseListBySociology(String sociologyId);
|
||||
|
||||
Page<CourseEntity> getSociologyCourseList(ParamTo param);
|
||||
|
||||
Page<CourseEntity> getUserLateCourseList(ParamTo param);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.peanut.modules.sociology.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.modules.common.dao.CourseDao;
|
||||
@@ -9,6 +10,7 @@ import com.peanut.modules.common.dao.UserToCourseDao;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseToSociologyEntity;
|
||||
import com.peanut.modules.common.entity.UserToCourseEntity;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.sociology.service.CourseService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -48,4 +50,22 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
return courseList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page getSociologyCourseList(ParamTo param) {
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
|
||||
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
|
||||
return courseEntityPage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<CourseEntity> getUserLateCourseList(ParamTo param) {
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.eq(UserToCourseEntity::getUserId,param.getId());
|
||||
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
|
||||
return courseEntityPage;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user