|
@@ -127,13 +127,13 @@ public class RoomServiceImpl implements RoomService {
|
|
|
}
|
|
|
Long courseId = Long.parseLong(roomId);
|
|
|
//记录用户实际选择的房间
|
|
|
- redisTemplate.opsForValue().set(roomId,courseSchedule.getId().toString());
|
|
|
- log.info("joinRoom current: roomId={}, userId={}", roomId, userId);
|
|
|
if(courseSchedule.getGroupType() == GroupType.COMM){
|
|
|
roomId = "I" + roomId;
|
|
|
}else {
|
|
|
roomId = "S" + roomId;
|
|
|
}
|
|
|
+ redisTemplate.opsForValue().set(roomId + userId,courseSchedule.getId().toString());
|
|
|
+ log.info("joinRoom current: roomId={}, userId={}", roomId, userId);
|
|
|
Date curTime = DateTimeUtils.currentUTC();
|
|
|
|
|
|
RoleEnum roleEnum;
|
|
@@ -281,12 +281,11 @@ public class RoomServiceImpl implements RoomService {
|
|
|
String userId = roomMember.getUid();
|
|
|
log.info("signInSuccess: roomId={}, userId={}", roomId, userId);
|
|
|
Integer userIdInt = Integer.parseInt(userId);
|
|
|
- String roomString = roomId.substring(1);
|
|
|
- Long firstCourseId = Long.parseLong(roomString);
|
|
|
+ Long firstCourseId = Long.parseLong(roomId.substring(1));
|
|
|
|
|
|
- Long currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(roomString));
|
|
|
+ Long currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(roomId + userId));
|
|
|
log.info("signInSuccess: currentRoomId={}", currentRoomId);
|
|
|
- redisTemplate.delete(roomString);
|
|
|
+ redisTemplate.delete(roomId + userId);
|
|
|
RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
|
|
|
if(roleEnum == RoleTeacher){
|
|
|
teacherAttendanceService.addTeacherAttendanceSignIn(firstCourseId,userIdInt,currentRoomId);
|