update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -503,12 +503,12 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 
             //判断是否在签到时间段内（课程开始前20~结束前）
 //			int advanceSignMinutes = Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES));
-			String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
+//			String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
 //			String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-			String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+//			String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
             //上课时间
 //			Date classStartDateTime = DateUtil.stringToDate(classDate + " " + startClassTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
-			Date classEndDateTime = DateUtil.stringToDate(classDate + " " + endClassTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+//			Date classEndDateTime = DateUtil.stringToDate(classDate + " " + endClassTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
 //			Date addMinutes = DateUtil.addMinutes(classStartDateTime, -60);
 
             //课程结束前进入，算正常

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -286,7 +286,6 @@ public class RoomServiceImpl implements RoomService {
 
         Long currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(roomString));
         log.info("signInSuccess: currentRoomId={}", currentRoomId);
-        redisTemplate.delete(roomString);
         /*CourseSchedule schedule = courseScheduleDao.get(courseId);
         Date date = new Date();
         String classDate = DateUtil.format(schedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
@@ -353,12 +352,16 @@ public class RoomServiceImpl implements RoomService {
         }
         log.info("leaveRoomSuccess: roomId={}, userId={}", roomId,userId);
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
-        Long scheduleId = Long.parseLong(roomId.substring(1));
+        String roomString = roomId.substring(1);
+        Integer scheduleId = Integer.parseInt(roomString);
+        Long currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(roomString));
+        log.info("leaveRoomSuccess: currentRoomId={}", currentRoomId);
+        redisTemplate.delete(roomString);
         if(roleEnum == RoleTeacher){
             courseScheduleStudentPaymentDao.adjustPlayMidi(scheduleId.intValue(),null,null);
-            teacherAttendanceService.addTeacherAttendanceRecord(scheduleId.intValue(),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true,scheduleId);
+            teacherAttendanceService.addTeacherAttendanceRecord(scheduleId.intValue(),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true,currentRoomId);
         }else {
-            studentAttendanceService.addStudentAttendanceRecord(scheduleId.intValue(),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT,scheduleId);
+            studentAttendanceService.addStudentAttendanceRecord(scheduleId.intValue(),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT,currentRoomId);
         }
         Room room = roomDao.findByRid(roomId);
         if (room == null) {