Merge branch 'saas_hgw_2022_6_6' into saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SysUserDto.java
#	mec-biz/src/main/java/com/ym/mec/biz/dal/enums/TemplateTypeEnum.java
#	mec-web/src/main/resources/columnMapper.ini

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

@@ -29,8 +29,6 @@ public interface ImLiveBroadcastRoomDao extends BaseMapper<ImLiveBroadcastRoom>
 
     int insertBatch(@Param("entities") List<ImLiveBroadcastRoom> entities);
 
-    IPage<Map<Integer, Object>> queryUserPageByTenantId(Page<Map<Integer, Object>> page);
-
     List<BaseRoomUserVo> queryBaseUserInfo(@Param("list") List<Integer> list);
 
     /**

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

@@ -0,0 +1,29 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ym.mec.biz.dal.entity.ImLiveRoomPurview;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 直播间的观看权限表(ImLiveRoomPurview)表数据库访问层
+ *
+ * @author hgw
+ * @since 2022-06-08 09:43:47
+ */
+public interface ImLiveRoomPurviewDao extends BaseMapper<ImLiveRoomPurview> {
+
+    int insertBatch(@Param("entities") List<ImLiveRoomPurview> entities);
+
+    <T> IPage<T> selectRoomPurviewStudent(Page<T> page, @Param("param") Map<String, Object> param);
+
+    <T> List<T> selectRoomPurviewStudent(@Param("param") Map<String, Object> param);
+
+    <T> IPage<T> selectRoomPurviewGroup(Page<T> page, @Param("param") Map<String, Object> param);
+
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ImLiveBroadcastRoomDto.java

@@ -49,18 +49,9 @@ public class ImLiveBroadcastRoomDto implements Serializable {
     private RoomConfig roomConfig;
 
     @NotBlank(message = "直播间类型不能为空")
-    @ApiModelProperty(value = "推广的直播间可见类型-全部可见、部分分部可见、部分合作单位可见")
+    @ApiModelProperty(value = "直播间可见类型-全部可见 ALL / 部分可见 PRIVATE")
     private String popularizeType;
 
-    @ApiModelProperty(value = "分部id-多个id逗号分割")
-    private String popularizeOrgIds;
-
-    @ApiModelProperty(value = "学校id-合作单位id，多个id逗号分割")
-    private String popularizeSchoolIds;
-
-    @ApiModelProperty(value = "乐团id，多个id逗号分割")
-    private String popularizeTeamIds;
-
     @ApiModel(value = "房间配置")
     public static class RoomConfig implements Serializable {
 
@@ -192,28 +183,5 @@ public class ImLiveBroadcastRoomDto implements Serializable {
         this.popularizeType = popularizeType;
     }
 
-    public String getPopularizeOrgIds() {
-        return popularizeOrgIds;
-    }
-
-    public void setPopularizeOrgIds(String popularizeOrgIds) {
-        this.popularizeOrgIds = popularizeOrgIds;
-    }
-
-    public String getPopularizeSchoolIds() {
-        return popularizeSchoolIds;
-    }
-
-    public void setPopularizeSchoolIds(String popularizeSchoolIds) {
-        this.popularizeSchoolIds = popularizeSchoolIds;
-    }
-
-    public String getPopularizeTeamIds() {
-        return popularizeTeamIds;
-    }
-
-    public void setPopularizeTeamIds(String popularizeTeamIds) {
-        this.popularizeTeamIds = popularizeTeamIds;
-    }
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SysUserDto.java

@@ -2,8 +2,6 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import java.math.BigDecimal;
-
 public class SysUserDto {
     @ApiModelProperty(value = "用户ID")
     private Long userId;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImLiveBroadcastRoom.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.dal.entity;
 
-
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -21,9 +20,7 @@ import java.io.Serializable;
 public class ImLiveBroadcastRoom implements Serializable {
 
     public static final String ALL = "ALL";
-    public static final String ORGAN = "ORGAN";
-    public static final String SCHOOL = "SCHOOL";
-    public static final String TEAM = "TEAM";
+    public static final String PRIVATE = "PRIVATE";
 
     @TableId(value = "id_", type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
@@ -78,21 +75,9 @@ public class ImLiveBroadcastRoom implements Serializable {
     private Integer popularize;
 
     @TableField("popularize_type_")
-    @ApiModelProperty(value = "推广的直播间可见类型-全部可见ALL、部分分部可见ORGAN、部分合作单位可见SCHOOL")
+    @ApiModelProperty(value = "直播间可见类型-全部可见 ALL / 部分可见 PRIVATE")
     private String popularizeType;
 
-    @TableField("popularize_org_ids_")
-    @ApiModelProperty(value = "分部id-多个id逗号分割")
-    private String popularizeOrgIds;
-
-    @ApiModelProperty(value = "学校id-合作单位id，多个id逗号分割")
-    @TableField("popularize_school_ids_")
-    private String popularizeSchoolIds;
-
-    @ApiModelProperty(value = "乐团id，多个id逗号分割")
-    @TableField("popularize_team_ids_")
-    private String popularizeTeamIds;
-
     @TableField("created_by_")
     @ApiModelProperty(value = "创建人")
     private Integer createdBy;
@@ -273,28 +258,5 @@ public class ImLiveBroadcastRoom implements Serializable {
         this.popularizeType = popularizeType;
     }
 
-    public String getPopularizeOrgIds() {
-        return popularizeOrgIds;
-    }
-
-    public void setPopularizeOrgIds(String popularizeOrgIds) {
-        this.popularizeOrgIds = popularizeOrgIds;
-    }
-
-    public String getPopularizeSchoolIds() {
-        return popularizeSchoolIds;
-    }
-
-    public void setPopularizeSchoolIds(String popularizeSchoolIds) {
-        this.popularizeSchoolIds = popularizeSchoolIds;
-    }
-
-    public String getPopularizeTeamIds() {
-        return popularizeTeamIds;
-    }
-
-    public void setPopularizeTeamIds(String popularizeTeamIds) {
-        this.popularizeTeamIds = popularizeTeamIds;
-    }
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImLiveRoomPurview.java

@@ -0,0 +1,98 @@
+package com.ym.mec.biz.dal.entity;
+
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+/**
+ * 直播间的观看权限表(ImLiveRoomPurview)表实体类
+ *
+ * @author hgw
+ * @since 2022-06-08 09:43:48
+ */
+@ApiModel(value = "im_live_room_purview-直播间的观看权限表")
+public class ImLiveRoomPurview implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @TableField("room_uid_")
+    @ApiModelProperty(value = "房间编号")
+    private String roomUid;
+
+    @TableField("user_id_")
+    @ApiModelProperty(value = "业务id，如果类型是用户则是需要将VARCHAR类型转换为int再关联查询会更好")
+    private Integer userId;
+
+    @TableField("type_")
+    @ApiModelProperty(value = "保留字段-类型-STUDENT 学员  老师TEACHER  管理员ADMIN")
+    private String type;
+
+    @TableField("created_by_")
+    @ApiModelProperty(value = "创建人")
+    private Integer createdBy;
+
+    @TableField("created_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createdTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getRoomUid() {
+        return roomUid;
+    }
+
+    public void setRoomUid(String roomUid) {
+        this.roomUid = roomUid;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(Integer createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/TemplateTypeEnum.java

@@ -9,11 +9,9 @@ public enum TemplateTypeEnum implements BaseEnum<String, TemplateTypeEnum> {
     REDEMPTIONCODE("REDEMPTION_CODE", "兑换码分配模板表"),
     OA_QUIT_MUSIC_GROUP("OA_QUIT_MUSIC_GROUP", "乐团退费模板"),
     EXTERNAL_STUDENT_IMPORT_MUSIC_GROUP("EXTERNAL_STUDENT_IMPORT_MUSIC_GROUP", "外部学生入团导入模板"),
-
     BUY_FREE_LIVE_THEORY_COURSE("BUY_FREE_LIVE_THEORY_COURSE", "直播临时活动学员购买导入模板"),
     LIVE_TEACHER_CARD("LIVE_TEACHER_CARD","直播临时活动上课老师名片导入模板"),
-    ;
-
+    LIVE_ROOM_PURVIEW_USER("LIVE_ROOM_PURVIEW_USER", "直播间用户观看权限表");
 
     private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/ImLiveBroadcastRoomVo.java

@@ -67,7 +67,7 @@ public class ImLiveBroadcastRoomVo implements Serializable {
     @ApiModelProperty(value = "imToken")
     private String imToken;
 
-    @ApiModelProperty(value = "播出端")
+    @ApiModelProperty(value = "播出端-  pc网页端 移动端mobile")
     private String os = "pc";
 
     @ApiModelProperty(value = "是否在首页推广 0否 1是 - 每个机构只能有一个直播间在首页推广")
@@ -79,18 +79,9 @@ public class ImLiveBroadcastRoomVo implements Serializable {
     @ApiModelProperty(value = "当前登录人是否是黑名单用户 0否 1是")
     private Integer blacklistFlag = 0;
 
-    @ApiModelProperty(value = "推广的直播间可见类型-全部可见ALL、部分分部可见ORGAN、部分合作单位可见SCHOOL")
+    @ApiModelProperty(value = "直播间可见类型-全部可见 ALL / 部分可见 PRIVATE")
     private String popularizeType;
 
-    @ApiModelProperty(value = "分部id-多个id逗号分割")
-    private String popularizeOrgIds;
-
-    @ApiModelProperty(value = "学校id-合作单位id，多个id逗号分割")
-    private String popularizeSchoolIds;
-
-    @ApiModelProperty(value = "乐团id，多个id逗号分割")
-    private String popularizeTeamIds;
-
     @ApiModelProperty(value = "点赞数")
     private Integer likeNum;
     @ApiModelProperty(value = "当前观看人数")
@@ -314,29 +305,5 @@ public class ImLiveBroadcastRoomVo implements Serializable {
     public void setPopularizeType(String popularizeType) {
         this.popularizeType = popularizeType;
     }
-
-    public String getPopularizeOrgIds() {
-        return popularizeOrgIds;
-    }
-
-    public void setPopularizeOrgIds(String popularizeOrgIds) {
-        this.popularizeOrgIds = popularizeOrgIds;
-    }
-
-    public String getPopularizeSchoolIds() {
-        return popularizeSchoolIds;
-    }
-
-    public void setPopularizeSchoolIds(String popularizeSchoolIds) {
-        this.popularizeSchoolIds = popularizeSchoolIds;
-    }
-
-    public String getPopularizeTeamIds() {
-        return popularizeTeamIds;
-    }
-
-    public void setPopularizeTeamIds(String popularizeTeamIds) {
-        this.popularizeTeamIds = popularizeTeamIds;
-    }
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/ImLiveRoomPurviewService.java

@@ -0,0 +1,94 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.dao.ImLiveRoomPurviewDao;
+import com.ym.mec.biz.dal.dto.SysUserDto;
+import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.dal.entity.ImLiveRoomPurview;
+import com.ym.mec.common.page.PageInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * 直播间的观看权限表(ImLiveRoomPurview)表服务接口
+ *
+ * @author hgw
+ * @since 2022-06-08 09:43:48
+ */
+public interface ImLiveRoomPurviewService extends IService<ImLiveRoomPurview> {
+
+    ImLiveRoomPurviewDao getDao();
+
+    /**
+     * 批量添加/根据查询条件添加房间观看权限
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - subjectId 声部ID
+     *              <p> - organIds 分部ID
+     *              <p> - groupIds 群聊ID
+     *              <p> - teamIds 乐团ID
+     *              <p> - schoolIds 学校id/合作单位id
+     *              <p> - roomUid 直播间UID
+     */
+    void addByCondition(Map<String, Object> param);
+
+    /**
+     * 指定多个学员id添加观看权限数据
+     *
+     * @param ids     bizId
+     * @param roomUid 直播间UID
+     */
+    void add(String ids, String roomUid);
+
+    /**
+     * 删除观看权限数据
+     *
+     * @param ids     bizId
+     * @param roomUid 直播间UID
+     */
+    void delete(String ids, String roomUid);
+
+    /**
+     * 查询学员列表-观看权限
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - subjectId 声部ID
+     *              <p> - roomUid 直播间UID
+     *              <p> -page 页数
+     *              <p> -rows 每页数量
+     */
+    PageInfo<SysUserDto> queryStudent(Map<String, Object> param);
+
+    /**
+     * 选择列表-观看权限-查询学员列表
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - subjectId 声部ID
+     *              <p> - roomUid 直播间UID
+     *              <p> -page 页数
+     *              <p> -rows 每页数量
+     */
+    PageInfo<SysUserDto> selectRoomPurviewStudent(Map<String, Object> param);
+
+    /**
+     * 选择-观看权限-群聊列表
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - roomUid 直播间UID
+     *              <p> - groupType 群类型
+     *              <p> -page 页数
+     *              <p> -rows 每页数量
+     */
+    PageInfo<ImGroup> selectRoomPurviewGroup(Map<String, Object> param);
+
+    /**
+     * 导入观看权限-人员
+     */
+    String importPurviewUser(MultipartFile file, String roomUid) throws Exception;
+}
+

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

@@ -16,7 +16,10 @@ import com.ym.mec.biz.dal.dao.LiveGoodsMapperDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.ImLiveBroadcastRoomDto;
 import com.ym.mec.biz.dal.dto.RoomReservationUserSearch;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoom;
+import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoomData;
+import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoomMember;
+import com.ym.mec.biz.dal.entity.ImLiveRoomBlack;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.LiveRoomGoodsOrderQueryInfo;
 import com.ym.mec.biz.dal.vo.*;
@@ -118,20 +121,17 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     public static final int PRE_LIVE_TIME_MINUTE = 30;
 
     /**
-     * 进入直播间检查数据-现在只有学生端用
+     * 进入直播间检查数据
      *
      * @param roomUid 房间uid
      * @param userId  用户id
-     * @param osType  1:学生端
+     * @param osType  默认学生端  0:pc端 1:学生端 2:老师端
      */
     @Override
     public ImLiveBroadcastRoomVo queryRoomAndCheck(String roomUid, Integer userId, Integer osType) {
-        SysUser sysUser;
-        if (Objects.isNull(userId)) {
-            sysUser = getSysUser();
-        } else {
-            sysUser = getSysUser(userId);
-        }
+        SysUser sysUser = Optional.ofNullable(userId)
+                .map(this::getSysUser)
+                .orElseGet(this::getSysUser);
         osType = Optional.ofNullable(osType).orElse(1);
         return queryRoomAndCheck(roomUid, sysUser, osType);
     }
@@ -207,31 +207,17 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     }
 
     /**
-     * 后台-分页查询直播间列表
+     * 分页查询直播间列表
      */
     @Override
     public PageInfo<ImLiveBroadcastRoomVo> queryPage(Map<String, Object> param) {
+        String os = WrapperUtil.toStr(param, "os");
+        if (StringUtils.isNotBlank(os) && os.equals("teacher")) {
+            param.put("speakerId", getSysUser().getId());
+        }
         Page<ImLiveBroadcastRoomVo> pageInfo = PageUtil.concatTimePage(param, "startTime", "endTime");
         pageInfo.setDesc("a.created_time_");
         param.put("tenantId", TenantContextHolder.getTenantId());
-        //查询该人员分部  及 分部下包含的学校(合作单位)
-        SysUser sysUser = getSysUser();
-        //分部
-        String organIds;
-        //如果是超管就查询当前机构所有的直播间
-        if (sysUser.getTenantId() == -1 || sysUser.getIsSuperAdmin()) {
-            param.put("allRoom", 1);
-        } else {
-            Employee employee = employeeService.get(sysUser.getId());
-            if (Objects.nonNull(employee) && Objects.nonNull(employee.getOrganIdList())) {
-                organIds = employee.getOrganIdList();
-                param.put("organIds", organIds);
-                String schoolIds = baseMapper.querySchoolIds(organIds);
-                if (StringUtils.isNotBlank(schoolIds)) {
-                    param.put("schoolIds", schoolIds);
-                }
-            }
-        }
         IPage<ImLiveBroadcastRoomVo> page = baseMapper.queryPage(pageInfo, param);
 
         // 查询预约人数
@@ -295,7 +281,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         ImLiveBroadcastRoom obj = this.getById(dto.getId());
         obj.setUpdatedBy(userId);
         obj.setUpdatedTime(now);
-        //如果直播已经则只能修改是否全员禁麦 和聊天功能
+        //如果直播已经开始则只能修改是否全员禁麦 和聊天功能
         if (obj.getLiveState() == 1) {
             obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
             this.updateById(obj);
@@ -304,23 +290,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (now.getTime() > dto.getLiveStartTime().getTime()) {
             throw new BizException("设置的直播开始时间不能小于当前时间");
         }
-
-        String popularizeType = dto.getPopularizeType();
-        switch (popularizeType) {
-            case ImLiveBroadcastRoom.ALL:
-                dto.setPopularizeOrgIds(null);
-                dto.setPopularizeSchoolIds(null);
-                dto.setPopularizeTeamIds(null);
-                break;
-            case ImLiveBroadcastRoom.ORGAN:
-                dto.setPopularizeSchoolIds(null);
-                dto.setPopularizeTeamIds(null);
-                break;
-            case ImLiveBroadcastRoom.SCHOOL:
-                dto.setPopularizeTeamIds(null);
-                break;
-        }
-
+        //本次修改后的类型
         BeanUtils.copyProperties(dto, obj);
         obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
         log.info("update room  >>>  :{}", JSONObject.toJSONString(obj));
@@ -1153,10 +1123,21 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 .orElseThrow(() -> new BizException("用户不存在."));
     }
 
+    @Autowired
+    private ImLiveRoomPurviewService imLiveRoomPurviewService;
+
     /**
      * 测试
      */
     public Map<String, Object> test(String roomUid) {
+//        Map<String, Object> map = new HashMap<>();
+//        TenantContextHolder.setTenantId(1);
+//        map.put("roomUid", roomUid);
+//        map.put("groupIds", "22053019304300001,1141,1");
+//        map.put("subjectIds", "2,5,4");
+//        PageInfo<SysUserDto> sysUserDtoPageInfo = imLiveRoomPurviewService.selectRoomPurviewStudent(map);
+//        System.out.println(sysUserDtoPageInfo);
+
         //test
         Map<String, Object> result = new HashMap<>();
         //校验房间心跳是否过期没续租

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

@@ -0,0 +1,305 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.ImLiveRoomPurviewDao;
+import com.ym.mec.biz.dal.dto.SysUserDto;
+import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoom;
+import com.ym.mec.biz.dal.entity.ImLiveRoomPurview;
+import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.enums.TemplateTypeEnum;
+import com.ym.mec.biz.service.ImLiveBroadcastRoomService;
+import com.ym.mec.biz.service.ImLiveRoomPurviewService;
+import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
+import com.ym.mec.common.page.WrapperUtil;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import com.ym.mec.util.excel.POIUtil;
+import com.ym.mec.util.ini.IniFileUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 直播间的观看权限表(ImLiveRoomPurview)表服务实现类
+ *
+ * @author hgw
+ * @since 2022-06-08 09:43:48
+ */
+@Service("imLiveRoomPurviewService")
+public class ImLiveRoomPurviewServiceImpl extends ServiceImpl<ImLiveRoomPurviewDao, ImLiveRoomPurview> implements ImLiveRoomPurviewService {
+
+    private final static Logger log = LoggerFactory.getLogger(ImLiveRoomPurviewServiceImpl.class);
+
+    @Autowired
+    private StudentService studentService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private ImLiveBroadcastRoomService imLiveBroadcastRoomService;
+
+    public ImLiveRoomPurviewDao getDao() {
+        return this.baseMapper;
+    }
+
+    /**
+     * 批量添加/根据查询条件添加房间观看权限
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - subjectId 声部ID
+     *              <p> - organIds 分部ID
+     *              <p> - groupIds 群聊ID
+     *              <p> - teamIds 乐团ID
+     *              <p> - schoolIds 学校id/合作单位id
+     *              <p> - roomUid 直播间UID
+     */
+    public void addByCondition(Map<String, Object> param) {
+        String roomUid = WrapperUtil.toStr(param, "roomUid", "房间uid不能为空");
+        param.put("tenantId", TenantContextHolder.getTenantId());
+        //必需有一个参数条件，要不然数据太多了
+        this.checkParam(param, "search", "subjectId", "organIds", "groupIds", "teamIds", "schoolIds");
+        //根据条件查询学员
+        List<SysUserDto> studentList = baseMapper.selectRoomPurviewStudent(param);
+        if (CollectionUtils.isEmpty(studentList)) {
+            throw new BizException("没有查询到人员信息");
+        }
+        Stream<Integer> userIdList = studentList.stream().map(SysUserDto::getUserId).map(Long::intValue);
+        //添加学员
+        batchStudentInsert(userIdList, roomUid);
+    }
+
+    /**
+     * 校验条件，必需有一个参数条件
+     *
+     * @param param 参数
+     * @param keys  参数key
+     */
+    private void checkParam(Map<String, Object> param, String... keys) {
+        boolean checkVal = false;
+        for (String key : keys) {
+            String val = WrapperUtil.toStr(param, key);
+            if (StringUtils.isNotBlank(val)) {
+                checkVal = true;
+            }
+        }
+        if(!checkVal){
+            throw new BizException("必需要有一个查询条件");
+        }
+    }
+
+    /**
+     * 指定多个学员id添加观看权限数据
+     *
+     * @param ids     bizId
+     * @param roomUid 直播间UID
+     */
+    @Override
+    public void add(String ids, String roomUid) {
+        Optional.ofNullable(roomUid).orElseThrow(() -> new BizException("房间uid不能为空"));
+        Optional.ofNullable(ids)
+                .filter(WrapperUtil.StrPredicate)
+                .orElseThrow(() -> new BizException("请选择要删除的数据"));
+        //查询房间类型
+        ImLiveBroadcastRoom room = imLiveBroadcastRoomService.getOne(Wrappers.<ImLiveBroadcastRoom>lambdaQuery()
+                .eq(ImLiveBroadcastRoom::getRoomUid, roomUid));
+        if (Objects.isNull(room)) {
+            throw new BizException("房间不存在");
+        }
+        if (Objects.nonNull(room.getPopularizeType()) && Objects.equals(room.getPopularizeType(), ImLiveBroadcastRoom.ALL)) {
+            throw new BizException("该直播间为公开类型的直播间，不能添加观看权限");
+        }
+        //添加学员
+        List<Integer> userIdList = WrapperUtil.splitToIntList(ids);
+        if (CollectionUtils.isEmpty(userIdList)) {
+            return;
+        }
+        batchStudentInsert(userIdList.stream(), roomUid);
+    }
+
+    private void batchStudentInsert(Stream<Integer> stream, String roomUid) {
+        if (Objects.isNull(stream)) {
+            return;
+        }
+        Date date = new Date();
+        Integer userId = getSysUser().getId();
+        List<ImLiveRoomPurview> collect = stream.map(id -> {
+            ImLiveRoomPurview imLiveRoomPurview = new ImLiveRoomPurview();
+            imLiveRoomPurview.setRoomUid(roomUid);
+            imLiveRoomPurview.setUserId(id);
+            imLiveRoomPurview.setType("STUDENT");
+            imLiveRoomPurview.setCreatedBy(userId);
+            imLiveRoomPurview.setCreatedTime(date);
+            return imLiveRoomPurview;
+        }).collect(Collectors.toList());
+        Lists.partition(collect, 100).forEach(l -> baseMapper.insertBatch(l));
+    }
+
+    /**
+     * 删除观看权限数据
+     *
+     * @param ids     bizId
+     * @param roomUid 直播间UID
+     */
+    @Override
+    public void delete(String ids, String roomUid) {
+        Optional.ofNullable(roomUid).orElseThrow(() -> new BizException("房间uid不能为空"));
+        Optional.ofNullable(ids).orElseThrow(() -> new BizException("请选择要删除的数据"));
+        List<Integer> userIdList = WrapperUtil.splitToIntList(ids);
+        this.remove(Wrappers.<ImLiveRoomPurview>lambdaQuery()
+                .in(ImLiveRoomPurview::getUserId, userIdList)
+                .eq(ImLiveRoomPurview::getRoomUid, roomUid));
+    }
+
+    /**
+     * 查询学员列表-观看权限
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - subjectId 声部ID
+     *              <p> - organIds 分部ID
+     *              <p> - groupIds 群聊ID
+     *              <p> - teamIds 乐团ID
+     *              <p> - schoolIds 学校id/合作单位id
+     *              <p> - roomUid 直播间UID
+     *              <p> -page 页数
+     *              <p> -rows 每页数量
+     */
+    @Override
+    public PageInfo<SysUserDto> queryStudent(Map<String, Object> param) {
+        WrapperUtil.toStr(param, "roomUid", "房间uid不能为空");
+        param.put("inExist", 1);
+        param.put("tenantId", TenantContextHolder.getTenantId());
+        Page<SysUserDto> pageInfo = PageUtil.getPageInfo(param);
+        return PageUtil.pageInfo(baseMapper.selectRoomPurviewStudent(pageInfo, param));
+    }
+
+    /**
+     * 选择-观看权限-查询学员列表
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - subjectId 声部ID
+     *              <p> - organIds 分部ID
+     *              <p> - groupIds 群聊ID
+     *              <p> - teamIds 乐团ID
+     *              <p> - schoolIds 学校id/合作单位id
+     *              <p> - roomUid 直播间UID
+     *              <p> -page 页数
+     *              <p> -rows 每页数量
+     */
+    @Override
+    public PageInfo<SysUserDto> selectRoomPurviewStudent(Map<String, Object> param) {
+        WrapperUtil.toStr(param, "roomUid", "房间uid不能为空");
+        param.put("tenantId", TenantContextHolder.getTenantId());
+        Page<SysUserDto> pageInfo = PageUtil.getPageInfo(param);
+        return PageUtil.pageInfo(baseMapper.selectRoomPurviewStudent(pageInfo, param));
+    }
+
+    /**
+     * 选择-观看权限-群聊列表
+     *
+     * @param param 参数
+     *              <p> - search 搜索关键字
+     *              <p> - roomUid 直播间UID
+     *              <p> - groupType 群类型
+     */
+    @Override
+    public PageInfo<ImGroup> selectRoomPurviewGroup(Map<String, Object> param) {
+        //查询当前登录人分部
+        SysUser sysUser = getSysUser();
+        param.put("userId", sysUser.getId());
+        Page<ImGroup> pageInfo = PageUtil.getPageInfo(param);
+        return PageUtil.pageInfo(baseMapper.selectRoomPurviewGroup(pageInfo, param));
+    }
+
+    /**
+     * 导入观看权限-人员n
+     */
+    @Override
+    public String importPurviewUser(MultipartFile file, String roomUid) throws Exception {
+        Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(
+                new ByteArrayInputStream(file.getBytes()), 0, file.getOriginalFilename());
+        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
+        Map<String, String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.LIVE_ROOM_PURVIEW_USER.getMsg());
+        List<Integer> userIdList = new ArrayList<>();
+        Map<Integer, Object> userIdMap = new HashMap<>();
+        Integer id = getSysUser().getId();
+        Date now = new Date();
+        Integer tenantId = TenantContextHolder.getTenantId();
+        for (String e : sheetsListMap.keySet()) {
+            List<Map<String, Object>> sheet = sheetsListMap.get(e);
+            for (Map<String, Object> row : sheet) {
+                if (row.size() == 0) {
+                    continue;
+                }
+                for (String s : row.keySet()) {
+                    if (!columns.containsKey(s)) {
+                        continue;
+                    }
+                    if (columns.get(s).equals("userId")) {
+                        if (null == row.get(s) || StringUtils.isBlank(row.get(s).toString())) {
+                            log.error("导入异常：{}不可为空", s);
+                            continue;
+                        }
+                        Integer userId = Integer.valueOf(row.get(s).toString());
+                        if (Objects.nonNull(userIdMap.get(userId))) {
+                            continue;
+                        }
+                        Student student = studentService.get(userId);
+                        if (Objects.isNull(student)) {
+                            throw new BizException("导入异常：编号 " + userId + " 的用户不存在");
+                        }
+                        if (!Objects.equals(student.getTenantId(), tenantId)) {
+                            throw new BizException("导入异常：编号 " + userId + " 的用户不是该机构的学员");
+                        }
+                        userIdList.add(userId);
+                        userIdMap.put(userId, userId);
+                    }
+                }
+            }
+        }
+        try {
+            userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+            List<ImLiveRoomPurview> purviewList = userIdList.stream()
+                    .map(userId -> {
+                        ImLiveRoomPurview obj = new ImLiveRoomPurview();
+                        obj.setUserId(userId);
+                        obj.setRoomUid(roomUid);
+                        obj.setType("STUDENT");
+                        obj.setCreatedBy(id);
+                        obj.setCreatedTime(now);
+                        return obj;
+                    }).collect(Collectors.toList());
+            Lists.partition(purviewList, 100).forEach(list -> baseMapper.insertBatch(list));
+        } catch (Exception ex) {
+            throw new BizException("导入数据出错:" + ex, ex);
+        }
+        return "成功导入 " + userIdList.size() + "条";
+    }
+
+    private SysUser getSysUser() {
+        //修改机构基础信息
+        return Optional.ofNullable(sysUserFeignService.queryUserInfo())
+                .orElseThrow(() -> new BizException("用户不存在."));
+    }
+}
+

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

@@ -88,23 +88,7 @@ public class ImLiveRoomReservationServiceImpl extends ServiceImpl<ImLiveRoomRese
         pageInfo.setDesc("a.created_time_");
         param.put("userId", user.getId());
         param.put("tenantId", TenantContextHolder.getTenantId());
-        //查询该学员 所属分部
-        Integer organId = user.getOrganId();
-        if (Objects.nonNull(organId)) {
-            param.put("organId", organId);
-        }
-        //合作单位
-        Student student = studentService.get(user.getId());
-        if (Objects.nonNull(student) && Objects.nonNull(student.getCooperationOrganId())) {
-            param.put("schoolId", student.getCooperationOrganId());
-        }
-        //乐团
-        String teamIds = baseMapper.queryMusicGroupIds(user.getId());
-        if (StringUtils.isNotBlank(teamIds)) {
-            param.put("teamIds", teamIds);
-        }
-        IPage<ImLiveBroadcastRoomVo> page = baseMapper.queryPageStudent(pageInfo, param);
-        return PageUtil.pageInfo(page);
+        return PageUtil.pageInfo(baseMapper.queryPageStudent(pageInfo, param));
     }
 
     /**

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

@@ -93,9 +93,9 @@ public class PlatformProductServiceImpl extends ServiceImpl<PlatformProductDao,
     @Transactional(rollbackFor = Exception.class)
     public void checkUpdateRole(String newMenuIds, String oldMenuIds, Map<Integer, Integer> map) {
         //需要添加的菜单id
-        List<Integer> newList = getList(newMenuIds);
+        List<Integer> newList = WrapperUtil.splitToIntList(newMenuIds);
         //需要删除的菜单id
-        List<Integer> oldList = getList(oldMenuIds);
+        List<Integer> oldList = WrapperUtil.splitToIntList(oldMenuIds);
         //合并修改权限
         opsRoleMenu(map, newList, oldList);
     }
@@ -125,17 +125,6 @@ public class PlatformProductServiceImpl extends ServiceImpl<PlatformProductDao,
         });
     }
 
-    private List<Integer> getList(String str) {
-        List<String> strings = Optional.ofNullable(str).map(WrapperUtil::toList).orElse(null);
-        if (CollectionUtils.isEmpty(strings)) {
-            return null;
-        }
-        return strings.stream()
-                .distinct()
-                .map(WrapperUtil::toInt)
-                .collect(Collectors.toList());
-    }
-
     /**
      * 根据多个id 查询出机构的id 和机构管理员id
      *

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

@@ -16,9 +16,6 @@
         <result column="room_state_" jdbcType="INTEGER" property="roomState"/>
         <result column="popularize_" jdbcType="INTEGER" property="popularize"/>
         <result column="popularize_type_" jdbcType="VARCHAR" property="popularizeType"/>
-        <result column="popularize_org_ids_" jdbcType="VARCHAR" property="popularizeOrgIds"/>
-        <result column="popularize_school_ids_" jdbcType="VARCHAR" property="popularizeSchoolIds"/>
-        <result column="popularize_team_ids_" jdbcType="VARCHAR" property="popularizeTeamIds"/>
         <result column="created_by_" jdbcType="INTEGER" property="createdBy"/>
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="updated_by_" jdbcType="INTEGER" property="updatedBy"/>
@@ -29,20 +26,18 @@
             parameterType="com.ym.mec.biz.dal.entity.ImLiveBroadcastRoom">
         insert into im_live_broadcast_room(tenant_id_, speaker_id_, room_uid_, room_title_, live_start_time_,
         live_end_time_, live_remark_, pre_template_, room_config_, live_state_, room_state_,
-        popularize_, popularize_type_,popularize_org_ids_,popularize_school_ids_,popularize_team_ids_,
-        created_by_, created_time_, updated_by_, updated_time_)
+        popularize_, popularize_type_, created_by_, created_time_, updated_by_, updated_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.tenantId}, #{entity.speakerId}, #{entity.roomUid}, #{entity.roomTitle}, #{entity.liveStartTime},
             #{entity.liveEndTime}, #{entity.liveRemark}, #{entity.preTemplate}, #{entity.roomConfig},
             #{entity.liveState}, #{entity.roomState}, #{entity.popularize},
-            #{entity.popularizeType},#{entity.popularizeOrgIds},#{entity.popularizeSchoolIds},#{entity.popularizeTeamIds},
-            #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy},#{entity.updatedTime})
+            #{entity.popularizeType}, #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy},#{entity.updatedTime})
         </foreach>
     </insert>
 
     <select id="queryPage" resultType="com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo">
-        select a.id_ AS id,
+        select distinct a.id_ AS id,
         a.tenant_id_ AS tenantId,
         t.name_ AS tenantName,
         t.logo_ AS tenantLogo,
@@ -60,31 +55,8 @@
         a.pre_template_ AS preTemplate,
         a.room_config_ AS roomConfig,
         a.popularize_ AS popularize,
-        a.popularize_type_ AS popularizeType,
-        a.popularize_org_ids_ AS popularizeOrgIds,
-        a.popularize_school_ids_ AS popularizeSchoolIds,
-        a.popularize_team_ids_ AS popularizeTeamIds
-        from (
-        select *
-        from im_live_broadcast_room
-        <if test="param.allRoom == null">
-            where popularize_type_ = 'ALL'
-        </if>
-        <if test="param.organIds != null">
-            union all
-            select *
-            from im_live_broadcast_room as a
-            where popularize_type_ in ( 'ORGAN', 'TEAM')
-            and INTE_ARRAY(a.popularize_org_ids_, #{param.organIds}) = 1
-        </if>
-        <if test="param.schoolIds != null">
-            union all
-            select *
-            from im_live_broadcast_room as a
-            where popularize_type_ = 'SCHOOL'
-            and INTE_ARRAY(a.popularize_school_ids_, #{param.schoolIds}) = 1
-        </if>
-        ) as a
+        a.popularize_type_ AS popularizeType
+        from im_live_broadcast_room as a
         left join tenant_info AS t on a.tenant_id_ = t.id_
         left join sys_user AS b on a.speaker_id_ = b.id_
         left join sys_user AS c on a.created_by_ = c.id_
@@ -114,20 +86,10 @@
             <if test="param.popularize != null">
                 and a.popularize_ = #{param.popularize}
             </if>
+            <if test="param.speakerId != null">
+                and  a.speaker_id_ = #{param.speakerId}
+            </if>
         </where>
-
-    </select>
-
-    <select id="queryUserPageByTenantId" resultType="map">
-        SELECT id_, username_
-        FROM sys_user
-        WHERE tenant_id_ = 1
-          and user_type_ = 'STUDENT'
-          and lock_flag_ = 0
-          and del_flag_ = 0
-          and is_super_admin_ = 0
-          and username_ is not null
-          and username_ != ''
     </select>
 
     <select id="queryBaseUserInfo" resultType="com.ym.mec.biz.dal.vo.BaseRoomUserVo">

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

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ym.mec.biz.dal.dao.ImLiveRoomPurviewDao">
+    <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.ImLiveRoomPurview">
+        <id column="id_" jdbcType="INTEGER" property="id"/>
+        <result column="room_uid_" jdbcType="VARCHAR" property="roomUid"/>
+        <result column="user_id_" jdbcType="VARCHAR" property="userId"/>
+        <result column="type_" jdbcType="VARCHAR" property="type"/>
+        <result column="created_by_" jdbcType="INTEGER" property="createdBy"/>
+        <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id_
+        , room_uid_, user_id_, type_, created_by_, created_time_
+    </sql>
+
+    <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ym.mec.biz.dal.entity.ImLiveRoomPurview">
+        insert into im_live_room_purview(room_uid_, user_id_, type_, created_by_, created_time_)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.roomUid}, #{entity.userId}, #{entity.type}, #{entity.createdBy}, #{entity.createdTime})
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        created_by_ = VALUES(created_by_),
+        created_time_ = VALUES(created_time_)
+    </insert>
+
+    <select id="selectRoomPurviewStudent" parameterType="map" resultType="com.ym.mec.biz.dal.dto.SysUserDto">
+        SELECT distinct
+        s.user_id_ userId,
+        su.username_ username,
+        su.phone_ phone,
+        o.name_ organName,
+        sb.name_ subjectName
+        FROM student s
+        <choose>
+            <when test="param.groupIds != null">
+                INNER JOIN
+            </when>
+            <otherwise>
+                LEFT JOIN
+            </otherwise>
+        </choose>
+                (select
+                     b.user_id_,
+                     replace(group_concat(a.name_,'|'),',','')  imGroupName,
+                     group_concat( a.id_ ) as im_group_id_
+                  from im_group a
+                  left join im_group_member b on a.id_ = b.im_group_id_
+                 <where>
+                     <if test="param.groupIds != null">
+                         and find_in_set(a.id_, #{param.groupIds})
+                     </if>
+                 </where>
+        group by b.user_id_) gm on s.user_id_ = gm.user_id_
+        LEFT JOIN sys_user su ON su.id_ = s.user_id_
+        LEFT JOIN organization o ON o.id_ = su.organ_id_
+        LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
+        LEFT JOIN cooperation_organ co on co.organ_id_ = o.id_
+        <choose>
+            <when test="param.teamIds != null">
+                INNER JOIN
+            </when>
+            <otherwise>
+                LEFT JOIN
+            </otherwise>
+        </choose>
+            (select
+                user_id_,
+                replace(group_concat(a.name_,'|'),',','')  musicGroupName
+                from
+                music_group a left join
+                student_registration b  on a.id_ = b.music_group_id_
+                where b.music_group_status_ != 'QUIT'
+                <if test="param.teamIds != null">
+                     and find_in_set(a.id_ ,#{param.teamIds})
+                </if>
+        group by b.user_id_) sr on sr.user_id_ = s.user_id_
+        <where>
+            <if test="param.tenantId != null ">
+                AND s.tenant_id_ = #{param.tenantId}
+            </if>
+            <choose>
+                <when test="param.inExist != null ">
+                    AND s.user_id_ in (select user_id_ from im_live_room_purview where room_uid_ = #{param.roomUid})
+                </when>
+                <otherwise>
+                    AND s.user_id_ not in (select user_id_ from im_live_room_purview where room_uid_ = #{param.roomUid})
+                </otherwise>
+            </choose>
+            <if test="param.organIds != null and param.organIds != ''">
+                AND FIND_IN_SET(su.organ_id_,#{param.organIds})
+            </if>
+            <if test="param.subjectId != null">
+                AND FIND_IN_SET(s.subject_id_list_,#{param.subjectId})
+            </if>
+            <if test="param.schoolIds != null">
+                AND FIND_IN_SET(s.cooperation_organ_id_ ,#{param.schoolIds})
+            </if>
+            <if test="param.search != null ">
+                AND (
+                s.`user_id_` LIKE CONCAT('%', #{param.search},'%')
+                or su.phone_ like concat('%',#{param.search},'%')
+                or su.username_ like concat('%',#{param.search},'%')
+                )
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.ym.mec.biz.dal.entity.ImGroup" id="ImGroup">
+        <result column="id_" property="id" />
+        <result column="name_" property="name" />
+        <result column="introduce_" property="introduce" />
+        <result column="member_num_" property="memberNum" />
+        <result column="memo_" property="memo" />
+        <result column="tags_" property="tags" />
+        <result column="img_" property="img" />
+        <result column="type_" property="type" />
+        <result column="group_type_" property="groupType" />
+        <result column="create_time_" property="createTime" />
+        <result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
+    </resultMap>
+
+    <select id="selectRoomPurviewGroup" parameterType="map" resultMap="ImGroup">
+        select distinct a.*
+        from im_group as a
+                 inner join im_group_member b on a.id_ = b.im_group_id_
+        where b.user_id_ = (param.userId)
+        <if test="param.search != null and search != ''">
+            AND (a.name_ like concat('%',#{param.search},'%') or a..tags_ like concat('%',#{param.search},'%'))
+        </if>
+        <if test="param.groupType != null">
+            AND a.group_type_ = #{param.groupType}
+        </if>
+    </select>
+
+</mapper>

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

@@ -24,7 +24,7 @@
     </insert>
 
     <select id="queryPageStudent" resultType="com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo">
-        select a.id_ AS id,
+        select distinct a.id_ AS id,
         a.tenant_id_ AS tenantId,
         t.name_ AS tenantName,
         t.logo_ AS tenantLogo,
@@ -49,24 +49,10 @@
         from im_live_broadcast_room
         where popularize_type_ = 'ALL'
         union all
-        select *
-        from im_live_broadcast_room
-        where popularize_type_ = 'ORGAN'
-        AND FIND_IN_SET(#{param.organId}, popularize_org_ids_)
-        <if test="param.schoolId != null">
-            union all
-            select *
-            from im_live_broadcast_room
-            where popularize_type_ = 'SCHOOL'
-            AND FIND_IN_SET(#{param.schoolId}, popularize_school_ids_)
-        </if>
-        <if test="param.teamIds != null">
-            union all
-            select *
-            from im_live_broadcast_room as a
-            where popularize_type_ = 'TEAM'
-            and INTE_ARRAY(a.popularize_team_ids_, #{param.teamIds}) = 1
-        </if>
+        select a.*
+        from im_live_broadcast_room as a
+        inner join im_live_room_purview as b on a.room_uid_ = b.room_uid_
+        where b.user_id_ = #{param.userId}
         ) as a
         left join tenant_info AS t on a.tenant_id_ = t.id_
         left join sys_user AS b on a.speaker_id_ = b.id_

mec-common/common-core/src/main/java/com/ym/mec/common/page/WrapperUtil.java

@@ -146,7 +146,7 @@ public class WrapperUtil<T> {
                 .filter(StrPredicate);
     }
 
-    public static <S, O> boolean strParamIsNull(Map<S, O>  map, S str) {
+    public static <S, O> boolean strParamIsNull(Map<S, O> map, S str) {
         return StrPredicate.test(WrapperUtil.toStr(map, str));
     }
 
@@ -184,6 +184,24 @@ public class WrapperUtil<T> {
                 .collect(Collectors.toList());
     }
 
+    public static List<Integer> splitToIntList(String str) {
+        List<String> strList = WrapperUtil.toList(str);
+        if (CollectionUtils.isEmpty(strList)) {
+            return null;
+        }
+        return strToIntList(strList);
+    }
+
+    public static List<Integer> strToIntList(List<String> strList) {
+        if (CollectionUtils.isEmpty(strList)) {
+            return null;
+        }
+        return strList.stream()
+                .distinct()
+                .map(WrapperUtil::toInt)
+                .collect(Collectors.toList());
+    }
+
     /**
      * 全部有值则为true
      *

mec-im/src/main/java/com/ym/controller/LiveRoomController.java

@@ -74,4 +74,14 @@ public class LiveRoomController {
     public boolean checkOnline(String userId) {
         return liveRoomService.checkOnline(userId);
     }
+
+    /**
+     * https://doc.rongcloud.cn/imserver/server/v1/chatroom/status
+     */
+    @ApiOperation("聊天室状态同步")
+    @RequestMapping(value = "/syncChatRoomStatus")
+    public void syncChatRoomStatus(@RequestBody String body) {
+        log.info("syncChatRoomStatus body：{}", body);
+    }
+    
 }

mec-student/src/main/java/com/ym/mec/student/controller/ImLiveBroadcastRoomController.java

@@ -4,14 +4,14 @@ import com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo;
 import com.ym.mec.biz.service.ImLiveBroadcastRoomService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.entity.ImUserState;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 直播房间管理表(ImLiveBroadcastRoom)表控制层
@@ -29,6 +29,12 @@ public class ImLiveBroadcastRoomController extends BaseController {
     @Resource
     private ImLiveBroadcastRoomService imLiveBroadcastRoomService;
 
+    @ApiOperation("学生端-查询房间信息")
+    @GetMapping("/queryRoomInfo")
+    public HttpResponseResult<ImLiveBroadcastRoomVo> queryRoomInfo(@ApiParam(value = "房间uid", required = true) String roomUid) {
+        return succeed(imLiveBroadcastRoomService.queryRoomInfo(roomUid));
+    }
+
     @ApiOperation("查询该机构目前推广的直播间")
     @GetMapping(value = "/queryPopularizeRoom")
     public HttpResponseResult<ImLiveBroadcastRoomVo> queryPopularizeRoom() {
@@ -42,5 +48,48 @@ public class ImLiveBroadcastRoomController extends BaseController {
         return succeed(imLiveBroadcastRoomService.queryRoomAndCheck(roomUid, userId, 1));
     }
 
+    @ApiOperation("同步点赞数量")
+    @GetMapping("/syncLike")
+    public HttpResponseResult<Object> syncLike(@ApiParam(value = "房间uid", required = true) String roomUid,
+                                               @ApiParam(value = "点赞数", required = true) Integer likeNum) {
+        imLiveBroadcastRoomService.syncLike(roomUid, likeNum);
+        return succeed();
+    }
+
+    @PostMapping("/quitRoom")
+    public HttpResponseResult<Object> quitRoom(@RequestBody List<ImUserState> userState) {
+        imLiveBroadcastRoomService.opsRoom(userState);
+        return succeed();
+    }
+
+    @ApiOperation("主讲人进入房间")
+    @GetMapping("/speakerJoinRoom")
+    public HttpResponseResult<ImLiveBroadcastRoomVo> speakerJoinRoom(String roomUid) {
+        return succeed(imLiveBroadcastRoomService.speakerJoinRoom(roomUid));
+    }
+
+    @ApiOperation("学生-进入房间")
+    @GetMapping("/joinRoom")
+    public HttpResponseResult<Object> joinRoom(String roomUid, Integer userId) {
+        imLiveBroadcastRoomService.joinRoom(roomUid, userId);
+        return succeed();
+    }
+
+    @ApiOperation("开启/关闭直播的录像")
+    @GetMapping("/opsLiveVideo")
+    public HttpResponseResult<Object> opsLiveVideo(@ApiParam(value = "房间uid", required = true) String roomUid,
+                                                   @ApiParam(value = "用户id", required = true) Integer userId,
+                                                   @ApiParam(value = "type 1:开始直播-开始录像     2:关闭直播关闭录像", required = true) Integer type) {
+        if (type == 1) {
+            imLiveBroadcastRoomService.startLive(roomUid, userId);
+        } else if (type == 2) {
+            imLiveBroadcastRoomService.closeLive(roomUid, userId);
+        } else {
+            failed("type参数错误");
+        }
+        return succeed();
+    }
+
+
 }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherImLiveBroadcastRoomController.java

@@ -0,0 +1,126 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.dal.dto.RoomReservationUserSearch;
+import com.ym.mec.biz.dal.page.LiveRoomGoodsOrderQueryInfo;
+import com.ym.mec.biz.dal.vo.BaseRoomUserVo;
+import com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo;
+import com.ym.mec.biz.dal.vo.LiveRoomGoodsOrderVo;
+import com.ym.mec.biz.dal.vo.RoomReservationUserVo;
+import com.ym.mec.biz.service.ImLiveBroadcastRoomService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.entity.ImUserState;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 直播房间管理表(ImLiveBroadcastRoom)表控制层
+ *
+ * @author hgw
+ * @since 2022-02-17 20:52:04
+ */
+@Api(tags = "直播房间管理表")
+@RestController
+@RequestMapping("/imLiveBroadcastRoom")
+public class TeacherImLiveBroadcastRoomController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private ImLiveBroadcastRoomService imLiveBroadcastRoomService;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
+            @ApiImplicitParam(name = "liveState", dataType = "Integer", value = "直播状态 0未开始 1开始 2结束"),
+            @ApiImplicitParam(name = "startTime", dataType = "String", value = "开始时间"),
+            @ApiImplicitParam(name = "endTime", dataType = "String", value = "结束时间"),
+            @ApiImplicitParam(name = "popularize", dataType = "Integer", value = "是否在首页推广 0否 1是"),
+            @ApiImplicitParam(name = "speakerId", dataType = "Integer", value = "老师ID"),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("分页查询直播间列表")
+    @PostMapping("/queryPage")
+    public HttpResponseResult<PageInfo<ImLiveBroadcastRoomVo>> queryPage(@RequestBody Map<String, Object> param) {
+        param.put("os", "teacher");
+        return succeed(imLiveBroadcastRoomService.queryPage(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
+            @ApiImplicitParam(name = "subjectId", dataType = "Integer", value = "声部id"),
+            @ApiImplicitParam(name = "organId", dataType = "Integer", value = "分部id"),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("直播间预约人员信息")
+    @PostMapping("/query/roomUser")
+    public HttpResponseResult<PageInfo<RoomReservationUserVo>> queryRoomUser(@RequestBody @Valid RoomReservationUserSearch query) {
+        return succeed(imLiveBroadcastRoomService.queryRoomUser(query));
+    }
+
+    @ApiOperation("查询房间信息并校验房间是否合规")
+    @GetMapping("/queryRoom")
+    public HttpResponseResult<ImLiveBroadcastRoomVo> queryRoomAndCheck(@ApiParam(value = "房间uid", required = true) String roomUid,
+                                                                       @ApiParam(value = "用户id", required = true) Integer userId) {
+        return succeed(imLiveBroadcastRoomService.queryRoomAndCheck(roomUid, userId, 2));
+    }
+
+    @ApiOperation("关闭直播间")
+    @GetMapping(value = "/roomDestroy/{id}")
+    public HttpResponseResult<Object> roomDestroy(@ApiParam(value = "房间表id", required = true) @PathVariable("id") Integer id) {
+        imLiveBroadcastRoomService.roomDestroy(id);
+        return succeed();
+    }
+
+    @ApiOperation("同步点赞数量")
+    @GetMapping("/syncLike")
+    public HttpResponseResult<Object> syncLike(@ApiParam(value = "房间uid", required = true) String roomUid,
+                                               @ApiParam(value = "点赞数", required = true) Integer likeNum) {
+        imLiveBroadcastRoomService.syncLike(roomUid, likeNum);
+        return succeed();
+    }
+
+    @PostMapping("/quitRoom")
+    public HttpResponseResult<Object> quitRoom(@RequestBody List<ImUserState> userState) {
+        imLiveBroadcastRoomService.opsRoom(userState);
+        return succeed();
+    }
+
+    @ApiOperation("主讲人进入房间")
+    @GetMapping("/speakerJoinRoom")
+    public HttpResponseResult<ImLiveBroadcastRoomVo> speakerJoinRoom(String roomUid) {
+        return succeed(imLiveBroadcastRoomService.speakerJoinRoom(roomUid));
+    }
+
+    @GetMapping("/test")
+    public Object test(String roomUid) {
+        return imLiveBroadcastRoomService.test(roomUid);
+    }
+
+    @GetMapping("/shareGroup")
+    public HttpResponseResult<Object> shareGroup(@ApiParam(value = "房间uid", required = true) String roomUid,
+                                                 @ApiParam(value = "群编号", required = true) String groupIds) {
+        imLiveBroadcastRoomService.shareGroup(roomUid, groupIds);
+        return succeed();
+    }
+
+    @ApiOperation("获取房间人员")
+    @GetMapping("/queryRoomUserInfo")
+    public HttpResponseResult<List<BaseRoomUserVo>> queryRoomUserInfo(@ApiParam(value = "房间uid", required = true) String roomUid) {
+        return succeed(imLiveBroadcastRoomService.queryRoomLimitOnlineUserInfo(roomUid));
+    }
+
+    @ApiOperation("查询直播间商品订单列表")
+    @GetMapping("/queryLiveRoomGoodsOrderList")
+    public HttpResponseResult<PageInfo<LiveRoomGoodsOrderVo>> queryLiveRoomGoodsOrderList(LiveRoomGoodsOrderQueryInfo queryInfo) {
+        return succeed(imLiveBroadcastRoomService.queryLiveRoomGoodsOrderList(queryInfo));
+    }
+}
+

mec-web/src/main/java/com/ym/mec/web/controller/ImLiveBroadcastRoomController.java

@@ -87,7 +87,7 @@ public class ImLiveBroadcastRoomController extends BaseController {
         return succeed(imLiveBroadcastRoomService.queryRoomAndCheck(roomUid, userId, null));
     }
 
-    @ApiOperation("查询房间信息")
+    @ApiOperation("学生端-查询房间信息")
     @GetMapping("/queryRoomInfo")
     public HttpResponseResult<ImLiveBroadcastRoomVo> queryRoomInfo(@ApiParam(value = "房间uid", required = true) String roomUid) {
         return succeed(imLiveBroadcastRoomService.queryRoomInfo(roomUid));
@@ -177,7 +177,7 @@ public class ImLiveBroadcastRoomController extends BaseController {
         return succeed(imLiveBroadcastRoomService.speakerJoinRoom(roomUid));
     }
 
-    @ApiOperation("进入房间")
+    @ApiOperation("学生-进入房间")
     @GetMapping("/joinRoom")
     public HttpResponseResult<Object> joinRoom(String roomUid, Integer userId) {
         imLiveBroadcastRoomService.joinRoom(roomUid, userId);

mec-web/src/main/java/com/ym/mec/web/controller/ImLiveRoomPurviewController.java

@@ -0,0 +1,134 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.dto.SysUserDto;
+import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.service.ImLiveRoomPurviewService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 直播间的观看权限表(ImLiveRoomPurview)表控制层
+ *
+ * @author hgw
+ * @since 2022-06-08 09:43:47
+ */
+@RestController
+@RequestMapping("/imLiveRoomPurview")
+public class ImLiveRoomPurviewController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private ImLiveRoomPurviewService imLiveRoomPurviewService;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
+            @ApiImplicitParam(name = "subjectId", dataType = "String", value = "声部ID"),
+            @ApiImplicitParam(name = "organIds", dataType = "String", value = "分部ID"),
+            @ApiImplicitParam(name = "groupIds", dataType = "String", value = "群聊ID"),
+            @ApiImplicitParam(name = "teamIds", dataType = "String", value = "乐团ID"),
+            @ApiImplicitParam(name = "schoolIds", dataType = "String", value = "学校id/合作单位id"),
+            @ApiImplicitParam(name = "roomUid", dataType = "String", value = "直播间UID", required = true)
+    })
+    @ApiOperation("批量添加/根据查询条件添加房间观看权限")
+    @PostMapping("/addByCondition")
+    @PreAuthorize("@pcs.hasPermissions('imLiveRoomPurview/addByCondition')")
+    public HttpResponseResult<Object> addByCondition(@RequestBody Map<String, Object> param) {
+        imLiveRoomPurviewService.addByCondition(param);
+        return succeed();
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", dataType = "String", value = "学员id逗号分开", required = true),
+            @ApiImplicitParam(name = "roomUid", dataType = "String", value = "直播间UID", required = true),
+    })
+    @ApiOperation("指定多个学员id添加观看权限数据")
+    @GetMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('imLiveRoomPurview/add')")
+    public HttpResponseResult<Object> add(String ids, String roomUid) {
+        imLiveRoomPurviewService.add(ids, roomUid);
+        return succeed();
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", dataType = "String", value = "删除的id，学员id，群id， 逗号分开", required = true),
+            @ApiImplicitParam(name = "roomUid", dataType = "String", value = "直播间UID", required = true),
+    })
+    @ApiOperation("删除观看权限数据")
+    @GetMapping("/delete")
+    @PreAuthorize("@pcs.hasPermissions('imLiveRoomPurview/delete')")
+    public HttpResponseResult<Object> delete(String ids, String roomUid) {
+        imLiveRoomPurviewService.delete(ids, roomUid);
+        return succeed();
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
+            @ApiImplicitParam(name = "subjectId", dataType = "String", value = "声部ID"),
+            @ApiImplicitParam(name = "organIds", dataType = "String", value = "分部ID"),
+            @ApiImplicitParam(name = "groupIds", dataType = "String", value = "群聊ID"),
+            @ApiImplicitParam(name = "teamIds", dataType = "String", value = "乐团ID"),
+            @ApiImplicitParam(name = "schoolIds", dataType = "String", value = "学校id/合作单位id"),
+            @ApiImplicitParam(name = "roomUid", dataType = "String", value = "直播间UID", required = true),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("查询当前直播间观看权限-学员列表")
+    @PostMapping("/queryStudent")
+    @PreAuthorize("@pcs.hasPermissions('imLiveRoomPurview/queryStudent')")
+    public HttpResponseResult<PageInfo<SysUserDto>> queryStudent(@RequestBody Map<String, Object> param) {
+        return succeed(imLiveRoomPurviewService.queryStudent(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
+            @ApiImplicitParam(name = "subjectId", dataType = "String", value = "声部ID"),
+            @ApiImplicitParam(name = "organIds", dataType = "String", value = "分部ID"),
+            @ApiImplicitParam(name = "groupIds", dataType = "String", value = "群聊ID"),
+            @ApiImplicitParam(name = "teamIds", dataType = "String", value = "乐团ID"),
+            @ApiImplicitParam(name = "schoolIds", dataType = "String", value = "学校id/合作单位id"),
+            @ApiImplicitParam(name = "roomUid", dataType = "String", value = "直播间UID", required = true),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("选择列表-观看权限-学员列表")
+    @PostMapping("/selectRoomPurviewStudent")
+    @PreAuthorize("@pcs.hasPermissions('imLiveRoomPurview/selectRoomPurviewStudent')")
+    public HttpResponseResult<PageInfo<SysUserDto>> selectRoomPurviewStudent(@RequestBody Map<String, Object> param) {
+        return succeed(imLiveRoomPurviewService.selectRoomPurviewStudent(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
+            @ApiImplicitParam(name = "groupType", dataType = "String", value = "群类型"),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("选择列表-观看权限-群聊列表")
+    @PostMapping("/selectRoomPurviewGroup")
+    @PreAuthorize("@pcs.hasPermissions('imLiveRoomPurview/selectRoomPurviewGroup')")
+    public HttpResponseResult<PageInfo<ImGroup>> selectRoomPurviewGroup(@RequestBody Map<String, Object> param) {
+        return succeed(imLiveRoomPurviewService.selectRoomPurviewGroup(param));
+    }
+
+    @ApiOperation(value = "导入观看权限-人员")
+    @PostMapping(value = "/importPurviewUser")
+    public HttpResponseResult<String> importPurviewUser(@RequestParam("file") MultipartFile file, String roomUid) throws Exception {
+        String msg = imLiveRoomPurviewService.importPurviewUser(file, roomUid);
+        HttpResponseResult<String> succeed = succeed();
+        succeed.setMsg(msg);
+        return succeed;
+    }
+
+}
+

mec-web/src/main/resources/columnMapper.ini

@@ -76,3 +76,7 @@ ID = id
 老师介绍 = introduction
 教学曲目 = musicContent
 头像地址 = avatar
+
+[直播间用户观看权限表]
+学员编号 = userId
+名称 = userName