From 3818974122e7b80e0fe04fd5709a853bac831caa Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 12 十一月 2024 20:18:01 +0800 Subject: [PATCH] 代码提交 --- xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseCategoryController.java | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseCategoryController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseCategoryController.java index 84f4d9e..8016fe2 100644 --- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseCategoryController.java +++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseCategoryController.java @@ -7,9 +7,11 @@ 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.service.CourseCategoryService; import com.xinquan.course.service.CourseCategoryService; +import com.xinquan.course.service.CourseService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -18,6 +20,8 @@ import java.time.LocalDateTime; import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -32,6 +36,8 @@ public class ClientCourseCategoryController { @Autowired private CourseCategoryService courseCategoryService; + @Autowired + private CourseService courseService; @PostMapping("/courseCategoryManagementList") @ApiOperation(value = "分类列表-分页", tags = {"管理后台-分类管理"}) @ApiImplicitParams({ @@ -51,29 +57,58 @@ } return R.ok(PageDTO.of(page, CourseCategory.class)); } + @PostMapping("/courseCategoryManagementList1") + @ApiOperation(value = "分类列表-分页", tags = {"管理后台-分类管理"}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageCurr", value = "分页参数,当前页码", dataType = "Integer", required = true), + @ApiImplicitParam(name = "pageSize", value = "分页参数,每页数量", dataType = "Integer", required = true) + }) + public R<PageDTO<CourseCategory>> courseCategoryManagementList1(@RequestParam(value = "pageCurr")Integer pageCurr, + @RequestParam(value = "pageSize")Integer pageSize) { + LambdaQueryWrapper<CourseCategory> courseLambdaQueryWrapper = new LambdaQueryWrapper<>(); + courseLambdaQueryWrapper.ne(CourseCategory::getName,"线下课程"); + courseLambdaQueryWrapper.orderByDesc(CourseCategory::getSortNum); + Page<CourseCategory> page = courseCategoryService.page(new Page<>(pageCurr, pageSize), courseLambdaQueryWrapper); + if (CollUtils.isEmpty(page.getRecords())) { + return R.ok(PageDTO.empty(page)); + } + for (CourseCategory record : page.getRecords()) { + record.setUid(record.getId()+""); + } + return R.ok(PageDTO.of(page, CourseCategory.class)); + } @PostMapping("/addCourseCategory") - @ApiOperation(value = "新增分类管理", notes = "管理后台-分类管理") + @ApiOperation(value = "新增分类管理", tags = "管理后台-分类管理") public R addCourseCategory(@RequestBody CourseCategory homeBackgroundMusic) { homeBackgroundMusic.setCreateBy(SecurityUtils.getUsername()); homeBackgroundMusic.setCreateTime(LocalDateTime.now()); return R.ok(courseCategoryService.save(homeBackgroundMusic)); } @GetMapping("/detailCourseCategory") - @ApiOperation(value = "查看详情分类管理", notes = "管理后台-分类管理") + @ApiOperation(value = "查看详情分类管理", tags = "管理后台-分类管理") public R<CourseCategory> detailCourseCategory(String uid) { return R.ok(courseCategoryService.getById(uid)); } @PostMapping("/updateCourseCategory") - @ApiOperation(value = "修改分类管理", notes = "管理后台-分类管理") + @ApiOperation(value = "修改分类管理", tags = "管理后台-分类管理") public R updateCourseCategory(@RequestBody CourseCategory homeBackgroundMusic) { homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername()); homeBackgroundMusic.setUpdateTime(LocalDateTime.now()); return R.ok(courseCategoryService.updateById(homeBackgroundMusic)); } @PostMapping("/deleteCourseCategory") - @ApiOperation(value = "批量删除", notes = "管理后台-分类管理") + @ApiOperation(value = "批量删除", tags = "管理后台-分类管理") public R deleteCourseCategory(String ids) { - return R.ok(courseCategoryService.removeBatchByIds(Arrays.asList(ids.split(",")))); + // 全部修改为Long类型 + List<Long> collect = Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()); + for (Long l : collect) { + List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, l).list(); + if (!list.isEmpty()){ + CourseCategory byId = courseCategoryService.getById(l); + return R.fail("分类名称:"+byId.getName()+"下存在关联课程,不可删除"); + } + } + return R.ok(courseCategoryService.removeBatchByIds(Arrays.asList(ids.split(",")).stream().map(Long::valueOf).collect(Collectors.toList()))); } } -- Gitblit v1.7.1