|
@@ -53,7 +53,6 @@ import java.io.Serializable;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
-import java.util.function.BiConsumer;
|
|
|
|
import java.util.function.BiFunction;
|
|
import java.util.function.BiFunction;
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -288,6 +287,14 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
|
|
if (now.getTime() > dto.getLiveStartTime().getTime()) {
|
|
if (now.getTime() > dto.getLiveStartTime().getTime()) {
|
|
throw new BizException("设置的直播开始时间不能小于当前时间");
|
|
throw new BizException("设置的直播开始时间不能小于当前时间");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ String popularizeType = dto.getPopularizeType();
|
|
|
|
+ if (popularizeType.equals(ImLiveBroadcastRoom.ALL)) {
|
|
|
|
+ dto.setPopularizeOrgIds(null);
|
|
|
|
+ dto.setPopularizeSchoolIds(null);
|
|
|
|
+ } else if (popularizeType.equals(ImLiveBroadcastRoom.ORGAN)) {
|
|
|
|
+ dto.setPopularizeSchoolIds(null);
|
|
|
|
+ }
|
|
BeanUtils.copyProperties(dto, obj);
|
|
BeanUtils.copyProperties(dto, obj);
|
|
obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
|
|
obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
|
|
log.info("update room >>> :{}", JSONObject.toJSONString(obj));
|
|
log.info("update room >>> :{}", JSONObject.toJSONString(obj));
|