From 747ea62a3652d575a46c1734d7142fb5c8a9885c Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 25 Mar 2024 10:59:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/CourseCatalogueEntity.java | 7 +++ .../modules/common/entity/ShopProduct.java | 2 +- .../entity/ShopProductCourseEntity.java | 2 + .../master/controller/CourseController.java | 4 +- .../service/CourseCatalogueService.java | 2 + .../impl/CourseCatalogueServiceImpl.java | 61 ++++++++++++++++--- 6 files changed, 66 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java index bb10f9b3..76237456 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java @@ -1,5 +1,6 @@ package com.peanut.modules.common.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -31,4 +32,10 @@ public class CourseCatalogueEntity{ @TableLogic private Integer delFlag; + + /** + * 是否同步创建商品 + */ + @TableField(exist = false) + private Integer needCreate; } diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProduct.java b/src/main/java/com/peanut/modules/common/entity/ShopProduct.java index 2ceb84a8..8fc2c94e 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProduct.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProduct.java @@ -129,7 +129,7 @@ public class ShopProduct implements Serializable { */ private Integer sumSales; /** - * 商品类型 01: 画册 02：书 04：仪器，03：预售书 + * 商品类型01挂图02书籍03预售书04仪器05课程06小店商品 */ private String goodsType; private String goodsTypeCode; diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductCourseEntity.java b/src/main/java/com/peanut/modules/common/entity/ShopProductCourseEntity.java index fd5fa5e2..b632fd16 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductCourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductCourseEntity.java @@ -14,6 +14,8 @@ public class ShopProductCourseEntity { @TableId private Integer id; + private Integer productId; + private Integer courseId; private Integer catalogueId; 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 9c7c96f2..a39249df 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -59,9 +59,7 @@ public class CourseController { @RequestMapping("/addCourseCatalogue") public R addCourseCatalogue(@RequestBody CourseCatalogueEntity courseCatalogue){ - - //课程这里增加对应商品的还没有做 - courseCatalogueService.save(courseCatalogue); + courseCatalogueService.addCourseCatalogue(courseCatalogue); return R.ok(); } diff --git a/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java b/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java index 592809da..60c2cb10 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseCatalogueService.java @@ -11,4 +11,6 @@ public interface CourseCatalogueService extends IService List getCourseCatalogues(int id); R delCourseCatalogue(int id); + + void addCourseCatalogue(CourseCatalogueEntity courseCatalogue); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java index 5507fc34..f9a810ea 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java @@ -3,14 +3,8 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.CourseCatalogueDao; -import com.peanut.modules.common.dao.ShopProductCourseDao; -import com.peanut.modules.common.dao.UserToCourseDao; -import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; -import com.peanut.modules.common.entity.CourseCatalogueEntity; -import com.peanut.modules.common.entity.ShopProductCourseEntity; -import com.peanut.modules.common.entity.UserToCourseEntity; +import com.peanut.modules.common.dao.*; +import com.peanut.modules.common.entity.*; import com.peanut.modules.master.service.CourseCatalogueService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +22,11 @@ public class CourseCatalogueServiceImpl extends ServiceImpl getCourseCatalogues(int id) { @@ -59,4 +58,50 @@ public class CourseCatalogueServiceImpl extends ServiceImpl Date: Mon, 25 Mar 2024 13:30:30 +0800 Subject: [PATCH 2/3] 1 --- .../master/controller/CourseController.java | 31 ++++++++++++++++++- .../CourseCatalogueChapterService.java | 7 +++++ .../CourseCatalogueChapterServiceImpl.java | 16 ++++++++++ .../service/impl/CourseServiceImpl.java | 1 - 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java 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 a39249df..0c51ffe7 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -56,7 +56,6 @@ public class CourseController { return R.ok().put("catalogues",courseCatalogues); } - @RequestMapping("/addCourseCatalogue") public R addCourseCatalogue(@RequestBody CourseCatalogueEntity courseCatalogue){ courseCatalogueService.addCourseCatalogue(courseCatalogue); @@ -68,4 +67,34 @@ public class CourseController { return courseCatalogueService.delCourseCatalogue(param.getId()); } + @RequestMapping("/editCourseCatalogue") + public R editCourseCatalogue(@RequestBody CourseCatalogueEntity c){ + courseCatalogueService.updateById(c); + return R.ok(); + } + + + public R getCourseCatalogueChapterList(@RequestBody ParamTo param){ + + return R.ok(); + } + + + public R addCourseCatalogueChapter(){ + + return null; + } + + + public R delCourseCatalogueChapter(){ + + return null; + } + + + public R editCourseCatalogueChapter(){ + + return null; + } + } diff --git a/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java b/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java new file mode 100644 index 00000000..f68227d5 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/CourseCatalogueChapterService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; + +public interface CourseCatalogueChapterService extends IService { +} 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 new file mode 100644 index 00000000..1adeef47 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterServiceImpl.java @@ -0,0 +1,16 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseCatalogueChapterDao; +import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; +import com.peanut.modules.master.service.CourseCatalogueChapterService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterCourseCatalogueChapterService") +public class CourseCatalogueChapterServiceImpl extends ServiceImpl implements CourseCatalogueChapterService { + + + +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java index fd2e2175..d117c1ca 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java @@ -1,7 +1,6 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.ObjectUtils; 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 3/3] 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; + } +}