新增课件搜索逻辑

mec-application/src/main/java/com/ym/mec/student/controller/LessonCoursewareController.java

@@ -22,6 +22,7 @@ import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -128,12 +129,76 @@ public class LessonCoursewareController extends BaseController {
     }
 
     @ApiOperation(value = "获取课件关联的课程列表")
-	@GetMapping("/getLessonCoursewareCourseList/{id}")
-	public HttpResponseResult<List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail>> getLessonCoursewareCourseList(@PathVariable("id") Long id){
+	@GetMapping("/getLessonCoursewareCourseList")
+	public HttpResponseResult<List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail>> getLessonCoursewareCourseList(Long id,String search){
 		List<CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetails = coursewareFeignService.coursewareDetail(id).feignData();
 		if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
+            if(StringUtils.isNotEmpty(search)){
+                //优化模糊匹配，将模糊匹配和过滤没有素材的知识点合并
+                courseScheduleCoursewareDetails = courseScheduleCoursewareDetails.stream().map(courseScheduleCoursewareDetail -> {
+                    // 获取原始的 knowledgePointList
+                    List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> knowledgePointList = courseScheduleCoursewareDetail.getKnowledgePointList();
+
+                    // 过滤掉不满足条件的知识点
+                    if (CollectionUtils.isNotEmpty(knowledgePointList)) {
+                        knowledgePointList = knowledgePointList.stream().filter(knowledgePointSmall -> {
+                            // 处理当前知识点的 materialList
+                            List<CbsLessonCoursewareDetailWrapper.MaterialSmall> materialList = knowledgePointSmall.getMaterialList();
+
+                            // 始终进行模糊搜索，判断 materialList 是否符合条件
+                            boolean materialListMatches = false;
+                            if (CollectionUtils.isNotEmpty(materialList)) {
+                                if (StringUtils.isNotEmpty(search)) {
+                                    materialList = materialList.stream()
+                                            .filter(materialSmall -> materialSmall.getName().contains(search))
+                                            .collect(Collectors.toList());
+                                    knowledgePointSmall.setMaterialList(materialList);
+                                }
+
+                                // 如果 materialList 经过模糊搜索后仍不为空，则设置标志为 true
+                                if (CollectionUtils.isNotEmpty(materialList)) {
+                                    materialListMatches = true;
+                                }
+                            }
+
+                            // 对 children 进行处理：始终对 child 的 materialList 进行模糊匹配
+                            List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> children = knowledgePointSmall.getChildren();
+                            if (CollectionUtils.isNotEmpty(children)) {
+                                for (CbsLessonCoursewareDetailWrapper.KnowledgePointSmall child : children) {
+                                    List<CbsLessonCoursewareDetailWrapper.MaterialSmall> childMaterialList = child.getMaterialList();
+
+                                    // 对子知识点的 materialList 进行模糊搜索
+                                    if (CollectionUtils.isNotEmpty(childMaterialList)) {
+                                        if (StringUtils.isNotEmpty(search)) {
+                                            childMaterialList = childMaterialList.stream()
+                                                    .filter(materialSmall -> materialSmall.getName().contains(search))
+                                                    .collect(Collectors.toList());
+                                            child.setMaterialList(childMaterialList);
+                                        }
+
+                                        // 如果子知识点的 materialList 仍不为空，保留该子知识点
+                                        if (CollectionUtils.isNotEmpty(childMaterialList)) {
+                                            return true; // 保留该知识点
+                                        }
+                                    }
+                                }
+                            }
+
+                            // 如果 materialList 和 childMaterialList 都为空，剔除该知识点
+                            return materialListMatches || CollectionUtils.isNotEmpty(children);
+                        }).collect(Collectors.toList());
+
+                        // 更新 courseScheduleCoursewareDetail 的 knowledgePointList
+                        courseScheduleCoursewareDetail.setKnowledgePointList(knowledgePointList);
+                    }
+                    // 返回更新后的 courseScheduleCoursewareDetail
+                    return courseScheduleCoursewareDetail;
+                }).collect(Collectors.toList());
+            }
+
 			String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
-			List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
+			List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList =
+                    JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
 			return succeed(courseScheduleCoursewareDetailList);
 		}
 		return succeed(new ArrayList<>());