Merge remote-tracking branch 'origin/master'

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

@@ -798,7 +798,7 @@ public class RoomServiceImpl implements RoomService {
                     msg = JSON.parseObject(examJson, ExamSongDownloadData.class);
                     msg.setEnable(enable);
                 }
-                courseScheduleStudentPaymentDao.adjustExamSong(scheduleId,authUser.getId(),JSON.toJSONString(msg));
+                courseScheduleStudentPaymentDao.adjustExamSong(scheduleId,Integer.parseInt(userId),JSON.toJSONString(msg));
             }else {
                 roomMemberDao.updateMusicByRidAndUid(roomId, userId, false);
             }
@@ -843,9 +843,15 @@ public class RoomServiceImpl implements RoomService {
                 controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.MusicMode, data.getMusicModeOn());
             }
         } else if (data.getExamSongOn() != null) {
-            List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(Long.parseLong(data.getRoomId().substring(1)));
-            for (BasicUserDto e:students) {
-                controlDevice(data.getRoomId(), e.getUserId().toString(), DeviceTypeEnum.ExamSong, data.getExamSongOn());
+            if(StringUtils.isNotEmpty(data.getUserId())){
+                for (RoomMember e:roomMembers) {
+                    controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.ExamSong, data.getExamSongOn());
+                }
+            }else {
+                List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(Long.parseLong(data.getRoomId().substring(1)));
+                for (BasicUserDto e:students) {
+                    controlDevice(data.getRoomId(), e.getUserId().toString(), DeviceTypeEnum.ExamSong, data.getExamSongOn());
+                }
             }
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);