Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live

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

@@ -2027,7 +2027,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     /**
      * 直播课需要通知的课程
      */
-    List<CourseSchedule> liveCourseRemind();
+    List<CourseSchedule> liveCourseRemind(Integer minutes);
 
     void updateRemindStatus(@Param("ids") List<Long> ids);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassCourseSchudeleDto.java

@@ -84,6 +84,9 @@ public class TeacherClassCourseSchudeleDto {
     @ApiModelProperty("直播客户端")
     private String os;
 
+    @ApiModelProperty("声部编号")
+    private String subjectId;
+
     @ApiModelProperty("课程组编号")
     private String musicGroupId;
 
@@ -294,4 +297,17 @@ public class TeacherClassCourseSchudeleDto {
     public void setId(Long id) {
         this.id = id;
     }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public TeacherClassCourseSchudeleDto subjectId(String subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
 }

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

@@ -3767,6 +3767,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			// 课程组信息
 			Map<String, ImLiveBroadcastRoomDto> liveRoomMap = getCourseLiveRoomMap(dataList);
 
+			ImLiveBroadcastRoomDto liveRoom;
 			for (TeacherClassCourseSchudeleDto e : dataList) {
 				e.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(e.getClassGroupId().intValue(),new Date()));
 				e.setTotalClassTimes(courseScheduleDao.countCurrentCourseTime(e.getCourseScheduleId()));
@@ -3783,7 +3784,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 				// 直播课直播间配置
 				if (liveRoomMap.containsKey(e.getMusicGroupId())) {
-					e.setOs(liveRoomMap.get(e.getMusicGroupId()).getOs());
+					liveRoom = liveRoomMap.get(e.getMusicGroupId());
+					e.subjectId(liveRoom.getSubjectId()).setOs(liveRoom.getOs());
 				}
 			}
 		}

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

@@ -550,7 +550,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         className.append(StringUtils.join(studentNames, ","));
         vipGroupApplyBaseInfoDto.setName(className.toString());
 
-        vipGroupApplyBaseInfoDto.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
+        if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(groupType)) {
+
+
+            vipGroupApplyBaseInfoDto.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
+        }
         vipGroupDao.insert(vipGroupApplyBaseInfoDto);
 
         Map<String, BigDecimal> costInfo = Maps.newHashMap();
@@ -4935,7 +4939,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     @Override
     public void liveCourseRemind() {
         // 查询30分钟内要开始的并且没有直播通知的直播课
-        List<CourseSchedule> courseSchedules = courseScheduleDao.liveCourseRemind();
+        List<CourseSchedule> courseSchedules = courseScheduleDao.liveCourseRemind(30);
 
         if (CollectionUtils.isEmpty(courseSchedules)) {
             return;

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

@@ -4328,7 +4328,8 @@
           and cs.live_remind_ = 0
           and cs.type_ = 'LIVE'
           and cs.class_date_ = date_format(now(),'%Y-%m-%d')
-          and cs.start_class_time_ <= date_format(now(),'%H:%i:%s')
+          and CONCAT(class_date_,' ',start_class_time_)  >= date_format(date_add(now(),interval -#{minutes} minute),'%Y-%m-%d %H:%i:%s')
+          and CONCAT(class_date_,' ',start_class_time_)  <= date_format(now(),'%Y-%m-%d %H:%i:%s')
     </select>
 
     <update id="updateRemindStatus">

mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -52,7 +52,10 @@ public class RoomResult {
     private @Getter @Setter Integer studentNums;
 
     @ApiModelProperty("直播间编号")
-    public String liveRoomId;
+    private String liveRoomId;
+
+    @ApiModelProperty("声部编号")
+    private String subjectId;
 
     public RoomResult rtcRoomConfig(RTCRoomConfig rtcRoomConfig) {
         this.rtcRoomConfig = rtcRoomConfig;
@@ -64,6 +67,11 @@ public class RoomResult {
         return this;
     }
 
+    public RoomResult subjectId(String subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
     @Data
     public static class MemberResult {
         String userId;

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

@@ -319,7 +319,7 @@ public class RoomServiceImpl implements RoomService {
             }
 
             // 返回直播间配置参数
-            roomResult.setLiveRoomId(liveRoom.getRoomUid());
+            roomResult.subjectId(liveRoom.getSubjectId()).setLiveRoomId(liveRoom.getRoomUid());
 
             // 主动触发用户加入直播间
             // imLiveBroadcastRoomService.joinRoom(liveRoom.getRoomUid(), sysUser.getId());