From e0d10eddc8721e6447787ccb6807c00e1b0b91f7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 09:49:45 +0800
Subject: [PATCH] 课程代码
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/Course.java | 7 +++
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/TutorSpecialColumnCourse.java | 2
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java | 61 ++++++++++++++++++++++++++++++
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 24 ++++++++++++
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/vo/TutorVo.java | 18 +++++++++
5 files changed, 110 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
index d538e7f..774b4b8 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -4,6 +4,7 @@
import com.xinquan.common.core.constant.SecurityConstants;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.course.domain.Course;
import com.xinquan.course.domain.vo.ClientCourseCategoryVO;
import com.xinquan.course.domain.vo.ClientCourseVO;
import com.xinquan.course.service.CourseCategoryService;
@@ -15,6 +16,8 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
+
+import io.swagger.models.auth.In;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -61,6 +64,27 @@
public R<List<ClientCourseCategoryVO>> getCourseCategoryList() {
return R.ok(courseCategoryService.getCourseCategoryList());
}
+ /**
+ * 课程详情
+ *
+ * @return 课程详情
+ */
+ @GetMapping("/getCourseInfoById")
+ @ApiOperation(value = "根据id获取课程详情-线下课程")
+ public R<Course> getCourseInfoById(String id) {
+ return R.ok(courseService.getById(id));
+ }
+ /**
+ * 课程详情
+ *
+ * @return 课程详情
+ */
+ @GetMapping("/getPayCourseInfoById")
+ @ApiOperation(value = "根据id获取课程详情-付费课程")
+ public R<Course> getPayCourseInfoById(String id) {
+
+ return R.ok(courseService.getById(id));
+ }
/**
* 获取课程列表-分页
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java
index 0116cc2..417eafe 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java
@@ -1,8 +1,32 @@
package com.xinquan.course.controller.client;
+import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xinquan.common.core.domain.R;
+import com.xinquan.common.core.utils.page.BeanUtils;
+import com.xinquan.common.core.utils.page.CollUtils;
+import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.course.domain.Course;
+import com.xinquan.course.domain.TutorSpecialColumn;
+import com.xinquan.course.domain.TutorSpecialColumnCourse;
+import com.xinquan.course.domain.vo.ClientCourseVO;
+import com.xinquan.course.domain.vo.TutorVo;
+import com.xinquan.course.service.CourseCategoryService;
+import com.xinquan.course.service.CourseService;
+import com.xinquan.course.service.TutorSpecialColumnCourseService;
+import com.xinquan.course.service.TutorSpecialColumnService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Objects;
/**
* <p>
@@ -16,5 +40,42 @@
@RequestMapping("/client/course/tutor-special-column")
public class ClientTutorSpecialColumnController {
+ @Resource
+ private TutorSpecialColumnService tutorSpecialColumnService;
+ @Resource
+ private TutorSpecialColumnCourseService tutorSpecialColumnCourseService;
+ @Resource
+ private CourseCategoryService courseCategoryService;
+ @Resource
+ private CourseService courseService;
+ @PostMapping("/getCoursePageList")
+ @ApiOperation(value = "导师专栏",tags = "导师专栏")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "分页参数，当前页码", name = "pageCurr", required = true, dataType = "Integer"),
+ @ApiImplicitParam(value = "分页参数，每页数量", name = "pageSize", required = true, dataType = "Integer")
+ })
+ public R<TutorVo> getCourseList(
+ @RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
+ @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+ TutorVo tutorVo = new TutorVo();
+ TutorSpecialColumn one = tutorSpecialColumnService.lambdaQuery().one();
+ if (one!=null){
+ TutorSpecialColumnCourse one1 = tutorSpecialColumnCourseService.lambdaQuery().eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, one.getId()).one();
+ BeanUtils.copyProperties(one, tutorVo);
+ Page<Course> page = courseService.lambdaQuery()
+ .in(Course::getId, Arrays.asList(one1.getCourseId().split(",")))
+ .orderByDesc(Course::getSortNum)
+ .page(new Page<>(pageCurr, pageSize));
+ if (CollUtils.isEmpty(page.getRecords())) {
+ PageDTO.empty(page);
+ }
+ tutorVo.setList(PageDTO.of(page, ClientCourseVO.class));
+ }else{
+ return R.ok(tutorVo);
+ }
+ return R.ok();
+ }
+
+
}
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/Course.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/Course.java
index 8442478..15016a1 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/Course.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/Course.java
@@ -5,10 +5,13 @@
import com.xinquan.common.core.web.domain.BaseModel;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.xinquan.user.api.domain.AppUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.util.List;
/**
* <p>
@@ -98,5 +101,7 @@
@TableField("latitude")
private Double latitude;
-
+ @ApiModelProperty(value = "xx人已加入学习")
+ @TableField(exist = false)
+ private List<AppUser> listUser;
}
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/TutorSpecialColumnCourse.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/TutorSpecialColumnCourse.java
index 9029bc7..a0da37a 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/TutorSpecialColumnCourse.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/TutorSpecialColumnCourse.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "课程id")
@TableField("course_id")
- private Long courseId;
+ private String courseId;
@ApiModelProperty(value = "导师专栏id")
@TableField("tutor_special_column_id")
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/vo/TutorVo.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/vo/TutorVo.java
new file mode 100644
index 0000000..0315f61
--- /dev/null
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/domain/vo/TutorVo.java
@@ -0,0 +1,18 @@
+package com.xinquan.course.domain.vo;
+
+import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.course.domain.TutorSpecialColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author mitao
+ * @date 2024/9/7
+ */
+@Data
+@ApiModel(value = "导师专栏对象")
+public class TutorVo extends TutorSpecialColumn {
+ @ApiModelProperty(value = "相关课程")
+ private PageDTO<ClientCourseVO> list;
+}
--
Gitblit v1.7.1