课件新增搜索功能

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumSheetController.java

@@ -78,10 +78,8 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            if(StringUtils.isNotEmpty(search)){
-                //剔除空数据
-                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
-            }
+            //剔除空数据
+            courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject.parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);
             return succeed(courseScheduleCoursewareDetailList);

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TenantAlbumSheetController.java

@@ -127,10 +127,7 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            if(StringUtils.isNotEmpty(search)){
-                //剔除空数据
-                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
-            }
+            courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -116,10 +116,7 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            if(StringUtils.isNotEmpty(search)){
-                //剔除空数据
-                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
-            }
+            courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumSheetController.java

@@ -105,10 +105,7 @@ public class TenantAlbumSheetController extends BaseController {
         if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
             //过滤酷乐秀相关的权限
             courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterLessonCourseDetail);
-            if(StringUtils.isNotEmpty(search)){
-                //剔除空数据
-                courseScheduleCoursewareDetails.forEach(e->tenantAlbumMusicService.filterAndUpdateKnowledgePointList(e, search));
-            }
+            courseScheduleCoursewareDetails.forEach(tenantAlbumMusicService::filterAndUpdateKnowledgePointList);
             String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
             List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetailList = JSONObject
                 .parseArray(jsonString, LessonCoursewareWrapper.CourseScheduleCoursewareDetail.class);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantAlbumMusicService.java

@@ -76,7 +76,7 @@ public interface TenantAlbumMusicService extends IService<TenantAlbumMusic>  {
 
     LessonCoursewareDetailWrapper.LessonCoursewareDetail filterLessonCourseDetail(LessonCoursewareDetailWrapper.LessonCoursewareDetail lessonCoursewareDetail);
 
-    boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail, String search);
+    boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail);
 
     /**
      * 关联课程类型

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -621,28 +621,28 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
     }
 
     @Override
-    public boolean filterAndUpdateKnowledgePointList(CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail courseScheduleCoursewareDetail, String search) {
+    public 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()) ||