|
@@ -411,7 +411,7 @@ public class RoomServiceImpl implements RoomService {
|
|
try {
|
|
try {
|
|
apiResultInfo = imHelper.dismiss(userId, roomId);
|
|
apiResultInfo = imHelper.dismiss(userId, roomId);
|
|
if (apiResultInfo.getCode() == 200) {
|
|
if (apiResultInfo.getCode() == 200) {
|
|
-// roomMemberDao.deleteUserByRidAndUid(roomId, userId);
|
|
|
|
|
|
+ roomMemberDao.deleteUserByRidAndUid(roomId, userId);
|
|
roomDao.deleteByRid(roomId);
|
|
roomDao.deleteByRid(roomId);
|
|
deleteWhiteboardByUser(roomId, userId);
|
|
deleteWhiteboardByUser(roomId, userId);
|
|
log.info("dismiss the room: {},userId: {}", roomId,userId);
|
|
log.info("dismiss the room: {},userId: {}", roomId,userId);
|
|
@@ -428,7 +428,7 @@ public class RoomServiceImpl implements RoomService {
|
|
try {
|
|
try {
|
|
apiResultInfo = imHelper.quit(new String[]{userId}, roomId);
|
|
apiResultInfo = imHelper.quit(new String[]{userId}, roomId);
|
|
if (apiResultInfo.isSuccess()) {
|
|
if (apiResultInfo.isSuccess()) {
|
|
-// roomMemberDao.deleteUserByRidAndUid(roomId, userId);
|
|
|
|
|
|
+ roomMemberDao.deleteUserByRidAndUid(roomId, userId);
|
|
MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, userRole);
|
|
MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, userRole);
|
|
msg.setUserName(user.getUsername());
|
|
msg.setUserName(user.getUsername());
|
|
imHelper.publishMessage(userId, roomId, msg);
|
|
imHelper.publishMessage(userId, roomId, msg);
|
|
@@ -1381,7 +1381,6 @@ public class RoomServiceImpl implements RoomService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
|
public void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData) throws Exception {
|
|
public void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData) throws Exception {
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
if(sysUser == null){
|
|
if(sysUser == null){
|
|
@@ -1395,13 +1394,6 @@ public class RoomServiceImpl implements RoomService {
|
|
groupMessage.setSenderId(sysUser.getId().toString());
|
|
groupMessage.setSenderId(sysUser.getId().toString());
|
|
groupMessage.setObjectName("DY:PlayMidiMessage");
|
|
groupMessage.setObjectName("DY:PlayMidiMessage");
|
|
messageService.groupSend(groupMessage);
|
|
messageService.groupSend(groupMessage);
|
|
- //记录节拍器消息
|
|
|
|
- String userId = playMidiMessageData.getUserId();
|
|
|
|
- if(StringUtils.isEmpty(userId)){
|
|
|
|
- roomMemberDao.updatePlayMidiJsonByRidAndRole(playMidiMessageData.getRoomId(),RoleEnum.RoleStudent.getValue(),playMidiMessageData.getContent());
|
|
|
|
- }else {
|
|
|
|
- roomMemberDao.updatePlayMidiJsonByRidAndUid(playMidiMessageData.getRoomId(),userId,playMidiMessageData.getContent());
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/*@Override
|
|
/*@Override
|