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

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是 - 每个机构只能有一个直播间在首页推广")

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

@@ -4942,6 +4942,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			classGroupTeacherMapperService.updateTeacher(practiceGroupId,teacherId, PRACTICE.getCode());
 			classGroupTeacherSalaryDao.updateTeacher(practiceGroupId,teacherId, PRACTICE.getCode());
 			if(courseSchedules == null || courseSchedules.size() == 0){
+				practiceGroupDao.update(practiceGroup);
 				return;
 			}
 			Map<Integer, String> teacherIdMap = new HashMap<>(10);

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

@@ -16,8 +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.dto.SysUserDto;
-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.*;
@@ -119,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:学生端 2:老师端
+     * @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);
     }
@@ -208,10 +207,14 @@ 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());

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

@@ -94,14 +94,14 @@ public class ImLiveRoomPurviewServiceImpl extends ServiceImpl<ImLiveRoomPurviewD
      * @param keys  参数key
      */
     private void checkParam(Map<String, Object> param, String... keys) {
-        String checkVal = null;
+        boolean checkVal = false;
         for (String key : keys) {
             String val = WrapperUtil.toStr(param, key);
             if (StringUtils.isNotBlank(val)) {
-                checkVal = val;
+                checkVal = true;
             }
         }
-        if(StringUtils.isBlank(checkVal)){
+        if(!checkVal){
             throw new BizException("必需要有一个查询条件");
         }
     }

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

@@ -93,8 +93,8 @@
             <if test="param.organIds != null and param.organIds != ''">
                 AND FIND_IN_SET(su.organ_id_,#{param.organIds})
             </if>
-            <if test="param.subjectIds != null">
-                AND FIND_IN_SET(s.subject_id_list_,#{param.subjectIds})
+            <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})

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

@@ -1,6 +1,5 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.biz.dal.dto.ImLiveBroadcastRoomDto;
 import com.ym.mec.biz.dal.dto.RoomReservationUserSearch;
 import com.ym.mec.biz.dal.page.LiveRoomGoodsOrderQueryInfo;
 import com.ym.mec.biz.dal.vo.BaseRoomUserVo;
@@ -12,18 +11,13 @@ 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 com.ym.mec.common.page.WrapperUtil;
 import io.swagger.annotations.*;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 
 /**
  * 直播房间管理表(ImLiveBroadcastRoom)表控制层
@@ -54,6 +48,7 @@ public class TeacherImLiveBroadcastRoomController extends BaseController {
     @ApiOperation("分页查询直播间列表")
     @PostMapping("/queryPage")
     public HttpResponseResult<PageInfo<ImLiveBroadcastRoomVo>> queryPage(@RequestBody Map<String, Object> param) {
+        param.put("os", "teacher");
         return succeed(imLiveBroadcastRoomService.queryPage(param));
     }
 
@@ -70,17 +65,6 @@ public class TeacherImLiveBroadcastRoomController extends BaseController {
         return succeed(imLiveBroadcastRoomService.queryRoomUser(query));
     }
 
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
-            @ApiImplicitParam(name = "subjectId", dataType = "Integer", value = "声部id"),
-            @ApiImplicitParam(name = "organId", dataType = "Integer", value = "分部id"),
-    })
-    @ApiOperation(value = "导出训练营详情")
-    @PostMapping(value = "/exportReservationRoomUser")
-    public void exportReservationRoomUser(@RequestBody RoomReservationUserSearch query, HttpServletResponse response) throws IOException {
-        imLiveBroadcastRoomService.exportReservationRoomUser(query, response);
-    }
-
     @ApiOperation("查询房间信息并校验房间是否合规")
     @GetMapping("/queryRoom")
     public HttpResponseResult<ImLiveBroadcastRoomVo> queryRoomAndCheck(@ApiParam(value = "房间uid", required = true) String roomUid,
@@ -88,11 +72,6 @@ public class TeacherImLiveBroadcastRoomController extends BaseController {
         return succeed(imLiveBroadcastRoomService.queryRoomAndCheck(roomUid, userId, 2));
     }
 
-    /**
-     * 关闭直播间
-     *
-     * @param id 房间表id
-     */
     @ApiOperation("关闭直播间")
     @GetMapping(value = "/roomDestroy/{id}")
     public HttpResponseResult<Object> roomDestroy(@ApiParam(value = "房间表id", required = true) @PathVariable("id") Integer id) {
@@ -100,15 +79,6 @@ public class TeacherImLiveBroadcastRoomController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation("推广直播间-每个机构只能有一个直播间在首页推广")
-    @GetMapping("/opsPopularize")
-    @PreAuthorize("@pcs.hasPermissions('imLiveBroadcastRoom/opsPopularize')")
-    public HttpResponseResult<Object> opsPopularize(@ApiParam(value = "房间id", required = true) Integer id,
-                                                    @ApiParam(value = "是否在首页推广 0否 1是", required = true) Integer popularize) {
-        imLiveBroadcastRoomService.opsPopularize(id, popularize);
-        return succeed();
-    }
-
     @ApiOperation("同步点赞数量")
     @GetMapping("/syncLike")
     public HttpResponseResult<Object> syncLike(@ApiParam(value = "房间uid", required = true) String roomUid,