|
@@ -1247,7 +1247,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
.type(typeEnum.ordinal())
|
|
|
.enable(enable)
|
|
|
.targetId(userId)
|
|
|
- .targetName(authUser.getUsername())
|
|
|
+ .targetName(Optional.ofNullable(data.getUserName()).orElse(authUser.getUsername()))
|
|
|
.songId(Optional.ofNullable(data.getMusicScoreAccompanimentId()).map(String::valueOf).orElse(null))
|
|
|
.songVolume(data.getSoundVolume())
|
|
|
.sendUserInfo(RTCRoomMessage.MessageUser.builder()
|
|
@@ -1433,6 +1433,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
|
|
|
for (BasicUserDto e : students) {
|
|
|
data.setUserId(e.getUserId().toString());
|
|
|
+ data.setUserName(e.getName());
|
|
|
controlDevice(data);
|
|
|
}
|
|
|
return true;
|
|
@@ -2227,7 +2228,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
.build();
|
|
|
|
|
|
RTCRoomMessage roomMessage = RTCRoomMessage.builder()
|
|
|
- .objectName(RTCRoomMessage.PLAY_MIDI_MESSAGE)
|
|
|
+ .objectName(RTCRoomMessage.MUSIC_SCORE_MESSAGE)
|
|
|
.content(messageContent)
|
|
|
.toChatRoomId(roomId)
|
|
|
.fromUserId(String.valueOf(authUser.getId()))
|