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

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

@@ -184,10 +184,12 @@ public class MusicSheetCbsController extends BaseController {
         cbsMusicSheet.setBizId(id);
 
         // 设置查询机构 还是平台数据
-        if (StringUtils.isNotBlank(providerType) && SourceTypeEnum.PLATFORM.name().equals(providerType)) {
-            tenantAlbumId = null;
-        } else {
-            tenantAlbumId = StringUtils.isBlank(tenantAlbumId) ? null : "1";
+        if (StringUtils.isBlank(tenantAlbumId) && StringUtils.isNotBlank(providerType)) {
+            if (SourceTypeEnum.PLATFORM.name().equals(providerType)) {
+                tenantAlbumId = null;
+            } else {
+                tenantAlbumId = "1";
+            }
         }
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);

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

@@ -2674,7 +2674,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
 
     /**
-     * @param musicSheetId 业务端曲目ID
+     *
      * @return CbsMusicSheetWrapper.MusicSheet
      */
     @Override
@@ -2769,6 +2769,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         cbsMusicSheet.setBizId(query.getMusicSheetId());
 
         MusicSheetWrapper.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetWrapper.MusicSheetDetail.class);
+        musicSheetDetail.setId(query.getMusicSheetId().toString());
 
         MusicSheetDetailVo detail = musicSheetService.detail(query.getMusicSheetId().toString(), sysUser,query.getClient(), query.getTenantAlbumId());
         if (detail != null) {
@@ -2804,9 +2805,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         } else if (CollectionUtils.isNotEmpty(cbsMusicSheet.getMusicSheetSoundList())) {
             musicSheetDetail.setMusicSheetSoundList(new ArrayList<>());
             // 按乐器取原音 有乐器按乐器来，没乐器用声部，都不匹配取第一个
-            List<CbsMusicSheetWrapper.MusicSheetSound> sheetSoundList = cbsMusicSheet.getMusicSheetSoundList().stream().filter(o -> o.getAudioPlayType() == EAudioPlayType.PLAY).collect(Collectors.toList());
+            List<CbsMusicSheetWrapper.MusicSheetSound> sheetSoundList = cbsMusicSheet.getMusicSheetSoundList().stream()
+                    .filter(o -> o.getAudioPlayType() == EAudioPlayType.PLAY)
+                    .collect(Collectors.toList());
             if (query.getInstrumentId() !=null) {
                 Optional<CbsMusicSheetWrapper.MusicSheetSound> first =sheetSoundList.stream()
+                        .filter(o->StringUtils.isNotBlank(o.getMusicalInstrumentId()))
                         .filter(o -> o.getMusicalInstrumentId().equals(query.getInstrumentId().toString())).findFirst();
                 if (first.isPresent()) {
                     musicSheetDetail.setMp3Url(first.get().getAudioFileUrl());
@@ -2816,23 +2820,21 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 Subject subject = subjectService.get(query.getSubjectId());
                 if (subject != null && subject.getInstrumentId() !=null) {
                     Optional<CbsMusicSheetWrapper.MusicSheetSound> first = sheetSoundList.stream()
+                            .filter(o->StringUtils.isNotBlank(o.getMusicalInstrumentId()))
                             .filter(o -> o.getMusicalInstrumentId().equals(subject.getInstrumentId().toString())).findFirst();
                     if (first.isPresent()) {
                         musicSheetDetail.setMp3Url(first.get().getAudioFileUrl());
                         musicSheetDetail.setMusicSheetSoundList(Collections.singletonList(first.get()));
                     }
                 }
-
             }
-            if (CollectionUtils.isEmpty(musicSheetDetail.getMusicSheetSoundList())) {
+            if (CollectionUtils.isEmpty(musicSheetDetail.getMusicSheetSoundList()) && CollectionUtils.isNotEmpty(sheetSoundList)) {
                 Optional<CbsMusicSheetWrapper.MusicSheetSound> first = sheetSoundList.stream().findFirst();
                 if (first.isPresent()) {
                     musicSheetDetail.setMp3Url(first.get().getAudioFileUrl());
                     musicSheetDetail.setMusicSheetSoundList(Collections.singletonList(first.get()));
                 }
             }
-
-
         }
         return musicSheetDetail;
     }

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

@@ -1143,8 +1143,6 @@ public class MusicSheetWrapper {
 
         @ApiModelProperty("主键")
         private String id;
-        @ApiModelProperty("业务平台曲目ID")
-        private Long bizId;
         @ApiModelProperty("曲目封面图")
         private String musicCover;
         @ApiModelProperty("曲目名称")