网络教室

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

@@ -474,7 +474,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         imHelper.publishMessage(sysUser.getId().toString(),teacherId.toString(), deviceControl.getRoomId(), msg);
 
         //发送设备状态变更消息
-        this.sendDeviceStateChangedMessage(deviceControl, sysUser.getId(),100);
+        this.sendDeviceStateChangedMessage(deviceControl, sysUser.getId());
     }
 
     @Override
@@ -513,8 +513,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             imNetworkRoomMemberService.getDao().updateById(roomMember);
         }
         //发送设备状态同步消息
-        ImNetworkRoom room = baseMapper.findByRoomId(deviceStatusSync.getRoomId());
-        this.sendDeviceStateChangedMessage(deviceStatusSync,userId,room.getSoundVolume());
+        this.sendDeviceStateChangedMessage(deviceStatusSync,userId);
     }
 
     @Override
@@ -523,10 +522,11 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     }
 
     //发送设备状态同步消息
-    private void sendDeviceStateChangedMessage(ImNetworkDeviceControlDto deviceStatusSync,Long userId,Integer soundVolume) throws Exception {
+    private void sendDeviceStateChangedMessage(ImNetworkDeviceControlDto deviceStatusSync,Long userId) throws Exception {
+        ImNetworkRoom room = baseMapper.findByRoomId(deviceStatusSync.getRoomId());
         ImNetworkDeviceStateChangedMessage deviceResourceMessage = new ImNetworkDeviceStateChangedMessage(deviceStatusSync.getDeviceType().ordinal(),deviceStatusSync.getEnable());
         deviceResourceMessage.setUserId(userId.toString());
-        deviceResourceMessage.setSoundVolume(soundVolume);
+        deviceResourceMessage.setSoundVolume(room.getSoundVolume());
         imHelper.publishMessage(userId.toString(), deviceStatusSync.getRoomId(), deviceResourceMessage, 1);
     }