shangke 2 年之前
父节点
当前提交
663bf96536
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

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

@@ -53,6 +53,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -60,6 +61,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -300,6 +302,7 @@ public class RoomServiceImpl implements RoomService {
 
                     ImLiveBroadcastRoom updateInfo = new ImLiveBroadcastRoom();
                     updateInfo.setId(liveRoom.getId());
+                    updateInfo.setVideoRecord("");
                     updateInfo.setLiveStartTime(DateTime.now().toDate());
 
                     // 更新直播间状态
@@ -333,7 +336,7 @@ public class RoomServiceImpl implements RoomService {
             genRtcRoomMemberInfoConfig(roomId, joinRoom, sysUser, userId, teacher, courseSchedule, curTime, roomResult, courseId);
         }
 
-        log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId);
+        log.info("join room: roomId = {}, userId = {}", roomId, userId);
         return new BaseResponse(roomResult);
     }
 
@@ -363,7 +366,12 @@ public class RoomServiceImpl implements RoomService {
             liveRoom.setServiceProvider(liveClient);
         }
 
-        String roomUid = "LIVE-" + roomId + "-" + courseSchedule.getCreateTime().getTime();
+        String liveStartTime = MessageFormat.format("{0} {1}", DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN),
+                DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT));
+
+        DateTime time = DateTime.parse(liveStartTime, DateTimeFormat.forPattern(DateUtil.DEFAULT_PATTERN + " " + DateUtil.EXPANDED_TIME_FORMAT));
+
+        String roomUid = "LIVE-" + roomId + "-" + time.toDate().getTime();
         liveRoom.setTenantId(TenantContextHolder.getTenantId());
         liveRoom.setRoomUid(roomUid);
         //liveRoom.setRoomConfig(liveRoom.getRoomConfig());