Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 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.*;
@@ -30,9 +32,10 @@

    @ResponseBody
    @PostMapping("/base/courseVideo/getAllList")
    public List<ExerciseVideo> getStuCourseOfVideoList(@RequestBody List<Integer> coursePackIds){
    public List<ExerciseVideo> getStuCourseOfVideoList(@RequestBody List<Integer> coursePackIds) {
        return pcvService.queryCourseOfVideos(coursePackIds);
    }

    @Autowired
    private TCoursePackageDiscountService discountService;

@@ -42,35 +45,42 @@
    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"));
        System.out.println("======longs========" + longs);
//        List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
        List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);

        for (AppUserVideoResponse appUserVideoResponse : coursePackageSchedulings1) {
            ExerciseVideo exerciseVideo = new ExerciseVideo();
            exerciseVideo.setVideoId(appUserVideoResponse.getVideoId());
            exerciseVideo.setVideoName(appUserVideoResponse.getVideoName());
            exerciseVideo.setCoursePackageId(appUserVideoResponse.getCoursePackageId());
            exerciseVideo.setVideoUrl(appUserVideoResponse.getCourseVideo());
            exerciseVideo.setVideoCoverImgUrl(appUserVideoResponse.getCourseVideo());exerciseVideoList.add(exerciseVideo);

        if (coursePackageSchedulings1 != null) {
            for (AppUserVideoResponse appUserVideoResponse : coursePackageSchedulings1) {
                ExerciseVideo exerciseVideo = new ExerciseVideo();
                exerciseVideo.setVideoId(appUserVideoResponse.getVideoId());
                exerciseVideo.setVideoName(appUserVideoResponse.getVideoName());
                exerciseVideo.setCoursePackageId(appUserVideoResponse.getCoursePackageId());
                exerciseVideo.setVideoUrl(appUserVideoResponse.getCourseVideo());
                exerciseVideo.setVideoCoverImgUrl(appUserVideoResponse.getCourseVideo());
                exerciseVideoList.add(exerciseVideo);
            }


        }




//        return pcvService.queryCourseOfVideos(coursePackIds);
        return exerciseVideoList;