From 01c3c49747d4869037d8446a4d8d10b6521b3c2d Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 26 Jul 2024 09:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=8F=AD=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/entity/ClassCourse.java | 21 +++++++++++ .../modules/common/entity/ClassEntity.java | 36 +++++++++++++++++++ .../modules/common/entity/ClassUser.java | 23 ++++++++++++ .../modules/common/entity/CourseEntity.java | 4 +++ .../master/controller/CourseController.java | 12 +++++++ .../modules/master/service/CourseService.java | 4 +++ .../service/impl/CourseServiceImpl.java | 33 +++++++++++++++++ 7 files changed, 133 insertions(+) create mode 100644 src/main/java/com/peanut/modules/common/entity/ClassCourse.java create mode 100644 src/main/java/com/peanut/modules/common/entity/ClassEntity.java create mode 100644 src/main/java/com/peanut/modules/common/entity/ClassUser.java diff --git a/src/main/java/com/peanut/modules/common/entity/ClassCourse.java b/src/main/java/com/peanut/modules/common/entity/ClassCourse.java new file mode 100644 index 00000000..d64d46ae --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ClassCourse.java @@ -0,0 +1,21 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("class_course") +public class ClassCourse { + + @TableId + private Integer id; + + private Integer classId; + + private Integer courseId; + + @TableLogic + private Integer delFlag; +} diff --git a/src/main/java/com/peanut/modules/common/entity/ClassEntity.java b/src/main/java/com/peanut/modules/common/entity/ClassEntity.java new file mode 100644 index 00000000..83d6f36a --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ClassEntity.java @@ -0,0 +1,36 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.util.Date; + +@Data +@TableName("class") +public class ClassEntity { + + @TableId + private Integer id; + + private String title; + + //小班状态 0待开班1进行中2完成 + private String state; + + private String icon; + + private String content; + + private Integer create_user; + + private Date createTime; + + private Date start_time; + + private Date end_time; + + @TableLogic + private Integer delFlag; + +} diff --git a/src/main/java/com/peanut/modules/common/entity/ClassUser.java b/src/main/java/com/peanut/modules/common/entity/ClassUser.java new file mode 100644 index 00000000..474f6d87 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ClassUser.java @@ -0,0 +1,23 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("class_user") +public class ClassUser { + + @TableId + private Integer id; + + private Integer classId; + + private Integer userId; + + private String role; + + @TableLogic + private Integer delFlag; +} diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java index 14f42bc7..d872abb6 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -21,6 +21,10 @@ public class CourseEntity { private String title; + private Integer director; + + private Integer ddirector; + private Integer sort; private String image; 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 895bfeeb..1a5d64b8 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -233,6 +233,18 @@ public class CourseController { return courseService.getCourseLableLinkList(param); } + //查询课程主任 + @RequestMapping("/getCourseDirector") + public R getCourseDirector(@RequestBody Map param){ + return courseService.getCourseDirector(param); + } + + //编辑课程主任 + @RequestMapping("/editCourseDirector") + public R editCourseDirector(@RequestBody Map param){ + return courseService.editCourseDirector(param); + } + diff --git a/src/main/java/com/peanut/modules/master/service/CourseService.java b/src/main/java/com/peanut/modules/master/service/CourseService.java index 0c9f67aa..e4e16813 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseService.java @@ -31,6 +31,10 @@ public interface CourseService extends IService { R getCourseLableLinkList(Map param); + R getCourseDirector(Map param); + + R editCourseDirector(Map param); + Page getProductListForCourse(Map param); List catalogueListByCourse(Map params); 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 d2bd7d71..ae41a2d7 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 @@ -11,6 +11,7 @@ import com.peanut.modules.common.dao.*; import com.peanut.modules.common.entity.*; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseService; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +43,8 @@ public class CourseServiceImpl extends ServiceImpl impl private ShopProductCourseDao shopProductCourseDao; @Autowired private UserCourseBuyDao userCourseBuyDao; + @Autowired + private MyUserDao userDao; @Override public Page getCourseList(Map map) { @@ -279,6 +282,36 @@ public class CourseServiceImpl extends ServiceImpl impl return R.ok().put("resList",resList); } + @Override + public R getCourseDirector(Map param) { + CourseEntity course = this.getById((Integer)param.get("courseId")); + MyUserEntity director = userDao.selectById(course.getDirector()); + MyUserEntity ddirector = userDao.selectById(course.getDdirector()); + return R.ok().put("director",director).put("ddirector",ddirector); + } + + @Override + public R editCourseDirector(Map param) { + int director = (Integer)param.get("director"); + int ddirector = (Integer)param.get("ddirector"); + if ((director==0&&ddirector==0)||director!=ddirector){ + CourseEntity course = this.getById((Integer)param.get("courseId")); + if (course != null) { + course.setDirector(director); + course.setDdirector(ddirector); + if (this.saveOrUpdate(course)){ + return R.ok(); + }else { + return R.error("编辑失败！"); + } + }else { + return R.error("未查询到课程！"); + } + }else { + return R.error("不能是同一人！"); + } + } + @Override public Page getProductListForCourse(Map param) { Integer limit = Integer.valueOf(param.get("limit").toString());