diff --git a/reading-platform-frontend/src/api/course-center.ts b/reading-platform-frontend/src/api/course-center.ts new file mode 100644 index 0000000..ee8b86a --- /dev/null +++ b/reading-platform-frontend/src/api/course-center.ts @@ -0,0 +1,83 @@ +import { http } from './index'; + +// ============= 类型定义 ============= + +/** 套餐信息 */ +export interface CourseCollection { + id: number; + name: string; + description?: string; + packageCount: number; + gradeLevels?: string[]; + status: string; + startDate?: string; + endDate?: string; +} + +/** 课程包信息 */ +export interface CoursePackage { + id: number; + name: string; + description?: string; + coverImagePath?: string; + pictureBookName?: string; + gradeTags: string[]; + domainTags?: string[]; + themeId?: number; + themeName?: string; + durationMinutes?: number; + usageCount?: number; + avgRating?: number; + sortOrder?: number; +} + +/** 筛选元数据 - 年级选项 */ +export interface GradeOption { + label: string; + count: number; +} + +/** 筛选元数据 - 主题选项 */ +export interface ThemeOption { + id: number; + name: string; + count: number; +} + +/** 筛选元数据响应 */ +export interface FilterMetaResponse { + grades: GradeOption[]; + themes: ThemeOption[]; +} + +// ============= API 接口 ============= + +/** + * 获取租户的课程套餐列表 + */ +export function getCollections(): Promise { + return http.get('/v1/school/packages'); +} + +/** + * 获取套餐下的课程包列表(支持筛选) + */ +export function getPackages( + collectionId: number, + params?: { + grade?: string; + themeId?: number; + keyword?: string; + } +): Promise { + return http.get(`/v1/school/packages/${collectionId}/packages`, { + params, + }); +} + +/** + * 获取套餐的筛选元数据 + */ +export function getFilterMeta(collectionId: number): Promise { + return http.get(`/v1/school/packages/${collectionId}/filter-meta`); +} diff --git a/reading-platform-frontend/src/api/school.ts b/reading-platform-frontend/src/api/school.ts index 4a766de..0234ebe 100644 --- a/reading-platform-frontend/src/api/school.ts +++ b/reading-platform-frontend/src/api/school.ts @@ -338,6 +338,24 @@ export const getCourseCollections = () => export const getCourseCollectionPackages = (collectionId: number | string) => http.get(`/v1/school/packages/${collectionId}/packages`); +// 获取课程包详情(包含课程环节列表) +export interface CoursePackageDetail { + id: number; + name: string; + description?: string; + courses: Array<{ + id: number; + name: string; + lessonType?: string; + gradeLevel?: string; + sortOrder?: number; + scheduleRefData?: string; + }>; +} + +export const getCoursePackageDetail = (packageId: number | string) => + http.get(`/v1/school/packages/packages/${packageId}/courses`); + // 续费课程套餐(三层架构) export const renewCollection = (collectionId: number, data: RenewPackageDto) => http.post(`/v1/school/packages/${collectionId}/renew`, data); @@ -423,8 +441,8 @@ export const getSchoolCourseList = (params?: { }) => http.get<{ list: Course[]; total: number; pageNum: number; pageSize: number; pages: number }>('/v1/school/courses', { params }); -export const getSchoolCourse = (id: number) => - http.get(`/v1/school/courses/${id}`); +export const getSchoolCourse = (id: number | string): Promise => + http.get(`/v1/school/courses/${id}`) as any; // ==================== 班级教师管理 ==================== diff --git a/reading-platform-frontend/src/router/index.ts b/reading-platform-frontend/src/router/index.ts index 868ebbb..d49e637 100644 --- a/reading-platform-frontend/src/router/index.ts +++ b/reading-platform-frontend/src/router/index.ts @@ -162,8 +162,8 @@ const routes: RouteRecordRaw[] = [ { path: 'courses', name: 'SchoolCourses', - component: () => import('@/views/school/courses/CourseListView.vue'), - meta: { title: '课程管理' }, + component: () => import('@/views/school/courses-new/CourseCenterView.vue'), + meta: { title: '课程中心' }, }, { path: 'courses/:id', @@ -276,7 +276,7 @@ const routes: RouteRecordRaw[] = [ { path: 'courses', name: 'TeacherCourses', - component: () => import('@/views/teacher/courses/CourseListView.vue'), + component: () => import('@/views/teacher/courses-new/CourseCenterView.vue'), meta: { title: '课程中心' }, }, { diff --git a/reading-platform-frontend/src/views/school/LayoutView.vue b/reading-platform-frontend/src/views/school/LayoutView.vue index 2ad5ada..c2fd412 100644 --- a/reading-platform-frontend/src/views/school/LayoutView.vue +++ b/reading-platform-frontend/src/views/school/LayoutView.vue @@ -59,7 +59,7 @@ - 课程管理 + 课程中心 diff --git a/reading-platform-frontend/src/views/school/courses-new/CourseCenterView.vue b/reading-platform-frontend/src/views/school/courses-new/CourseCenterView.vue new file mode 100644 index 0000000..4730ce6 --- /dev/null +++ b/reading-platform-frontend/src/views/school/courses-new/CourseCenterView.vue @@ -0,0 +1,599 @@ + + + + + diff --git a/reading-platform-frontend/src/views/school/courses-new/components/CoursePackageCard.vue b/reading-platform-frontend/src/views/school/courses-new/components/CoursePackageCard.vue new file mode 100644 index 0000000..3b89663 --- /dev/null +++ b/reading-platform-frontend/src/views/school/courses-new/components/CoursePackageCard.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/reading-platform-frontend/src/views/teacher/courses-new/CourseCenterView.vue b/reading-platform-frontend/src/views/teacher/courses-new/CourseCenterView.vue new file mode 100644 index 0000000..20f95fe --- /dev/null +++ b/reading-platform-frontend/src/views/teacher/courses-new/CourseCenterView.vue @@ -0,0 +1,580 @@ + + + + + diff --git a/reading-platform-frontend/src/views/teacher/courses-new/components/CoursePackageCard.vue b/reading-platform-frontend/src/views/teacher/courses-new/components/CoursePackageCard.vue new file mode 100644 index 0000000..2527a4a --- /dev/null +++ b/reading-platform-frontend/src/views/teacher/courses-new/components/CoursePackageCard.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolCourseController.java b/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolCourseController.java index 480e2e1..5164134 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolCourseController.java +++ b/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolCourseController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.reading.platform.common.response.PageResult; import com.reading.platform.common.response.Result; import com.reading.platform.common.security.SecurityUtils; +import com.reading.platform.dto.response.CourseResponse; import com.reading.platform.dto.response.LessonTagResponse; import com.reading.platform.dto.response.SchoolCourseResponse; import com.reading.platform.entity.CourseLesson; @@ -71,12 +72,14 @@ public class SchoolCourseController { } @GetMapping("/{id}") - @Operation(summary = "获取课程详情") - public Result getSchoolCourse(@PathVariable Long id) { + @Operation(summary = "获取课程详情(包含课程环节、介绍、资源等完整信息)") + public Result getSchoolCourse(@PathVariable Long id) { log.info("获取课程详情,id={}", id); Long tenantId = SecurityUtils.getCurrentTenantId(); - CoursePackage course = courseService.getCourseByIdWithTenantCheck(id, tenantId); - return Result.success(SchoolCourseResponse.toSchoolCourseResponse(course)); + // 验证权限 + courseService.getCourseByIdWithTenantCheck(id, tenantId); + // 返回完整详情(与教师端一致) + return Result.success(courseService.getCourseByIdWithLessons(id)); } diff --git a/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolPackageController.java b/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolPackageController.java index 0dc71b9..550c48a 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolPackageController.java +++ b/reading-platform-java/src/main/java/com/reading/platform/controller/school/SchoolPackageController.java @@ -8,6 +8,7 @@ import com.reading.platform.dto.request.RenewRequest; import com.reading.platform.dto.response.CourseCollectionResponse; import com.reading.platform.dto.response.CourseResponse; import com.reading.platform.dto.response.CoursePackageResponse; +import com.reading.platform.dto.response.PackageFilterMetaResponse; import com.reading.platform.dto.response.PackageInfoResponse; import com.reading.platform.dto.response.PackageUsageResponse; import com.reading.platform.entity.Tenant; @@ -46,8 +47,19 @@ public class SchoolPackageController { @GetMapping("/{collectionId}/packages") @Operation(summary = "获取课程套餐下的课程包列表") @RequireRole({UserRole.SCHOOL, UserRole.TEACHER}) - public Result> getPackagesByCollection(@PathVariable Long collectionId) { - return Result.success(collectionService.getPackagesByCollection(collectionId)); + public Result> getPackagesByCollection( + @PathVariable Long collectionId, + @RequestParam(required = false) String grade, + @RequestParam(required = false) Long themeId, + @RequestParam(required = false) String keyword) { + return Result.success(collectionService.getPackagesByCollection(collectionId, grade, themeId, keyword)); + } + + @GetMapping("/{collectionId}/filter-meta") + @Operation(summary = "获取套餐筛选元数据(年级、主题选项)") + @RequireRole({UserRole.SCHOOL, UserRole.TEACHER}) + public Result getFilterMeta(@PathVariable Long collectionId) { + return Result.success(collectionService.getPackageFilterMeta(collectionId)); } @PostMapping("/{collectionId}/renew") diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/response/CoursePackageResponse.java b/reading-platform-java/src/main/java/com/reading/platform/dto/response/CoursePackageResponse.java index 54cb60c..fc89d5c 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/dto/response/CoursePackageResponse.java +++ b/reading-platform-java/src/main/java/com/reading/platform/dto/response/CoursePackageResponse.java @@ -81,6 +81,33 @@ public class CoursePackageResponse { @Schema(description = "排序号(在课程套餐中的顺序)") private Integer sortOrder; + @Schema(description = "主题ID") + private Long themeId; + + @Schema(description = "主题名称") + private String themeName; + + @Schema(description = "绘本名称") + private String pictureBookName; + + @Schema(description = "封面图片路径") + private String coverImagePath; + + @Schema(description = "年级标签(数组)") + private String[] gradeTags; + + @Schema(description = "领域标签(数组)") + private String[] domainTags; + + @Schema(description = "课程时长(分钟)") + private Integer durationMinutes; + + @Schema(description = "使用次数") + private Integer usageCount; + + @Schema(description = "平均评分") + private java.math.BigDecimal avgRating; + /** * 课程包中的课程项 */ diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/response/PackageFilterMetaResponse.java b/reading-platform-java/src/main/java/com/reading/platform/dto/response/PackageFilterMetaResponse.java new file mode 100644 index 0000000..4cb040b --- /dev/null +++ b/reading-platform-java/src/main/java/com/reading/platform/dto/response/PackageFilterMetaResponse.java @@ -0,0 +1,62 @@ +package com.reading.platform.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 套餐筛选元数据响应 + * 用于返回套餐下课程包的筛选选项(年级、主题) + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "套餐筛选元数据响应") +public class PackageFilterMetaResponse { + + @Schema(description = "年级选项列表") + private List grades; + + @Schema(description = "主题选项列表") + private List themes; + + /** + * 年级选项 + */ + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + @Schema(description = "年级选项") + public static class GradeOption { + @Schema(description = "年级名称") + private String label; + + @Schema(description = "该年级下的课程包数量") + private Integer count; + } + + /** + * 主题选项 + */ + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + @Schema(description = "主题选项") + public static class ThemeOption { + @Schema(description = "主题ID") + private Long id; + + @Schema(description = "主题名称") + private String name; + + @Schema(description = "该主题下的课程包数量") + private Integer count; + } +} diff --git a/reading-platform-java/src/main/java/com/reading/platform/service/CourseCollectionService.java b/reading-platform-java/src/main/java/com/reading/platform/service/CourseCollectionService.java index 297ecf8..e728027 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/service/CourseCollectionService.java +++ b/reading-platform-java/src/main/java/com/reading/platform/service/CourseCollectionService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.reading.platform.dto.response.CourseCollectionResponse; import com.reading.platform.dto.response.CoursePackageResponse; +import com.reading.platform.dto.response.PackageFilterMetaResponse; import com.reading.platform.entity.CourseCollection; import java.time.LocalDate; @@ -34,6 +35,23 @@ public interface CourseCollectionService extends IService { */ List getPackagesByCollection(Long collectionId); + /** + * 获取课程套餐下的课程包列表(支持筛选) + * @param collectionId 套餐ID + * @param grade 年级筛选 + * @param themeId 主题ID筛选 + * @param keyword 关键词搜索 + * @return 课程包列表 + */ + List getPackagesByCollection(Long collectionId, String grade, Long themeId, String keyword); + + /** + * 获取套餐的筛选元数据(年级、主题选项) + * @param collectionId 套餐ID + * @return 筛选元数据 + */ + PackageFilterMetaResponse getPackageFilterMeta(Long collectionId); + /** * 创建课程套餐 */ diff --git a/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseCollectionServiceImpl.java b/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseCollectionServiceImpl.java index 1fa87a7..973ca2f 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseCollectionServiceImpl.java +++ b/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseCollectionServiceImpl.java @@ -10,6 +10,7 @@ import com.reading.platform.common.exception.BusinessException; import com.reading.platform.common.response.PageResult; import com.reading.platform.dto.response.CourseCollectionResponse; import com.reading.platform.dto.response.CoursePackageResponse; +import com.reading.platform.dto.response.PackageFilterMetaResponse; import com.reading.platform.entity.*; import com.reading.platform.mapper.*; import com.reading.platform.service.CourseCollectionService; @@ -22,7 +23,11 @@ import org.springframework.util.StringUtils; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** @@ -38,8 +43,8 @@ public class CourseCollectionServiceImpl extends ServiceImpl getPackagesByCollection(Long collectionId, String grade, Long themeId, String keyword) { + log.info("获取课程套餐的课程包列表(筛选),collectionId={}, grade={}, themeId={}, keyword={}", collectionId, grade, themeId, keyword); + + // 查询关联关系 + List associations = collectionPackageMapper.selectList( + new LambdaQueryWrapper() + .eq(CourseCollectionPackage::getCollectionId, collectionId) + .orderByAsc(CourseCollectionPackage::getSortOrder) + ); + + if (associations.isEmpty()) { + return new ArrayList<>(); + } + + // 获取课程包ID列表 + List packageIds = associations.stream() + .map(CourseCollectionPackage::getPackageId) + .collect(Collectors.toList()); + + // 构建查询条件 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .in(CoursePackage::getId, packageIds) + .eq(CoursePackage::getStatus, CourseStatus.PUBLISHED.getCode()); + + // 年级筛选:gradeTags 是 JSON 数组格式 + if (StringUtils.hasText(grade)) { + wrapper.apply("JSON_CONTAINS(grade_tags, {0})", "\"" + grade + "\""); + } + + // 主题筛选 + if (themeId != null) { + wrapper.eq(CoursePackage::getThemeId, themeId); + } + + // 关键词搜索 + if (StringUtils.hasText(keyword)) { + wrapper.and(w -> w + .like(CoursePackage::getName, keyword) + .or() + .like(CoursePackage::getPictureBookName, keyword) + ); + } + + List packages = packageMapper.selectList(wrapper); + + // 获取所有主题信息(批量查询优化) + Set themeIds = packages.stream() + .map(CoursePackage::getThemeId) + .filter(id -> id != null) + .collect(Collectors.toSet()); + Map themeNameMap = new HashMap<>(); + if (!themeIds.isEmpty()) { + List themes = themeMapper.selectBatchIds(themeIds); + themeNameMap = themes.stream() + .collect(Collectors.toMap(Theme::getId, Theme::getName)); + } + + // 转换为响应对象 + final Map finalThemeNameMap = themeNameMap; + List result = packages.stream() + .map(pkg -> { + CoursePackageResponse response = toPackageResponse(pkg); + // 设置主题名称 + if (pkg.getThemeId() != null) { + response.setThemeId(pkg.getThemeId()); + response.setThemeName(finalThemeNameMap.get(pkg.getThemeId())); + } + // 设置排序号 + associations.stream() + .filter(a -> a.getPackageId().equals(pkg.getId())) + .findFirst() + .ifPresent(a -> response.setSortOrder(a.getSortOrder())); + return response; + }) + .collect(Collectors.toList()); + + log.info("筛选后查询到{}个课程包", result.size()); + return result; + } + + /** + * 获取套餐的筛选元数据 + */ + @Override + public PackageFilterMetaResponse getPackageFilterMeta(Long collectionId) { + log.info("获取套餐筛选元数据,collectionId={}", collectionId); + + // 查询套餐下所有课程包 + List associations = collectionPackageMapper.selectList( + new LambdaQueryWrapper() + .eq(CourseCollectionPackage::getCollectionId, collectionId) + ); + + if (associations.isEmpty()) { + return PackageFilterMetaResponse.builder() + .grades(new ArrayList<>()) + .themes(new ArrayList<>()) + .build(); + } + + List packageIds = associations.stream() + .map(CourseCollectionPackage::getPackageId) + .collect(Collectors.toList()); + + List packages = packageMapper.selectList( + new LambdaQueryWrapper() + .in(CoursePackage::getId, packageIds) + .eq(CoursePackage::getStatus, CourseStatus.PUBLISHED.getCode()) + ); + + // 统计年级分布 + Map gradeCountMap = new HashMap<>(); + for (CoursePackage pkg : packages) { + String[] grades = parseGradeTags(pkg.getGradeTags()); + for (String g : grades) { + gradeCountMap.merge(g, 1, Integer::sum); + } + } + + // 按顺序生成年级选项 + List gradeOrder = List.of("小班", "中班", "大班"); + List grades = gradeOrder.stream() + .filter(gradeCountMap::containsKey) + .map(grade -> PackageFilterMetaResponse.GradeOption.builder() + .label(grade) + .count(gradeCountMap.get(grade)) + .build()) + .collect(Collectors.toList()); + + // 统计主题分布 + Map themeCountMap = new HashMap<>(); + Set themeIds = new HashSet<>(); + for (CoursePackage pkg : packages) { + if (pkg.getThemeId() != null) { + themeCountMap.merge(pkg.getThemeId(), 1, Integer::sum); + themeIds.add(pkg.getThemeId()); + } + } + + // 批量查询主题名称 + List themes = new ArrayList<>(); + if (!themeIds.isEmpty()) { + List themeList = themeMapper.selectBatchIds(themeIds); + themes = themeList.stream() + .filter(t -> themeCountMap.containsKey(t.getId())) + .map(t -> PackageFilterMetaResponse.ThemeOption.builder() + .id(t.getId()) + .name(t.getName()) + .count(themeCountMap.get(t.getId())) + .build()) + .collect(Collectors.toList()); + } + + return PackageFilterMetaResponse.builder() + .grades(grades) + .themes(themes) + .build(); + } + + /** + * 解析年级标签 + */ + private String[] parseGradeTags(String gradeTags) { + if (!StringUtils.hasText(gradeTags)) { + return new String[0]; + } + try { + if (gradeTags.trim().startsWith("[")) { + return JSON.parseArray(gradeTags, String.class).toArray(new String[0]); + } + return gradeTags.split(","); + } catch (Exception e) { + return new String[0]; + } + } + /** * 创建课程套餐 */ @@ -675,8 +860,17 @@ public class CourseCollectionServiceImpl extends ServiceImpl