zouxuan 2 éve
szülő
commit
ebe76698ae

+ 0 - 9
mec-im/src/main/java/com/ym/controller/HereWhiteController.java

@@ -1,28 +1,19 @@
 package com.ym.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.pojo.HereWhite;
 import com.ym.service.HereWhiteService;
-import freemarker.cache.StringTemplateLoader;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
 @RestController
 @RequestMapping("/hereWhite")
 public class HereWhiteController  extends BaseController {
 
     @Autowired
     private HereWhiteService hereWhiteService;
-    @Autowired
-    private RedisTemplate<String,String> redisTemplate;
 
     /**
      * 创建白板,默认全部采用零时白板

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

@@ -33,7 +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;
+    private @Getter @Setter String randomNumeric = "0";
 
     @Data
     public static class MemberResult {

+ 5 - 1
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -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,7 +307,10 @@ public class RoomServiceImpl implements RoomService {
             roomResult.setSoundVolume(room.getSoundVolume());
         }
         //是否使用自定义白板
-        roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
+        if(courseSchedule.getOrganId().equals(1) && (courseSchedule.getStudentNum() == null || courseSchedule.getStudentNum() == 1)){
+            roomResult.setRandomNumeric("1");
+        }
+//        roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
         log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
         return new BaseResponse(roomResult);
     }