Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -395,7 +395,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setGroupType(ImGroup.GroupTypeEnum.SCHOOL);
             imGroup.setCreateTime(new Date());
             imGroup.setUpdateTime(new Date());
-            imGroup.setTenantId(TenantContextHolder.getTenantId());
+            imGroup.setTenantId(cooperationOrgan.getTenantId());
             imGroupDao.insert(imGroup);
             imPluginService.groupCreate(imGroup.getId(), imGroup.getName(), userId.toString());
 

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

@@ -4507,7 +4507,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createLiveCourse() {
-        List<VipGroup> vipGroups = vipGroupDao.findNoCreateSuccessVipGroup(null,"LIVE");
+        Integer tenantId = TenantContextHolder.getTenantId();
+        List<VipGroup> vipGroups = vipGroupDao.findNoCreateSuccessVipGroup(tenantId,"LIVE");
         if(!CollectionUtils.isEmpty(vipGroups)){
             //排课
             for (VipGroup vipGroup : vipGroups) {

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

@@ -56,6 +56,8 @@ public class RoomResult {
     @ApiModelProperty("声部编号")
     private String subjectId;
 
+    @ApiModelProperty("os")
+    private String os;
     public RoomResult rtcRoomConfig(RTCRoomConfig rtcRoomConfig) {
         this.rtcRoomConfig = rtcRoomConfig;
         return this;

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

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

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -286,8 +286,9 @@ public class TaskController extends BaseController {
 		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
 		if(tenantInfos != null && tenantInfos.size() > 0){
 			for (TenantInfo tenantInfo : tenantInfos) {
-				//更新直播课状态
+				TenantContextHolder.setTenantId(tenantInfo.getId());
 				vipGroupService.createLiveCourse();
+				TenantContextHolder.clearTenantId();
 			}
 		}
 	}