|
@@ -138,15 +138,6 @@ public class RoomServiceImpl implements RoomService {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- /*try {
|
|
|
- if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
- teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),courseSchedule.getActualTeacherId(), SignStatusEnum.SIGN_IN,true);
|
|
|
- }else {
|
|
|
- studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
|
|
|
- }
|
|
|
- }catch (Exception e){
|
|
|
- e.printStackTrace();
|
|
|
- }*/
|
|
|
if(courseSchedule.getGroupType() == GroupType.COMM){
|
|
|
roomId = "I" + roomId;
|
|
|
}else {
|
|
@@ -194,10 +185,11 @@ public class RoomServiceImpl implements RoomService {
|
|
|
userResult.setJoinTime(curTime);
|
|
|
log.info("user join the room: roomId={} , userId={}, roleEnum={}, memCount: {}", roomId, userId, roleEnum, count);
|
|
|
} else {
|
|
|
- roleEnum = RoleEnum.getEnumByValue(memberList.get(0).getRole());
|
|
|
+ RoomMember roomMember = memberList.get(0);
|
|
|
+ roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
|
|
|
// roomMemberDao.updateCameraByRidAndUid(roomId, userId, !isDisableCamera);
|
|
|
- userResult.setCamera(!isDisableCamera);
|
|
|
- userResult.setJoinTime(memberList.get(0).getJoinDt());
|
|
|
+ userResult.setCamera(roomMember.isCamera());
|
|
|
+ userResult.setJoinTime(roomMember.getJoinDt());
|
|
|
|
|
|
log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
|
|
|
}
|