Merge branch 'feature/1108_audio' into develop-new

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

@@ -153,9 +153,9 @@ public class MusicSheetCbsController extends BaseController {
         query.setStatus(true);
         query.setUserId(student.getUserId());
         query.setClientType(ClientEnum.STUDENT.name());
-
-        if (query.getMusicSheetId() !=null) {
-            MusicSheet musicSheet = musicSheetService.getById(query.getExcludeMusicId());
+        MusicSheet musicSheet =null;
+        if (query.getExcludeMusicId() !=null) {
+            musicSheet = musicSheetService.getById(query.getExcludeMusicId());
             if (musicSheet == null) {
                 return failed("曲目不存在");
             }
@@ -164,8 +164,17 @@ public class MusicSheetCbsController extends BaseController {
         // 如果是机构学生
         if (student.getTenantId() !=null && student.getTenantId()>0) {
             query.setProviderType(SourceTypeEnum.TENANT);
+
+            query.setSubjectId(Long.parseLong(student.getSubjectId()));
         } else {
             query.setProviderType(SourceTypeEnum.PLATFORM);
+            if (musicSheet !=null) {
+                query.setMusicTagIds(musicSheet.getMusicTag());
+                if (StringUtils.isNotBlank(musicSheet.getMusicSubject())) {
+                    List<Long> subjectIds = Arrays.stream(musicSheet.getMusicSubject().split(",")).filter(StringUtils::isNotBlank).map(Long::parseLong).collect(Collectors.toList());
+                    query.setMustMatchSubjectIds(subjectIds);
+                }
+            }
         }
         IPage<MusicSheetWrapper.MusicSheetCloud> musicSheetCloudIPage = musicSheetService.cloudPage(query);
         return HttpResponseResult.succeed(PageUtil.pageInfo(musicSheetCloudIPage));

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

@@ -7,6 +7,7 @@ import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
@@ -148,7 +149,14 @@ public class MusicSheetCbsController extends BaseController {
         query.setUserId(teacher.getUserId());
         query.setClientType(ClientEnum.TEACHER.name());
         query.setProviderType(SourceTypeEnum.PLATFORM);
-
+        if (query.getExcludeMusicId() !=null) {
+            MusicSheet musicSheet = musicSheetService.getById(query.getExcludeMusicId());
+            if (musicSheet == null) {
+                return failed("曲目不存在");
+            }
+            query.setMusicSheetType(musicSheet.getMusicSheetType());
+            query.setMusicTagIds(musicSheet.getMusicTag());
+        }
         IPage<MusicSheetWrapper.MusicSheetCloud> musicSheetCloudIPage = musicSheetService.cloudPage(query);
         return HttpResponseResult.succeed(PageUtil.pageInfo(musicSheetCloudIPage));
     }

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

@@ -15,6 +15,7 @@ import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -1012,6 +1013,8 @@ public class MusicSheetWrapper {
         @ApiModelProperty("是否最近练习")
         private Boolean recentFlag = false;
 
+        @ApiModelProperty(value = "必须要匹配声部ID")
+        private List<Long> mustMatchSubjectIds;
 
         @ApiModelProperty("是否查看收藏")
         private Boolean favoriteFlag = false;
@@ -1032,6 +1035,19 @@ public class MusicSheetWrapper {
 
         private Long subjectId;
 
+        @ApiModelProperty("标签id（多个逗号隔开）")
+        private String musicTagIds;
+
+        @ApiModelProperty(hidden = true)
+        private List<Long> musicTagIdList;
+
+        public void setMusicTagIds(String musicTagIds) {
+            this.musicTagIds = musicTagIds;
+            if (StringUtils.isNotBlank(musicTagIds)) {
+                this.musicTagIdList = StringUtil.toLongList(musicTagIds);
+            }
+        }
+
         private MusicSheetTypeEnum musicSheetType;
 
         // 是否为机构学生用户

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

@@ -1405,6 +1405,12 @@
                 and t.audit_version_ = #{param.versionFlag}
             </if>
 
+            <if test="param.mustMatchSubjectIds != null and param.mustMatchSubjectIds.size() != 0">
+                and
+                <foreach collection="param.mustMatchSubjectIds" separator="and" item="item" open="(" close=")">
+                    find_in_set(#{item},t.music_subject_)
+                </foreach>
+            </if>
             <if test="param.recentFlag != null and param.recentFlag == 1">
                 <if test="param.userId != null">
                     and msar.user_id_ = #{param.userId}
@@ -1449,7 +1455,12 @@
             <if test="param.subjectId != null">
                 and (find_in_set(#{param.subjectId},t.music_subject_)or t.music_subject_ is null or t.music_subject_ = '' OR t.is_all_subject_)
             </if>
-
+            <if test="param.musicTagIdList != null and param.musicTagIdList.size() >0">
+                and
+                <foreach collection="param.musicTagIdList" open="(" close=")" separator="or" item="item">
+                    find_in_set(#{item},t.music_tag_)
+                </foreach>
+            </if>
         </where>
 
         GROUP BY t.id_