From 818e8d1810bcdcbeae5a948ecd115ff0ce5a1f54 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 17:56:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index ab2011c..bf935f6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -62,7 +62,7 @@
- @PostMapping("/course/queryList")
+ @PostMapping("/base/course/queryList")
public List<ExerciseVideo> queryStuCourseAfterVideos(@RequestBody List<Integer> courseIds){
List<ExerciseVideo> videos = new ArrayList<>();
List<TCourse> list = courseService.list(new QueryWrapper<TCourse>()
@@ -112,7 +112,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CoursePackageListVo>> queryCourseList(@RequestBody CoursePackageList coursePackageList){
+ public ResultUtil<List<CoursePackageListVo>> queryCourseList(CoursePackageList coursePackageList){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -133,11 +133,11 @@
@ApiOperation(value = "获取课程详情", tags = {"APP-课程列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "课包id", name = "id", dataType = "int", required = true),
- @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = true),
- @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<CoursePackageInfo> queryCourseInfo(@RequestBody Integer id, @RequestBody String lon, @RequestBody String lat){
+ public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -161,7 +161,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil paymentCourse(@RequestBody PaymentCourseVo paymentCourseVo){
+ public ResultUtil paymentCourse(PaymentCourseVo paymentCourseVo){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -242,4 +242,38 @@
e.printStackTrace();
}
}
+
+
+ /**
+ * 根据id获取课程数据
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/course/queryCourseById")
+ public TCourse queryCourseById(@RequestBody Integer id){
+ try {
+ return courseService.getById(id);
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+ /**
+ * 根据名称获取数据
+ * @param name
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/course/queryCourseByName")
+ public List<TCourse> queryCourseByName(@RequestBody String name){
+ try {
+ return courseService.list(new QueryWrapper<TCourse>().like("name", name).eq("state", 1));
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
}
--
Gitblit v1.7.1