Merge branch 'feature/0414-trtc' into master_saas

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

@@ -721,6 +721,9 @@ public class RoomServiceImpl implements RoomService {
             courseScheduleStudentPaymentDao.adjustPlayMidi(firstCourseId, null, null);
             courseScheduleStudentPaymentDao.adjustExamSong(firstCourseId.longValue(), null, null);
             teacherAttendanceService.addTeacherAttendanceSignOut(firstCourseId.longValue(), parseInt, deviceNum);
+
+            //关闭所有曲目播放
+            courseScheduleStudentMusicScoreDao.closePlayStatus(firstCourseId, null, null);
         } else {
             username = sysUser.getUsername();
             studentAttendanceService.addStudentAttendanceSignOut(firstCourseId.longValue(), parseInt);
@@ -735,10 +738,16 @@ public class RoomServiceImpl implements RoomService {
             updateDisplay(roomId, userId, "", 0);
         }
         if (roomMemberDao.countByRid(roomId) <= 1) {
+
+            // 删除群组用户信息
             roomMemberDao.deleteUserByRidAndUid(roomId, userId);
+            // 删除群组信息
             roomDao.deleteByRid(roomId);
+            // 删除白板信息
             deleteWhiteboardByUser(roomId, userId);
+            // 删除群组
             this.dismissImGroup(userId, roomId, courseSchedule.getServiceProvider());
+            //关闭所有曲目播放
             courseScheduleStudentMusicScoreDao.closePlayStatus(courseSchedule.getId(), null, null);
             log.info("leaveRoomSuccess dismiss the room: {},userId: {}", roomId, userId);
         } else {