Merge branch '20200324'

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -40,8 +40,8 @@
     <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1539,6 +1539,9 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<CourseSchedule> findCourseByGroupId(@Param("groupType") String groupType, @Param("groupId") String groupId);
 
+    List<CourseSchedule> findCourseByGroupIds(@Param("groupIds") List<String> groupIds,
+                                              @Param("groupType") GroupType groupType);
+
     /**
      * 获取老师正常签退的课程
      *

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

@@ -813,6 +813,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取学员的乐团列表详情
         List<CourseListDto> musicCourse = classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","), userId);
 
+        List<CourseSchedule> musicGroupCourses = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(musicGroupIds)){
+            musicGroupCourses = courseScheduleDao.findCourseByGroupIds(musicGroupIds, MUSIC);
+        }
+        Map<String, Map<TeachModeEnum, Long>> musicGroupTeachModeNumMap = new HashMap<>();
+        if(!CollectionUtils.isEmpty(musicGroupCourses)){
+            musicGroupTeachModeNumMap = musicGroupCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getMusicGroupId, Collectors.groupingBy(CourseSchedule::getTeachMode, Collectors.counting())));
+        }
+
         if (!CollectionUtils.isEmpty(typeGroupMap.get(PRACTICE))) {
             musicGroupIds = typeGroupMap.get(PRACTICE).stream().map(Group::getId).collect(Collectors.toList());
         } else {
@@ -911,8 +920,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     else if(PracticeGroupType.COME_ON_PACKAGE.equals(practiceGroupTypeMap.get(Long.valueOf(e.getPracticeId()))))
                         e.setPracticeType(3);
                 }
-            }
-            if (ClassGroupTypeEnum.VIP == e.getType()) {
+            }else if (ClassGroupTypeEnum.VIP == e.getType()) {
                 e.setStudentNames(vipStuNames.get(e.getVipId()));
                 //1：线上；2：线下；3：线上+线下
                 if (e.getOnlineClassesNum() > 0 && e.getOffLineClassesNum() <= 0) {
@@ -924,6 +932,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 } else {
                     e.setClassMode(0);
                 }
+            }else{
+                Map<TeachModeEnum, Long> teachModeCourseNumMap = musicGroupTeachModeNumMap.get(e.getMusicId());
+                Long onlineCourseNum = 0L;
+                Long offlineCourseNum = 0L;
+                if(teachModeCourseNumMap.containsKey(TeachModeEnum.ONLINE)){
+                    onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.ONLINE);
+                }
+                if(teachModeCourseNumMap.containsKey(TeachModeEnum.OFFLINE)){
+                    onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.OFFLINE);
+                }
+                if (onlineCourseNum > 0 && offlineCourseNum <= 0) {
+                    e.setClassMode(1);
+                } else if (onlineCourseNum > 0 && offlineCourseNum > 0) {
+                    e.setClassMode(3);
+                } else if (onlineCourseNum <= 0 && offlineCourseNum > 0) {
+                    e.setClassMode(2);
+                } else {
+                    e.setClassMode(0);
+                }
             }
         }
         pageInfo.setRows(courseListDtos);

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

@@ -3153,6 +3153,20 @@
           AND cs.group_type_ = #{groupType}
           AND cs.del_flag_ = 0
     </select>
+    <select id="findCourseByGroupIds" resultMap="CourseSchedule">
+        SELECT
+        <include refid="resultSql"></include>
+        FROM course_schedule cs
+        WHERE cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        AND cs.del_flag_ = 0
+        AND (new_course_id_ is null or new_course_id_ = 0)
+        <if test="groupIds!=null and groupIds.size()>0">
+            AND cs.music_group_id_ IN
+            <foreach collection="groupIds" item="groupId" open="(" close=")" separator=",">
+                #{groupId}
+            </foreach>
+        </if>
+    </select>
     <select id="queryScheduleByAttendance" resultMap="CourseSchedule">
         SELECT cs.*
         FROM teacher_attendance ta

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

@@ -302,7 +302,7 @@ public class RoomServiceImpl implements RoomService {
         }
         String joinSuccessKey = "joinRoomSuccess"+ roomId + userId;
         Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(joinSuccessKey, roomId, 2l, TimeUnit.SECONDS);
-        if(aBoolean){
+        if(!aBoolean){
             RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
             if(roleEnum == RoleTeacher && StringUtils.isNotEmpty(deviceNum)){
                 signInSuccess(roomMember,deviceNum);
@@ -442,7 +442,7 @@ public class RoomServiceImpl implements RoomService {
 
         String leaveSuccessKey = "leaveRoomSuccess"+ roomId + userId;
         Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 2, TimeUnit.SECONDS);
-        if(aBoolean){
+        if(!aBoolean){
             if (StringUtils.isNotEmpty(deviceNum)){
                 //如果设备号不为空，更新设备号
                 if(roleEnum == RoleTeacher){