|
@@ -177,12 +177,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void update(ImLiveBroadcastRoomDto dto) {
|
|
|
ImLiveBroadcastRoom obj = this.getById(dto.getId());
|
|
|
- if (obj.getLiveState() == 1) {
|
|
|
- obj.setRoomTitle(dto.getRoomTitle());
|
|
|
- } else {
|
|
|
- BeanUtils.copyProperties(dto, obj);
|
|
|
- obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
|
|
|
- }
|
|
|
+ BeanUtils.copyProperties(dto, obj);
|
|
|
+ obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
|
|
|
obj.setUpdatedBy(getSysUser().getId());
|
|
|
obj.setUpdatedTime(new Date());
|
|
|
log.info("update room >>> :{}", JSONObject.toJSONString(obj));
|
|
@@ -270,12 +266,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
//超过expiredMinute分钟,没有进入房间
|
|
|
if (Objects.isNull(speakerInfo.getJoinRoomTime())) {
|
|
|
roomDestroy(room);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- //超过expiredMinute分钟,但是未开启直播,则销毁
|
|
|
- if (Objects.isNull(speakerInfo.getState())) {
|
|
|
- roomDestroy(room);
|
|
|
+ log.info("roomDestroy not joinRoom >>>> roomId:{}", room.getId());
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -284,6 +275,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
|
Date comparedTime = DateUtil.addMinutes(speakerInfo.getExitRoomTime(), expiredMinute);
|
|
|
if (now.getTime() >= comparedTime.getTime() && speakerInfo.getState() != 0) {
|
|
|
roomDestroy(room);
|
|
|
+ log.info("roomDestroy exitRoom >>>> roomId:{}", room.getId());
|
|
|
}
|
|
|
}
|
|
|
}
|