|
@@ -1,6 +1,7 @@
|
|
|
package com.ym.service.Impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
|
|
import com.ym.common.ApiException;
|
|
@@ -306,11 +307,23 @@ public class RoomServiceImpl implements RoomService {
|
|
|
roomResult.setSoundVolume(room.getSoundVolume());
|
|
|
}
|
|
|
//是否使用自定义白板
|
|
|
- roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
|
|
|
+ String rongyun_here_white_flag = sysConfigDao.findConfigValue("rongyun_here_white_flag");
|
|
|
+ if(StringUtils.isNotEmpty(rongyun_here_white_flag)){
|
|
|
+ HashMap<Integer,Integer> hashMap = JSONObject.parseObject(rongyun_here_white_flag, HashMap.class);
|
|
|
+ Integer s = hashMap.get(courseSchedule.getOrganId());
|
|
|
+ if(s == null){
|
|
|
+ roomResult.setRandomNumeric("0");
|
|
|
+ }else {
|
|
|
+ roomResult.setRandomNumeric(s.toString());
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ roomResult.setRandomNumeric("1");
|
|
|
+ }
|
|
|
log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
|
|
|
return new BaseResponse(roomResult);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
public RoomMember saveRoomMember(String roomId, String userId) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
|
|
|
|