From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/PostCourseVideoController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/PostCourseVideoController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/PostCourseVideoController.java
index af842d6..a459597 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/PostCourseVideoController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/PostCourseVideoController.java
@@ -11,6 +11,8 @@
import com.dsh.course.service.ICoursePackageSchedulingService;
import com.dsh.course.service.PostCourseVideoService;
import com.dsh.course.service.TCoursePackageDiscountService;
+import com.dsh.course.util.ResultUtil;
+import com.dsh.course.util.TokenUtil;
import com.dsh.course.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -42,24 +44,30 @@
private ICoursePackageSchedulingService coursePackageSchedulingService;
@Autowired
private CoursePackageStudentService coursePackageStudentService;
+ @Autowired
+ private TokenUtil tokenUtil;
@ResponseBody
@PostMapping("/base/courseVideo/query")
- public List<ExerciseVideo> query(@RequestBody Integer coursePackIds){
+ public List<ExerciseVideo> query(@RequestBody Integer id) throws Exception {
List<ExerciseVideo> exerciseVideoList = new ArrayList<>();
+// Integer appUserId = tokenUtil.getUserIdFormRedis();
- QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", 19);
+
+ QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("studentId", id);
List<CoursePackageStudent> list = coursePackageStudentService.list(queryWrapper1);
List<Long> longs = new ArrayList<>();
for (CoursePackageStudent coursePackageStudent : list) {
longs.add(coursePackageStudent.getCoursePackageSchedulingId());
}
System.out.println("======longs========"+longs);
- List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
+// List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);
+
+ if (coursePackageSchedulings1!=null){
for (AppUserVideoResponse appUserVideoResponse : coursePackageSchedulings1) {
ExerciseVideo exerciseVideo = new ExerciseVideo();
exerciseVideo.setVideoId(appUserVideoResponse.getVideoId());
@@ -70,7 +78,7 @@
}
-
+}
// return pcvService.queryCourseOfVideos(coursePackIds);
return exerciseVideoList;
--
Gitblit v1.7.1