新增课件搜索逻辑

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

@@ -171,9 +171,7 @@ public class LessonCoursewareController extends BaseController {
             for (CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail e : courseScheduleCoursewareDetails) {
                 lessonCoursewareService.setTreeResourceId(e.getKnowledgePointList(), query1, musicScoreMap);
             }
-            if(StringUtils.isNotEmpty(search)){
-                courseScheduleCoursewareDetails.removeIf(courseScheduleCoursewareDetail -> !filterAndUpdateKnowledgePointList(courseScheduleCoursewareDetail, search));
-            }
+            courseScheduleCoursewareDetails.removeIf(courseScheduleCoursewareDetail -> !filterAndUpdateKnowledgePointList(courseScheduleCoursewareDetail));
 			String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
 			List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList =
                     JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
@@ -183,28 +181,28 @@ public class LessonCoursewareController extends BaseController {
 	}
 
 
-    private boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail, String search) {
+    private boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail) {
         List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> knowledgePointList = courseScheduleCoursewareDetail.getKnowledgePointList();
         if (CollectionUtils.isEmpty(knowledgePointList)) {
             return false; // 如果 knowledgePointList 为空，直接返回 false，后续会删除该 courseScheduleCoursewareDetail
         }
 
         // 过滤 KnowledgePointSmall
-        knowledgePointList.removeIf(knowledgePointSmall -> !filterKnowledgePoint(knowledgePointSmall, search));
+        knowledgePointList.removeIf(knowledgePointSmall -> !filterKnowledgePoint(knowledgePointSmall));
         courseScheduleCoursewareDetail.setKnowledgePointList(knowledgePointList);
 
         // 如果过滤后的 knowledgePointList 为空，返回 false
         return CollectionUtils.isNotEmpty(knowledgePointList);
     }
 
-    private boolean filterKnowledgePoint(CbsLessonCoursewareDetailWrapper.KnowledgePointSmall knowledgePointSmall, String search) {
+    private boolean filterKnowledgePoint(CbsLessonCoursewareDetailWrapper.KnowledgePointSmall knowledgePointSmall) {
         // 过滤 materialList
-        if (CollectionUtils.isNotEmpty(knowledgePointSmall.getMaterialList())) {
-            filterAndUpdateMaterialList(knowledgePointSmall.getMaterialList(), search);
-        }
+//        if (CollectionUtils.isNotEmpty(knowledgePointSmall.getMaterialList())) {
+//            filterAndUpdateMaterialList(knowledgePointSmall.getMaterialList(), search);
+//        }
         // 过滤子知识点 children
         if (CollectionUtils.isNotEmpty(knowledgePointSmall.getChildren())) {
-            knowledgePointSmall.getChildren().removeIf(child -> !filterKnowledgePoint(child, search));
+            knowledgePointSmall.getChildren().removeIf(child -> !filterKnowledgePoint(child));
         }
         // 保留当前的条件：materialList 不为空 或者 children 不为空，**否则删除当前节点**
         return CollectionUtils.isNotEmpty(knowledgePointSmall.getMaterialList()) ||

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

@@ -22,7 +22,6 @@ 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.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -104,9 +103,7 @@ public class LessonCoursewareController extends BaseController {
 			for (CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail e : courseScheduleCoursewareDetails) {
 				lessonCoursewareService.setTreeResourceId(e.getKnowledgePointList(), query1, musicScoreMap);
 			}
-			if(StringUtils.isNotEmpty(search)){
-				courseScheduleCoursewareDetails.removeIf(courseScheduleCoursewareDetail -> !filterAndUpdateKnowledgePointList(courseScheduleCoursewareDetail, search));
-			}
+			courseScheduleCoursewareDetails.removeIf(courseScheduleCoursewareDetail -> !filterAndUpdateKnowledgePointList(courseScheduleCoursewareDetail));
 			String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
 			List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList =
 					JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
@@ -115,28 +112,28 @@ public class LessonCoursewareController extends BaseController {
 		return succeed(new ArrayList<>());
 	}
 
-	private boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail, String search) {
+	private boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail) {
 		List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> knowledgePointList = courseScheduleCoursewareDetail.getKnowledgePointList();
 		if (CollectionUtils.isEmpty(knowledgePointList)) {
 			return false; // 如果 knowledgePointList 为空，直接返回 false，后续会删除该 courseScheduleCoursewareDetail
 		}
 
 		// 过滤 KnowledgePointSmall
-		knowledgePointList.removeIf(knowledgePointSmall -> !filterKnowledgePoint(knowledgePointSmall, search));
+		knowledgePointList.removeIf(knowledgePointSmall -> !filterKnowledgePoint(knowledgePointSmall));
 		courseScheduleCoursewareDetail.setKnowledgePointList(knowledgePointList);
 
 		// 如果过滤后的 knowledgePointList 为空，返回 false
 		return CollectionUtils.isNotEmpty(knowledgePointList);
 	}
 
-	private boolean filterKnowledgePoint(CbsLessonCoursewareDetailWrapper.KnowledgePointSmall knowledgePointSmall, String search) {
+	private boolean filterKnowledgePoint(CbsLessonCoursewareDetailWrapper.KnowledgePointSmall knowledgePointSmall) {
 		// 过滤 materialList
-		if (CollectionUtils.isNotEmpty(knowledgePointSmall.getMaterialList())) {
-			filterAndUpdateMaterialList(knowledgePointSmall.getMaterialList(), search);
-		}
+//		if (CollectionUtils.isNotEmpty(knowledgePointSmall.getMaterialList())) {
+//			filterAndUpdateMaterialList(knowledgePointSmall.getMaterialList(), search);
+//		}
 		// 过滤子知识点 children
 		if (CollectionUtils.isNotEmpty(knowledgePointSmall.getChildren())) {
-			knowledgePointSmall.getChildren().removeIf(child -> !filterKnowledgePoint(child, search));
+			knowledgePointSmall.getChildren().removeIf(child -> !filterKnowledgePoint(child));
 		}
 		// 保留当前的条件：materialList 不为空 或者 children 不为空，**否则删除当前节点**
 		return CollectionUtils.isNotEmpty(knowledgePointSmall.getMaterialList()) ||