diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index a5549d7c..dede07e6 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -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); + } } diff --git a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java index d0bc9b48..413b09fe 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java @@ -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); + } + diff --git a/src/main/java/com/peanut/modules/sociology/controller/ProductController.java b/src/main/java/com/peanut/modules/sociology/controller/ProductController.java new file mode 100644 index 00000000..7f539ae8 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/controller/ProductController.java @@ -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 { + + + +} diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index e98b6a35..8117a7f5 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -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 { List getCourseListBySociology(String sociologyId); + Page getSociologyCourseList(ParamTo param); + + Page getUserLateCourseList(ParamTo param); + } diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index 34aa8801..3a7592d7 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -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 impl return courseList; } + @Override + public Page getSociologyCourseList(ParamTo param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId); + Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper); + return courseEntityPage; + } + + @Override + public Page getUserLateCourseList(ParamTo param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId); + wrapper.eq(UserToCourseEntity::getUserId,param.getId()); + Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); + return courseEntityPage; + } }