Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -778,7 +778,7 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Override
     public Map<String, Integer> sumStudentAttendance(Integer courseScheduleId) {
         CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
-        Map<String, Integer> sum = new HashMap<>(5);
+        Map<String, Integer> sum = new HashMap<>(7);
         Integer studentNum = scheduleStudentPaymentDao.countStudentNum(courseScheduleId);
         sum.put("studentNum", studentNum);
         Integer signInNum = studentManageDao.countStudentSignInNum(courseScheduleId, "NORMAL");

mec-biz/src/main/resources/config/mybatis/StudentExtracurricularExercisesSituationMapper.xml

@@ -960,7 +960,7 @@
         LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = sees.music_group_id_ AND cssp.user_id_ = sees.student_id_ AND cssp.group_type_ = 'MUSIC'
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
         AND cs.is_lock_ = 0 AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ ) AND cs.class_date_ BETWEEN #{monday} AND #{sunday}
-        LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_ AND sa.status_ IN ('NORMAL','LATE')
+        LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_ = cssp.user_id_ AND sa.status_ IN ('NORMAL','LATE')
         WHERE sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}
         GROUP BY sees.student_id_,sees.music_group_id_) cs ON cs.student_id_ = sees.student_id_ AND cs.music_group_id_ = sees.music_group_id_
         <where>

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;
 
     /**
      * 创建白板，默认全部采用零时白板

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 {

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,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));