|
@@ -21,8 +21,6 @@ import com.ym.mec.biz.dal.dto.RongyunBasicUserDto;
|
|
import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
import com.ym.mec.biz.dal.entity.Teacher;
|
|
import com.ym.mec.biz.dal.entity.Teacher;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
-import com.ym.mec.biz.dal.enums.SignStatusEnum;
|
|
|
|
-import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
|
|
|
|
import com.ym.mec.biz.dal.enums.TeachModeEnum;
|
|
import com.ym.mec.biz.dal.enums.TeachModeEnum;
|
|
import com.ym.mec.biz.service.StudentAttendanceService;
|
|
import com.ym.mec.biz.service.StudentAttendanceService;
|
|
import com.ym.mec.biz.service.SysConfigService;
|
|
import com.ym.mec.biz.service.SysConfigService;
|
|
@@ -39,7 +37,6 @@ import com.ym.utils.CodeUtil;
|
|
import com.ym.utils.DateTimeUtils;
|
|
import com.ym.utils.DateTimeUtils;
|
|
import com.ym.utils.IdentifierUtils;
|
|
import com.ym.utils.IdentifierUtils;
|
|
import com.ym.whiteboard.WhiteBoardHelper;
|
|
import com.ym.whiteboard.WhiteBoardHelper;
|
|
-import io.swagger.models.auth.In;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -130,7 +127,7 @@ public class RoomServiceImpl implements RoomService {
|
|
Teacher teacher = teacherDao.get(Integer.parseInt(userId));
|
|
Teacher teacher = teacherDao.get(Integer.parseInt(userId));
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
|
|
if(courseSchedule.getTeachMode() == TeachModeEnum.OFFLINE){
|
|
if(courseSchedule.getTeachMode() == TeachModeEnum.OFFLINE){
|
|
- throw new ApiException(ErrorEnum.JOIN_ROOM_ERROR, "加入房间失败,请前往线下教室");
|
|
|
|
|
|
+ throw new ApiException(ErrorEnum.JOIN_ROOM_ERROR);
|
|
}
|
|
}
|
|
|
|
|
|
String continueCourseTime = sysConfigDao.findConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME);
|
|
String continueCourseTime = sysConfigDao.findConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME);
|