|
@@ -118,7 +118,7 @@ public class RoomServiceImpl implements RoomService {
|
|
return Integer.parseInt(roomId);
|
|
return Integer.parseInt(roomId);
|
|
}
|
|
}
|
|
|
|
|
|
- @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
@Override
|
|
@Override
|
|
public RoomResult joinRoom(String roomId) throws Exception {
|
|
public RoomResult joinRoom(String roomId) throws Exception {
|
|
CheckUtils.checkArgument(roomId != null, "roomId must't be null");
|
|
CheckUtils.checkArgument(roomId != null, "roomId must't be null");
|
|
@@ -1255,22 +1255,7 @@ public class RoomServiceImpl implements RoomService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void statusSync(ChannelStateNotify notify) throws Exception {
|
|
|
|
- String roomId = notify.getChannelId();
|
|
|
|
- String userId = notify.getUserId();
|
|
|
|
- switch (notify.getEvent()){
|
|
|
|
- case 11:
|
|
|
|
- //成员加入
|
|
|
|
- joinRoomSuccess(roomId, userId);
|
|
|
|
- break;
|
|
|
|
- case 12:
|
|
|
|
- //成员退出
|
|
|
|
- leaveRoomSuccess(roomId, userId);
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @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){
|
|
@@ -1291,6 +1276,7 @@ public class RoomServiceImpl implements RoomService {
|
|
return courseScheduleStudentPaymentDao.queryNoJoinStu(roomId,roomId.substring(1));
|
|
return courseScheduleStudentPaymentDao.queryNoJoinStu(roomId,roomId.substring(1));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
private void updateDisplay(String roomId, String senderId, String display, Integer isIncludeSender) throws Exception {
|
|
private void updateDisplay(String roomId, String senderId, String display, Integer isIncludeSender) throws Exception {
|
|
roomDao.updateDisplayByRid(roomId, display);
|
|
roomDao.updateDisplayByRid(roomId, display);
|
|
DisplayMessage displayMessage = new DisplayMessage(display);
|
|
DisplayMessage displayMessage = new DisplayMessage(display);
|