Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -314,6 +314,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 		applicationQuery.setMusicalInstrumentIds(list.stream().map(e->e.getId().longValue()).collect(Collectors.toList()));
 		applicationQuery.setPage(queryInfo.getPage());
 		applicationQuery.setRows(queryInfo.getRows());
+		applicationQuery.setKeyword(queryInfo.getSearch());
 		PageInfo<CbsMusicSheetWrapper.MusicSheetAccApplication> musicSheetAccApplicationPageInfo = sysMusicScoreService.queryCbsMusicSheetSoundApplication(applicationQuery);
 		List<SysMusicScoreAccompaniment> accompaniments = this.initAccompaniments(musicSheetAccApplicationPageInfo.getRows());
 		return PageUtil.transPageInfo(musicSheetAccApplicationPageInfo,accompaniments);

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -599,7 +599,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         //已下载的伴奏列表
-        this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
+        scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
         if (CollectionUtils.isNotEmpty(scheduleStudentMusicScores)) {
             List<CourseScheduleStudentMusicScore> musicScores = scheduleStudentMusicScores.stream()
                     .filter(e -> e.getUserId().equals(sysUser.getId())).collect(Collectors.toList());
@@ -642,7 +642,7 @@ public class RoomServiceImpl implements RoomService {
             Set<String> userIds = roomMemberList.stream().map(RoomMember::getUid).collect(Collectors.toSet());
             Map<Integer, String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds, courseId.toString()));
             Map<Integer, String> examSongMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryExamSongByUserIdsAndCourseId(userIds, courseId.toString()));
-            this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
+            scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
         }
         roomResult.setWhiteboards(whiteboardDao.findByRid(roomId));
@@ -665,11 +665,13 @@ public class RoomServiceImpl implements RoomService {
         businessLogger.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
     }
 
-    private void initCourseScheduleStudentMusicScore(List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores) {
+    private List<CourseScheduleStudentMusicScore> initCourseScheduleStudentMusicScore(List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores) {
+        List<CourseScheduleStudentMusicScore> result = new ArrayList<>();
         if(CollectionUtils.isEmpty(scheduleStudentMusicScores)){
-            return;
+            return result;
         }
-        List<Long> musicSheetSoundIds = scheduleStudentMusicScores.stream().map(e->Long.parseLong(e.getMusicScoreAccompanimentId())).distinct().collect(Collectors.toList());
+        List<Long> musicSheetSoundIds = scheduleStudentMusicScores.stream().map(e->Long.parseLong(e.getMusicScoreAccompanimentId()))
+                .distinct().collect(Collectors.toList());
         List<CbsMusicSheetWrapper.MusicSheetAccApplication> sheetApplications = this.getSheetApplications(musicSheetSoundIds);
         Map<Long, CbsMusicSheetWrapper.MusicSheetAccApplication> sheetApplicationMap = sheetApplications.stream()
                 .collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetAccApplication::getMusicSheetSoundId, Function.identity()));
@@ -680,10 +682,12 @@ public class RoomServiceImpl implements RoomService {
                 continue;
             }
             studentMusicScore.setMusicScoreName(sheetApplication.getName());
-            studentMusicScore.setMp3Url(sheetApplication.getMp3Url());
-            studentMusicScore.setUrl(sheetApplication.getUrl());
-            courseScheduleStudentMusicScoreDao.update(studentMusicScore);
+            //管乐迷的历史问题，原音和伴奏反过来
+            studentMusicScore.setMp3Url(sheetApplication.getUrl());
+            studentMusicScore.setUrl(sheetApplication.getMp3Url());
+            result.add(studentMusicScore);
         }
+        return result;
     }
 
     private void joinImGroup(String roomId, Integer actualTeacherId, CourseSchedule courseSchedule) throws Exception {
@@ -2237,7 +2241,7 @@ public class RoomServiceImpl implements RoomService {
             Set<String> userIds = roomMemberList.stream().map(RoomMember::getUid).collect(Collectors.toSet());
             Map<Integer, String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds, roomId.substring(1)));
             Map<Integer, String> examSongMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryExamSongByUserIdsAndCourseId(userIds, roomId.substring(1)));
-            this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
+            scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
 
             // 全员静音开启状态