修改分页

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -91,6 +91,6 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
     Set<String> queryCourseScheduleStudent(MyCourseSearch search);
 
     //老师端-课表-日历-用户
-    List<CourseStudent> queryCourseUser(IPage<CourseStudent> page, @Param("param") MyCourseSearch search);
+    List<CourseStudent> queryCourseUser(@Param("param") MyCourseSearch search);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseScheduleService.java

@@ -178,6 +178,6 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
      */
     boolean checkStudentCourseSchedule(Long studentId, Long courseId);
 
-    IPage<CourseStudent> queryCourseUser(IPage<CourseStudent> page, MyCourseSearch search);
+    Map<String,Object> queryCourseUser(MyCourseSearch search);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -736,15 +736,28 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     }
 
     /**
-     * search:  {"classDate":"2022-03-27"}
-     *
      * @Description: 老师端-课表-日历-用户
      * @Author: cy
      * @Date: 2022/4/18
      */
     @Override
-    public IPage<CourseStudent> queryCourseUser(IPage<CourseStudent> page, MyCourseSearch search) {
-        return page.setRecords(baseMapper.queryCourseUser(page, search));
+    public Map<String,Object> queryCourseUser(MyCourseSearch search) {
+        List<CourseStudent> studentList = baseMapper.queryCourseUser(search);
+
+        Map<String, String> sysConfig = new HashMap<>();
+        //提前XX分钟创建/进入陪练课房间时间
+        sysConfig.put("practiceStartTime",sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_PRACTICE_ROOM_MINUTE));
+        //陪练课结束后，XX分钟关闭房间
+        sysConfig.put("practiceEndTime",sysConfigService.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_PRACTICE_ROOM_MINUTE));
+        //提前XX分钟创建/进入直播房间的时间
+        sysConfig.put("liveStartTime",sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_LIVE_ROOM_MINUTE));
+        //直播结束后，XX分钟关闭房间
+        sysConfig.put("liveEndTime",sysConfigService.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_LIVE_ROOM_MINUTE));
+
+        Map map=new HashMap();
+        map.put("sysConfig",sysConfig);
+        map.put("studentList",studentList);
+        return map;
     }
 }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/CourseScheduleController.java

@@ -123,16 +123,15 @@ public class CourseScheduleController extends BaseController {
         return succeed(courseScheduleService.queryCourseSchedule(search));
     }
 
-    @ApiOperation("老师端-课表-日历-用户")
+    @ApiOperation(value = "老师端-课表-日历-用户",notes = "search:{\"classDate\":\"2022-03-27\"}")
     @PostMapping("/queryCourseUser")
-    public HttpResponseResult<PageInfo<CourseStudent>> queryCourseUser(@RequestBody MyCourseSearch search) {
+    public HttpResponseResult<Map<String,Object>> queryCourseUser(@RequestBody MyCourseSearch search) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         search.setTeacherId(user.getId());
-        IPage<CourseStudent> pages = courseScheduleService.queryCourseUser(PageUtil.getPage(search), search);
-        return succeed(PageUtil.pageInfo(pages));
+        return succeed(courseScheduleService.queryCourseUser(search));
     }
 }