Explorar el Código

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

zouxuan hace 2 años
padre
commit
bd2a2a362f

+ 2 - 12
mec-im/src/main/java/com/ym/controller/HereWhiteController.java

@@ -37,12 +37,7 @@ public class HereWhiteController  extends BaseController {
         if(StringUtils.isEmpty(name) || userNum == null || courseScheduleId == null){
             return failed("参数校验失败");
         }
-        HereWhite hereWhite = hereWhiteService.create(name, userNum, courseScheduleId);
-        String joinSuccessKey = "createHereWhite:" + courseScheduleId;
-        String randomNumeric = RandomStringUtils.randomNumeric(22);
-        redisTemplate.opsForValue().set(joinSuccessKey,randomNumeric,2, TimeUnit.HOURS);
-        hereWhite.setRandomNumeric(randomNumeric);
-        return succeed(hereWhite);
+        return succeed(hereWhiteService.create(name, userNum, courseScheduleId));
     }
 
     /**
@@ -53,12 +48,7 @@ public class HereWhiteController  extends BaseController {
      */
     @RequestMapping(value = "get", method = RequestMethod.GET)
     public Object join(Integer courseScheduleId){
-        HereWhite hereWhite = hereWhiteService.getByClassId(courseScheduleId);
-        if(Objects.nonNull(hereWhite)){
-            String joinSuccessKey = "createHereWhite:" + courseScheduleId;
-            hereWhite.setRandomNumeric(redisTemplate.opsForValue().get(joinSuccessKey));
-        }
-        return succeed(hereWhite);
+        return succeed(hereWhiteService.getByClassId(courseScheduleId));
     }
 
 }

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

@@ -44,7 +44,7 @@ public class HereWhite implements Serializable {
     private @Getter @Setter Date updatedAt;
     @Column(name = "created_at_")
     private @Getter @Setter Date createdAt;
-
+    @Column(name = "random_numeric_")
     private @Getter @Setter String randomNumeric;
 
 }

+ 9 - 0
mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -2,11 +2,14 @@ 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;
@@ -28,6 +31,8 @@ public class HereWhiteServiceImpl implements HereWhiteService {
     private HereWhiteDao hereWhiteDao;
     @Autowired
     private RoomService roomService;
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -57,6 +62,10 @@ 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));
+                }
                 hereWhiteDao.save(hereWhite);
             }
             return hereWhite;