Browse Source

创建白板读取配置文件,标记是否使用自定义白板

zouxuan 2 years ago
parent
commit
8b2d0a8ae2

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

@@ -33,6 +33,7 @@ public class RoomResult {
     private @Getter @Setter String display;
     private @Getter @Setter List<WhiteboardResult> whiteboards = new ArrayList<>();
     private @Getter @Setter MemberResult userInfo;
+    private @Getter @Setter String randomNumeric;
 
     @Data
     public static class MemberResult {

+ 1 - 8
mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -2,14 +2,12 @@ package com.ym.service.Impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ym.dao.HereWhiteDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.http.HttpUtil;
 import com.ym.pojo.HereWhite;
 import com.ym.service.HereWhiteService;
 import com.ym.service.RoomService;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -31,8 +29,6 @@ public class HereWhiteServiceImpl implements HereWhiteService {
     private HereWhiteDao hereWhiteDao;
     @Autowired
     private RoomService roomService;
-    @Autowired
-    private SysConfigDao sysConfigDao;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -62,10 +58,7 @@ public class HereWhiteServiceImpl implements HereWhiteService {
                 hereWhite.setRoomToken(jsonObject.getJSONObject("msg").getString("roomToken"));
                 hereWhite.setUpdatedAt(date);
                 hereWhite.setCreatedAt(date);
-                String flag = sysConfigDao.findConfigValue("rongyun_here_white_flag");
-                if(StringUtils.equals("1",flag)){
-                    hereWhite.setRandomNumeric(RandomStringUtils.randomNumeric(22));
-                }
+                hereWhite.setRandomNumeric(RandomStringUtils.randomNumeric(22));
                 hereWhiteDao.save(hereWhite);
             }
             return hereWhite;

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

@@ -100,6 +100,8 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private SysTenantConfigService sysTenantConfigService;
     @Autowired
+    private SysConfigDao sysConfigDao;
+    @Autowired
     private TenantAssetsInfoService tenantAssetsInfoService;
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
@@ -303,6 +305,8 @@ public class RoomServiceImpl implements RoomService {
         if (room != null) {
             roomResult.setSoundVolume(room.getSoundVolume());
         }
+        //是否使用自定义白板
+        roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
         log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
         return new BaseResponse(roomResult);
     }