From 64f7ccb9ef8b5a0618e65cddc14b981c1f108ba3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 04 十一月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseChapterController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseChapterController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseChapterController.java
index debf649..7c5f30d 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseChapterController.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseChapterController.java
@@ -1,15 +1,16 @@
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.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
import com.xinquan.common.security.utils.SecurityUtils;
-import com.xinquan.course.domain.CourseChapter;
+import com.xinquan.course.api.domain.CourseChapter;
+import com.xinquan.course.domain.CourseLearningRecord;
import com.xinquan.course.service.CourseChapterService;
+import com.xinquan.course.service.CourseLearningRecordService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -17,10 +18,7 @@
import org.springframework.web.bind.annotation.*;
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;
/**
@@ -36,48 +34,61 @@
public class ClientCourseChapterController {
@Autowired
private CourseChapterService courseChapterService;
+ @Autowired
+ private CourseLearningRecordService courseLearningRecordService;
@PostMapping("/courseChapterManagementList")
@ApiOperation(value = "章节列表-分页", tags = {"管理后台-章节管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", dataType = "Integer", required = true),
+ @ApiImplicitParam(name = "courseId", value = "课程id", dataType = "String", required = true),
@ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量", dataType = "Integer", required = true)
})
public R<PageDTO<CourseChapter>> courseChapterManagementList(@RequestParam(value = "pageCurr")Integer pageCurr,
+ @RequestParam(value = "courseId")String courseId,
@RequestParam(value = "pageSize")Integer pageSize) {
LambdaQueryWrapper<CourseChapter> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
courseLambdaQueryWrapper.orderByDesc(CourseChapter::getSortNum);
+ courseLambdaQueryWrapper.eq(CourseChapter::getCourseId,courseId);
Page<CourseChapter> page = courseChapterService.page(new Page<>(pageCurr, pageSize), courseLambdaQueryWrapper);
if (CollUtils.isEmpty(page.getRecords())) {
return R.ok(PageDTO.empty(page));
}
for (CourseChapter record : page.getRecords()) {
record.setUid(record.getId()+"");
+ int size = courseLearningRecordService.lambdaQuery()
+ .eq(CourseLearningRecord::getChapterId, record.getId()).list().size();
+ record.setRealLearnedNum(size);
}
+
return R.ok(PageDTO.of(page, CourseChapter.class));
}
@PostMapping("/addChapter")
- @ApiOperation(value = "新增章节管理", notes = "管理后台-章节管理")
+ @ApiOperation(value = "新增章节管理", tags = "管理后台-章节管理")
public R addCourseChapter(@RequestBody CourseChapter homeBackgroundMusic) {
homeBackgroundMusic.setCreateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setCreateTime(LocalDateTime.now());
return R.ok(courseChapterService.save(homeBackgroundMusic));
}
@GetMapping("/detailCourseChapter")
- @ApiOperation(value = "查看详情章节管理", notes = "管理后台-章节管理")
+ @ApiOperation(value = "查看详情章节管理", tags = "管理后台-章节管理")
public R<CourseChapter> detailCourseChapter(String uid) {
- return R.ok(courseChapterService.getById(uid));
+ CourseChapter byId = courseChapterService.getById(uid);
+ int size = courseLearningRecordService.lambdaQuery()
+ .eq(CourseLearningRecord::getChapterId, byId.getId()).list().size();
+ byId.setRealLearnedNum(size);
+ return R.ok(byId);
}
@PostMapping("/updateCourseChapter")
- @ApiOperation(value = "修改章节管理", notes = "管理后台-章节管理")
+ @ApiOperation(value = "修改章节管理", tags = "管理后台-章节管理")
public R updateCourseChapter(@RequestBody CourseChapter homeBackgroundMusic) {
homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setUpdateTime(LocalDateTime.now());
return R.ok(courseChapterService.updateById(homeBackgroundMusic));
}
@PostMapping("/deleteCourseChapter")
- @ApiOperation(value = "批量删除", notes = "管理后台-章节管理")
+ @ApiOperation(value = "批量删除", tags = "管理后台-章节管理")
public R deleteCourseChapter(String ids) {
- return R.ok(courseChapterService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.ok(courseChapterService.removeBatchByIds(Arrays.asList(ids.split(",")).stream().map(Long::valueOf).collect(Collectors.toList())));
}
}
--
Gitblit v1.7.1