学生专辑查询

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -24,6 +24,15 @@ import java.util.stream.Collectors;
 @ApiModel(value = "MusicSheetSearch对象", description = "曲目表查询对象")
 public class MusicSheetSearch  extends QueryInfo{
 
+
+
+    @ApiModelProperty(value = "客户端状态曲目状态(0:停用，1：启用)")
+    private Boolean clientState;
+
+    @ApiModelProperty(value = "内容平台状态曲目状态(0:停用，1：启用)")
+    private Boolean  platformState;
+
+
     @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi,")
     private AudioTypeEnum audioType;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -138,6 +138,16 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty(value = "曲目状态(0:停用，1：启用)")
 	private YesOrNoEnum state;
 
+
+    @TableField("client_state_")
+    @ApiModelProperty(value = "客户端状态曲目状态(0:停用，1：启用)")
+    private Boolean clientState;
+
+
+    @TableField("platform_state_")
+    @ApiModelProperty(value = "内容平台状态曲目状态(0:停用，1：启用)")
+    private Boolean  platformState;
+
 	@TableField("reason_")
 	@ApiModelProperty(value = "曲目停用原因")
 	private String reason;

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,21 +7,22 @@ import com.dayaedu.cbs.common.enums.school.ECourseType;
 import com.dayaedu.cbs.common.enums.school.EKnowledgeType;
 import com.dayaedu.cbs.common.enums.school.EMaterialType;
 import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
+import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsCourseTypeWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareDetailWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareWrapper;
-import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsMaterialRefWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.MusicSheetCategoriesWrapper;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMusicMapper;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
 import com.yonge.cooleshow.biz.dal.wrapper.LessonCoursewareDetailWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.LessonCoursewareWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.toolset.base.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -33,7 +33,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 机构专辑曲目
@@ -57,6 +56,12 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
     private MusicTagService musicTagService;
 
     @Autowired
+    private MusicFeignClientService musicFeignClientService;
+
+    @Autowired
+    private SysConfigService sysConfigService;
+
+    @Autowired
     private TenantAlbumMusicMapper tenantAlbumMusicMapper;
 
     @Autowired
@@ -99,6 +104,20 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
                                                                              TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
         List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = new ArrayList<>();
         if (query.getSubjectType() != SubjectTypeEnum.COURSEWARE) {
+            // 如果分类不为空，查询分类下的曲目
+            List<Long> categoryIds = new ArrayList<>();
+            if (query.getCategoryId() !=null) {
+            } else {
+                Long categoryId = getCategoryId(query.getSubjectType().name());
+                query.setCategoryId(categoryId);
+            }
+            MusicSheetCategoriesWrapper.MusicSheetCategories musicSheetCategories = musicFeignClientService.getChildTreeById(query.getCategoryId()).feignData();
+
+            categoryIds.add(query.getCategoryId());
+            if (musicSheetCategories !=null) {
+                formatCategory(categoryIds, musicSheetCategories.getMusicSheetCategoriesList());
+            }
+            query.setCategoryIds(categoryIds);
 
             musicSheets = tenantAlbumMusicMapper.selectPage(page, query);
             if (CollectionUtils.isEmpty(musicSheets)) {
@@ -207,6 +226,16 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         return page.setRecords(musicSheets);
     }
 
+    private void formatCategory(List<Long> categoryIds, List<MusicSheetCategoriesWrapper.MusicSheetCategories> musicSheetCategoriesList) {
+        if (CollectionUtils.isEmpty(musicSheetCategoriesList)) {
+            return;
+        }
+        for (MusicSheetCategoriesWrapper.MusicSheetCategories musicSheetCategories : musicSheetCategoriesList) {
+            categoryIds.add(musicSheetCategories.getId());
+            formatCategory(categoryIds,musicSheetCategories.getMusicSheetCategoriesList());
+        }
+    }
+
     /**
      * 添加
      * @param tenantAlbumMusic TenantAlbumMusicWrapper.TenantAlbumMusic
@@ -277,32 +306,46 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             return data;
         }
 
+        // 获取曲目所有分类
+        List<Long> categoryIds = musicSheets.stream().map(MusicSheet::getTenantCategoryId)
+            .filter(StringUtils::isNotBlank).map(Long::parseLong).distinct().collect(Collectors.toList());
+
+
+        // 查询分类
+        MusicSheetCategoriesWrapper.MusicSheetCategories musicSheetCategories = musicFeignClientService.getChildTreeById(getCategoryId(query.getSubjectType().name())).feignData();
+
+        // 过滤掉不存在的分类
+        List<Long> ids = new ArrayList<>();
+        getCategory(musicSheetCategories.getMusicSheetCategoriesList(),categoryIds,ids);
+        filterCategory(musicSheetCategories.getMusicSheetCategoriesList(),ids);
+        data.setCategoyList(musicSheetCategories.getMusicSheetCategoriesList());
+
         // 类型
-        List<Long> typeIds =list.stream().map(TenantAlbumMusic::getType).distinct().filter(StringUtils::isNotBlank)
-                .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
-        if (!typeIds.isEmpty()) {
-            List<TenantAlbumCategoryDetail> typeList = tenantAlbumCategoryDetailService.lambdaQuery()
-                    .in(TenantAlbumCategoryDetail::getId, typeIds).list();
-            List<String> typeNameList = typeList.stream()
-                    .map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
-            data.setTypes(typeNameList);
-            data.setTypeList(typeList);
-        } else {
-            data.setTypes(new ArrayList<>());
-        }
-        // 级别
-        List<Long> levelIds =list.stream().map(TenantAlbumMusic::getLevel).distinct().filter(StringUtils::isNotBlank)
-                .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
-        if (!levelIds.isEmpty()) {
-            List<TenantAlbumCategoryDetail> levelList = tenantAlbumCategoryDetailService.lambdaQuery()
-                    .in(TenantAlbumCategoryDetail::getId, levelIds).list();
-            List<String> levelNameList = levelList.stream()
-                    .map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
-            data.setLevels(levelNameList);
-            data.setLevelList(levelList);
-        } else {
-            data.setLevels(new ArrayList<>());
-        }
+//        List<Long> typeIds =list.stream().map(TenantAlbumMusic::getType).distinct().filter(StringUtils::isNotBlank)
+//                .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
+//        if (!typeIds.isEmpty()) {
+//            List<TenantAlbumCategoryDetail> typeList = tenantAlbumCategoryDetailService.lambdaQuery()
+//                    .in(TenantAlbumCategoryDetail::getId, typeIds).list();
+//            List<String> typeNameList = typeList.stream()
+//                    .map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
+//            data.setTypes(typeNameList);
+//            data.setTypeList(typeList);
+//        } else {
+//            data.setTypes(new ArrayList<>());
+//        }
+//        // 级别
+//        List<Long> levelIds =list.stream().map(TenantAlbumMusic::getLevel).distinct().filter(StringUtils::isNotBlank)
+//                .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
+//        if (!levelIds.isEmpty()) {
+//            List<TenantAlbumCategoryDetail> levelList = tenantAlbumCategoryDetailService.lambdaQuery()
+//                    .in(TenantAlbumCategoryDetail::getId, levelIds).list();
+//            List<String> levelNameList = levelList.stream()
+//                    .map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
+//            data.setLevels(levelNameList);
+//            data.setLevelList(levelList);
+//        } else {
+//            data.setLevels(new ArrayList<>());
+//        }
 
         // 声部
         String subjectIds = musicSheets.stream()
@@ -313,23 +356,76 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             data.setSubjects(subjects);
         }
 
-        // 标签
-        List<Long> musicTagIds = musicSheets.stream().flatMap(o -> {
-            if (StringUtils.isNotBlank(o.getMusicTag())) {
-                return Arrays.stream(o.getMusicTag().split(","));
-            }
-            return Stream.empty();
+//        // 标签
+//        List<Long> musicTagIds = musicSheets.stream().flatMap(o -> {
+//            if (StringUtils.isNotBlank(o.getMusicTag())) {
+//                return Arrays.stream(o.getMusicTag().split(","));
+//            }
+//            return Stream.empty();
+//
+//        }).filter(StringUtils::isNotBlank).distinct().map(Long::parseLong).collect(Collectors.toList());
+//        if (!CollectionUtils.isEmpty(musicTagIds)) {
+//
+//            List<MusicTag> tagList = musicTagService.listByIds(musicTagIds).parallelStream().collect(Collectors.toList());
+//            data.setTags(tagList);
+//        }
+        data.setSubjects(new ArrayList<>());
 
-        }).filter(StringUtils::isNotBlank).distinct().map(Long::parseLong).collect(Collectors.toList());
-        if (!CollectionUtils.isEmpty(musicTagIds)) {
+        return data;
+
+    }
 
-            List<MusicTag> tagList = musicTagService.listByIds(musicTagIds).parallelStream().collect(Collectors.toList());
-            data.setTags(tagList);
+    private void filterCategory(List<MusicSheetCategoriesWrapper.MusicSheetCategories> musicSheetCategoriesList, List<Long> ids) {
+        if (CollectionUtils.isEmpty(musicSheetCategoriesList)) {
+            return;
         }
-        data.setSubjects(new ArrayList<>());
+        for (int i = 0; i < musicSheetCategoriesList.size(); i++) {
+            MusicSheetCategoriesWrapper.MusicSheetCategories musicSheetCategories = musicSheetCategoriesList.get(i);
+            if (!ids.contains(musicSheetCategories.getId())) {
+                musicSheetCategoriesList.remove(i);
+                i--;
+                continue;
+            }
+            if (CollectionUtils.isNotEmpty(musicSheetCategories.getMusicSheetCategoriesList())) {
+                filterCategory(musicSheetCategories.getMusicSheetCategoriesList(), ids);
+            }
+        }
+    }
 
-        return data;
+    private boolean getCategory(List<MusicSheetCategoriesWrapper.MusicSheetCategories> musicSheetCategoriesList,
+                                List<Long> categoryIds, List<Long> result) {
+        boolean flag = false;
+        if (CollectionUtils.isEmpty(musicSheetCategoriesList)) {
+            return flag;
+        }
+        for (MusicSheetCategoriesWrapper.MusicSheetCategories musicSheetCategories : musicSheetCategoriesList) {
+            if (categoryIds.contains(musicSheetCategories.getId())) {
+                result.add(musicSheetCategories.getId());
+                flag = true;
+            }
+            if (CollectionUtils.isNotEmpty(musicSheetCategories.getMusicSheetCategoriesList())) {
+                boolean b = getCategory(musicSheetCategories.getMusicSheetCategoriesList(), categoryIds, result);
+                if (b) {
+                    result.add(musicSheetCategories.getId());
+                }
+                flag = flag || b;
+            }
+        }
+        return flag;
+    }
 
+    private Long getCategoryId(String subjectType) {
+        if (StringUtils.isBlank(subjectType)) {
+            return null;
+        }
+        if (SubjectTypeEnum.SUBJECT.name().equals(subjectType)) {
+            return Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_SUBJECT_TYPE_CATEGORY));
+        } else if (SubjectTypeEnum.ENSEMBLE.name().equals(subjectType)) {
+            return Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_ENSEMBLE_TYPE_CATEGORY));
+        } if (SubjectTypeEnum.MUSIC.name().equals(subjectType)) {
+            return Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_MUSIC_TYPE_CATEGORY));
+        }
+        return null;
     }
 
     private List<ECourseType> courseTypeBySubject(Long subjectId) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetVoResult.java

@@ -246,6 +246,14 @@ public class MusicSheetVoResult implements Serializable {
     @ApiModelProperty("谱面类型")
     private EDefaultScoreType scoreType;
 
+
+    @ApiModelProperty(value = "客户端状态曲目状态(0:停用，1：启用)")
+    private Boolean clientState;
+
+    @ApiModelProperty(value = "内容平台状态曲目状态(0:停用，1：启用)")
+    private Boolean  platformState;
+
+
     public ChargeTypeEnum getChargeType() {
         if (Objects.isNull(this.chargeType) && StringUtils.isNotEmpty(getPaymentType())) {
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.wrapper;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dayaedu.cbs.common.enums.school.ECourseType;
+import com.dayaedu.cbs.openfeign.wrapper.music.MusicSheetCategoriesWrapper;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
@@ -125,6 +126,9 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("课件教材分类集合")
         private List<String> courseTypeList = new ArrayList<>();
 
+        @ApiModelProperty("分类集合")
+        private List<MusicSheetCategoriesWrapper.MusicSheetCategories> categoyList = new ArrayList<>();
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -132,6 +136,7 @@ public class TenantAlbumMusicWrapper {
         public static TenantAlbumMusic from(String json) {
             return JSON.parseObject(json, TenantAlbumMusic.class);
         }
+
     }
 
 
@@ -161,6 +166,11 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("声部id")
         private Long subjectId;
 
+        @ApiModelProperty("分类id")
+        private Long categoryId;
+
+        private List<Long> categoryIds;
+
         @ApiModelProperty("级别")
         private String level;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -67,6 +67,8 @@
         t.payment_type_ as paymentType,
         t.provider_type_ as providerType,
         t.state_ as state,
+        t.client_state_ as clientState,
+        t.platform_state_ as platformState,
         t.sort_number_ as sortNumber,
         t.top_flag_ as topFlag,
         t.exquisite_flag_ as exquisiteFlag,
@@ -155,6 +157,12 @@
         </if>
         <where>
             1=1
+            <if test="param.clientState != null">
+                and t.client_state_ = #{param.clientState}
+            </if>
+            <if test="param.platformState != null">
+                and t.platform_state_ = #{param.platformState}
+            </if>
             <if test="param.excludeMusicIds != null and param.excludeMusicIds.size() != 0">
                 and t.id_ not in
                 <foreach collection="param.excludeMusicIds" separator="," item="item" open="(" close=")">
@@ -991,7 +999,8 @@
                 tenant_state_ = #{status},
             </if>
             <if test="tenantFlag == 0">
-                state_ = #{status}
+                state_ = #{status},
+                client_state_ = #{status}
             </if>
         </set>
         where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
@@ -1012,7 +1021,7 @@
         update music_sheet
         set music_sheet_name_ = #{param.name},music_subject_ = #{param.subjectIds},music_svg_ = #{param.musicSvg},
             composer_ = #{param.composer},title_img_ = #{param.musicCover},music_img_ = #{param.musicCover},accompaniment_type_ = #{param.audioType},
-            play_speed_ = #{param.playSpeed},is_all_subject_ = #{param.isAllSubject},
+            play_speed_ = #{param.playSpeed},is_all_subject_ = #{param.isAllSubject},platform_state_ = #{param.platformStatus},
             music_sheet_type_ = #{param.musicSheetType},source_type_ = CASE WHEN #{param.sourceType} = 'PLATFORM' THEN 'PLATFORM' ELSE 'TEACHER' END,
             create_by_ = #{param.userId},tenant_category_id_ = #{param.musicCategoryId}
         where cbs_music_sheet_id_ = #{param.id}
@@ -1181,12 +1190,14 @@
         ms.audit_status_ = 'PASS',
         ms.score_type_ = #{item.scoreType},
         ms.state_ = #{item.status},
+        ms.client_state_ = #{item.status},
         ms.notation_ = #{item.isConvertibleScore},
         ms.provider_type_ = CASE WHEN ms.provider_type_ is null or ms.provider_type_ = '' THEN 'PLATFORM'
                             when find_in_set(#{item.availableType},ms.provider_type_) then ms.provider_type_
                             else concat(ms.provider_type_,',',#{item.availableType}) end
         <if test="item.musicSheetUpdate != null">
             ,ms.music_sheet_name_ = #{item.musicSheetUpdate.name},
+            ,ms.platform_state_ = #{item.musicSheetUpdate.platformStatus},
             ms.music_subject_ = #{item.musicSheetUpdate.subjectIds},
             ms.music_svg_ = #{item.musicSheetUpdate.musicSvg},
             ms.composer_ = #{item.musicSheetUpdate.composer},

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -43,6 +43,12 @@
             <if test="param.albumId != null">
                 and t.tenant_album_id_ = #{param.albumId}
             </if>
+            <if test="param.categoryIds != null and param.categoryIds.size() != 0">
+                and m.tenant_category_id_ in
+                <foreach collection="param.categoryIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
 
             <if test="param.keyword != null and param.keyword != ''">
                 and m.music_sheet_name_ LIKE CONCAT('%',#{param.keyword},'%')