|
@@ -243,7 +243,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
|
|
|
log.info("joinRoomSuccess : roomId={}, userId={}", roomId, userId);
|
|
|
RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
|
|
|
- CourseSchedule schedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
|
|
|
+ CourseSchedule schedule = courseScheduleDao.getLock(Long.parseLong(roomId.substring(1)));
|
|
|
|
|
|
String display = "";
|
|
|
if(roleEnum == RoleTeacher){
|
|
@@ -254,7 +254,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
display = "display://type=0?userId=" + userId + "?uri=";
|
|
|
}
|
|
|
Date curTime = DateTimeUtils.currentUTC();
|
|
|
- Room room = roomDao.findByLockRid(roomId);
|
|
|
+ Room room = roomDao.findByRid(roomId);
|
|
|
if (room == null) {
|
|
|
//如果房间不存在,删除除了自己之外的其他用户
|
|
|
// roomMemberDao.deleteRoomMember(roomId,userId);
|