From c35148a017ba818bd1897733dcdeb8c20454c03b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 10:52:08 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java | 123 ++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 26 deletions(-)
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 4e59057..fb581e4 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,32 +1,38 @@
package com.xinquan.course.controller.client;
-import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.common.security.utils.SecurityUtils;
import com.xinquan.course.api.domain.Course;
+import com.xinquan.course.api.domain.CourseCategory;
+import com.xinquan.course.api.domain.CourseChapter;
+import com.xinquan.course.domain.CourseLearningRecord;
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.TutorCourseVO;
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 com.xinquan.course.service.*;
+import com.xinquan.system.api.domain.AppUser;
+import com.xinquan.user.api.feign.RemoteAppUserService;
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 org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -48,34 +54,99 @@
private CourseCategoryService courseCategoryService;
@Resource
private CourseService courseService;
+ @Resource
+ private CourseLearningRecordService courseLearningRecordService;
+ @Resource
+ private CourseChapterService courseChapterService;
+ @Resource
+ private RemoteAppUserService remoteAppUserService;
@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) {
+ public R<TutorVo> getCourseList() {
TutorVo tutorVo = new TutorVo();
TutorSpecialColumn one = tutorSpecialColumnService.lambdaQuery().one();
+ List<TutorCourseVO> clientCourseVOS = new ArrayList<>();
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);
+ TutorSpecialColumnCourse one1 = tutorSpecialColumnCourseService.lambdaQuery().eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, one.getId()).one();
+ if (one1!=null){
+ LambdaQueryWrapper<Course> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.hasLength(one1.getCourseId())){
+ courseLambdaQueryWrapper.in(Course::getId, Arrays.asList(one1.getCourseId().split(",")));
+ }
+ courseLambdaQueryWrapper.orderByDesc(Course::getSortNum);
+ List<Course> page = courseService.list(courseLambdaQueryWrapper);
+ for (Course course : page) {
+ TutorCourseVO tutorCourseVO = new TutorCourseVO();
+ List<AppUser> data = remoteAppUserService.getUserByCourseId(course.getId()).getData();
+ List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, course.getId()).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list1) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data1 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data1;
+ }
+ course.setCount(a+b);
+ course.setRealLearnedNum(a+b);
+ BeanUtils.copyProperties(course, tutorCourseVO);
+ clientCourseVOS.add(tutorCourseVO);
+ }
+ tutorVo.setList(clientCourseVOS);
+ return R.ok(tutorVo);
+ }else{
+ return R.ok(tutorVo);
}
- tutorVo.setList(PageDTO.of(page, ClientCourseVO.class));
}else{
+ tutorVo.setList(clientCourseVOS);
return R.ok(tutorVo);
}
- return R.ok();
}
-
+ @GetMapping("/detailTutor")
+ @ApiOperation(value = "查看详情导师专栏", tags = "管理后台-导师专栏")
+ public R<TutorSpecialColumn> detailTutor() {
+ TutorSpecialColumn one = tutorSpecialColumnService.getOne(null);
+ if (one!=null){
+ TutorSpecialColumnCourse one1 = tutorSpecialColumnCourseService.lambdaQuery()
+ .eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, one.getId()).one();
+ if (one1!=null){
+ List<String> collect = Arrays.asList(one1.getCourseId().split(","));
+ List<Course> list = courseService.lambdaQuery().in(Course::getId, collect).list();
+ for (Course course : list) {
+ CourseCategory byId = courseCategoryService.getById(course.getCateId());
+ if (byId!=null){
+ course.setCategoryName(byId.getName());
+ }
+ }
+ one.setCourses(list);
+ }
+ }
+ return R.ok(one);
+ }
+ @PostMapping("/updateTutor")
+ @ApiOperation(value = "修改分类导师专栏", tags = "管理后台-导师专栏")
+ public R updateTutor(@RequestBody TutorSpecialColumn homeBackgroundMusic) {
+ TutorSpecialColumn one = tutorSpecialColumnService.getOne(null);
+ if (one == null){
+ tutorSpecialColumnService.save(homeBackgroundMusic);
+ }
+ homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername());
+ homeBackgroundMusic.setUpdateTime(LocalDateTime.now());
+ List<Long> collect = tutorSpecialColumnCourseService.lambdaQuery()
+ .eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, homeBackgroundMusic.getId())
+ .list().stream().map(TutorSpecialColumnCourse::getId)
+ .collect(Collectors.toList());
+ tutorSpecialColumnCourseService.removeBatchByIds(collect);
+ if (StringUtils.hasLength(homeBackgroundMusic.getCourseIds())){
+ List<TutorSpecialColumnCourse> tutorSpecialColumnCourses = new ArrayList<>();
+ TutorSpecialColumnCourse tutorSpecialColumnCourse = new TutorSpecialColumnCourse();
+ tutorSpecialColumnCourse.setCourseId(homeBackgroundMusic.getCourseIds());
+ tutorSpecialColumnCourse.setTutorSpecialColumnId(homeBackgroundMusic.getId());
+ tutorSpecialColumnCourses.add(tutorSpecialColumnCourse);
+ tutorSpecialColumnCourseService.saveBatch(tutorSpecialColumnCourses);
+ }
+ return R.ok(tutorSpecialColumnService.updateById(homeBackgroundMusic));
+ }
}
--
Gitblit v1.7.1