网络教室伴奏

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

@@ -943,6 +943,14 @@ public class RoomServiceImpl implements RoomService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean batchControlDevice(ReqDeviceControlData data) throws Exception {
+        if(data.getExamSongOn() != null || data.getMusicScoreOn() != null || data.getAccompanimentOn() != null){
+            List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(Long.parseLong(data.getRoomId().substring(1)));
+            for (BasicUserDto e:students) {
+                data.setUserId(e.getUserId().toString());
+                controlDevice(data);
+            }
+            return true;
+        }
         List<RoomMember> roomMembers;
         if(StringUtils.isNotEmpty(data.getUserId())){
             roomMembers = new ArrayList<>();
@@ -956,17 +964,9 @@ public class RoomServiceImpl implements RoomService {
         if(roomMembers.size() == 0){
             return false;
         }
-        if (data.getExamSongOn() != null || data.getMusicScoreOn() != null || data.getAccompanimentOn() != null) {
-            List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(Long.parseLong(data.getRoomId().substring(1)));
-            for (BasicUserDto e:students) {
-                data.setUserId(e.getUserId().toString());
-                controlDevice(data);
-            }
-        } else {
-            for (RoomMember e:roomMembers) {
-                data.setUserId(e.getUid());
-                controlDevice(data);
-            }
+        for (RoomMember e:roomMembers) {
+            data.setUserId(e.getUid());
+            controlDevice(data);
         }
         return true;
     }
@@ -1074,9 +1074,11 @@ public class RoomServiceImpl implements RoomService {
         }else {
             roomMemberDao.updateMusicByRidAndUid(roomId, userId, enable);
         }
+        Room room = roomDao.findByRid(roomId);
+        deviceResourceMessage.setSoundVolume(room.getSoundVolume());
         deviceResourceMessage.setUserId(userId);
         imHelper.publishMessage(userId, roomId, deviceResourceMessage, 1);
-        log.info("syncDeviceState : {}, {}, result = {}", roomId, enable);
+        log.info("syncDeviceState : {}, {}", roomId, enable);
         return true;
     }