Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

 Conflicts:

	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -6,7 +6,6 @@ import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
-
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -141,18 +140,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     int deleteMusicGroupCourseSchedulesWithStudent(@Param("courseScheduleIds") List<Long> courseScheduleIds,
                                                    @Param("userId") Integer userId);
 
-    int deleteMusicGroupCourseSchedulesWithStudents(@Param("courseScheduleIds") List<Long> courseScheduleIds,
-                                                   @Param("userIds") List<Integer> userIds);
-
-    /**
-     * @describe 获取班级上未开始的课程
-     * @author Joburgess
-     * @date 2020.11.05
-     * @param classGroupId:
-     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
-     */
-    List<CourseSchedule> getClassGroupNotStartCourse(@Param("classGroupId") Long classGroupId);
-
     /**
      * @param teacherId: 教师编号
      * @param classDate: 上课日期
@@ -1589,14 +1576,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<Map<Integer, Integer>> queryHasReatClass(@Param("classGroupIds") Set<String> classGroupIds, @Param("teacherId") String teacherId);
 
-    
-    /**
-     * 查询班级未上的课程类型对应的时长
-     * @param classGroupIdList
-     * @return
-     */
-    List<RemainCourseTypeDurationDto> queryRemainCourseTypeDuration(String classGroupIdList);
-
     /**
      * @describe 获取检测课程冲突需要的数据
      * @author qnc99
@@ -1621,4 +1600,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return
      */
     List<Map<String, Integer>> querySubCourseNumMap(@Param("classGroupId") Integer classGroupId);
+
+    CourseSchedule getLock (long courseId);
 }

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3336,5 +3336,8 @@
         WHERE cs.class_group_id_ = #{classGroupId} AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW()
         GROUP BY cs.group_type_
     </select>
+    <select id="getLock" resultMap="CourseSchedule">
+        SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE
+    </select>
 
 </mapper>

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

@@ -247,7 +247,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){
@@ -258,7 +258,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);