From 38f2f8d0dc0703c0c608a97f9e7859586e149bd0 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 25 Mar 2024 17:00:48 +0800 Subject: [PATCH] 1 --- pom.xml | 6 +++ .../master/controller/CourseController.java | 54 +++++++++++++++---- .../CourseCatalogueChapterService.java | 9 ++++ .../CourseCatalogueChapterVideoService.java | 10 ++++ .../CourseCatalogueChapterServiceImpl.java | 29 ++++++++++ ...ourseCatalogueChapterVideoServiceImpl.java | 21 ++++++++ 6 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterVideoService.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java diff --git a/pom.xml b/pom.xml index 49cd7c57..97841542 100644 --- a/pom.xml +++ b/pom.xml @@ -371,6 +371,12 @@ mybatis-plus-join-boot-starter 1.4.6 + + org.jetbrains + annotations + RELEASE + compile + diff --git a/src/main/java/com/peanut/modules/master/controller/CourseController.java b/src/main/java/com/peanut/modules/master/controller/CourseController.java index 0c51ffe7..c241d734 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -2,9 +2,14 @@ package com.peanut.modules.master.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; +import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; +import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; +import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; import com.peanut.modules.common.entity.CourseCatalogueEntity; import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.to.ParamTo; +import com.peanut.modules.master.service.CourseCatalogueChapterService; +import com.peanut.modules.master.service.CourseCatalogueChapterVideoService; import com.peanut.modules.master.service.CourseCatalogueService; import com.peanut.modules.master.service.CourseService; import lombok.extern.slf4j.Slf4j; @@ -25,6 +30,10 @@ public class CourseController { private CourseService courseService; @Autowired private CourseCatalogueService courseCatalogueService; + @Autowired + private CourseCatalogueChapterService courseCatalogueChapterService; + @Autowired + private CourseCatalogueChapterVideoService courseCatalogueChapterVideoService; @RequestMapping("/getCourseList") @@ -73,28 +82,51 @@ public class CourseController { return R.ok(); } - + @RequestMapping("/getCourseCatalogueChapterList") public R getCourseCatalogueChapterList(@RequestBody ParamTo param){ + Page courseCatalogueChapterList = courseCatalogueChapterService.getCourseCatalogueChapterList(param); + return R.ok().put("page",courseCatalogueChapterList); + } + @RequestMapping("/addCourseCatalogueChapter") + public R addCourseCatalogueChapter(@RequestBody CourseCatalogueChapterEntity courseCatalogueChapterEntity){ + courseCatalogueChapterService.save(courseCatalogueChapterEntity); return R.ok(); } - - public R addCourseCatalogueChapter(){ - - return null; + @RequestMapping("/delCourseCatalogueChapter") + public R delCourseCatalogueChapter(@RequestBody ParamTo param){ + return courseCatalogueChapterService.delCourseCatalogueChapter(param.getId()); } - - public R delCourseCatalogueChapter(){ - - return null; + @RequestMapping("/editCourseCatalogueChapter") + public R editCourseCatalogueChapter(@RequestBody CourseCatalogueChapterEntity courseCatalogueChapterEntity){ + courseCatalogueChapterService.updateById(courseCatalogueChapterEntity); + return R.ok(); } + @RequestMapping("/getCourseCatalogueChapterVideoList") + public R getCourseCatalogueChapterVideoList(@RequestBody ParamTo param){ + courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param); + return R.ok(); + } - public R editCourseCatalogueChapter(){ + @RequestMapping("/addCourseCatalogueChapterVideo") + public R addCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){ + courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity); + return R.ok(); + } - return null; + @RequestMapping("/delCourseCatalogueChapterVideo") + public R delCourseCatalogueChapterVideo(@RequestBody ParamTo param){ + courseCatalogueChapterVideoService.removeById(param.getId()); + return R.ok(); + } + + @RequestMapping("/editCourseCatalogueChapterVideo") + public R editCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){ + courseCatalogueChapterVideoService.updateById(courseCatalogueChapterVideoEntity); + return R.ok(); } } diff --git a/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java b/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java index f68227d5..e791194a 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java @@ -1,7 +1,16 @@ package com.peanut.modules.master.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; +import com.peanut.modules.common.to.ParamTo; + +import java.util.List; public interface CourseCatalogueChapterService extends IService { + + Page getCourseCatalogueChapterList(ParamTo param); + + R delCourseCatalogueChapter(int id); } diff --git a/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterVideoService.java b/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterVideoService.java new file mode 100644 index 00000000..9264f341 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterVideoService.java @@ -0,0 +1,10 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; +import com.peanut.modules.common.to.ParamTo; + +public interface CourseCatalogueChapterVideoService extends IService { + Page getCourseCatalogueChapterVideoList(ParamTo param); +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java index 1adeef47..453cdf6f 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java @@ -1,16 +1,45 @@ package com.peanut.modules.master.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.peanut.common.utils.R; import com.peanut.modules.common.dao.CourseCatalogueChapterDao; +import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; +import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; +import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseCatalogueChapterService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service("masterCourseCatalogueChapterService") public class CourseCatalogueChapterServiceImpl extends ServiceImpl implements CourseCatalogueChapterService { + @Autowired + private CourseCatalogueChapterVideoDao courseCatalogueChapterVideoDao; + + @Override + public Page getCourseCatalogueChapterList(ParamTo param) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CourseCatalogueChapterEntity::getCatalogueId,param.getId()); + wrapper.orderByAsc(CourseCatalogueChapterEntity::getSort); + Page page = this.page(new Page<>(param.getPage(), param.getLimit()), wrapper); + return page; + } + @Override + public R delCourseCatalogueChapter(int id) { + List courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueChapterVideoEntity::getChapterId, id)); + if(courseCatalogueChapterVideoEntities.size()>0){ + return R.error(501,"删除失败，请先删除视频文件"); + } + this.removeById(id); + return R.ok(); + } } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java new file mode 100644 index 00000000..a78ce24f --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java @@ -0,0 +1,21 @@ +package com.peanut.modules.master.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.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; +import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; +import com.peanut.modules.common.to.ParamTo; +import com.peanut.modules.master.service.CourseCatalogueChapterVideoService; + +public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl implements CourseCatalogueChapterVideoService { + + @Override + public Page getCourseCatalogueChapterVideoList(ParamTo param) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CourseCatalogueChapterVideoEntity::getChapterId,param.getId()); + wrapper.orderByAsc(CourseCatalogueChapterVideoEntity::getSort); + Page page = this.page(new Page<>(param.getPage(), param.getLimit()), wrapper); + return page; + } +}