update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkRoomResult.java

@@ -20,10 +20,10 @@ public class ImNetworkRoomResult extends ImNetworkRoom {
     private Integer surplusTime;
 
     @ApiModelProperty(value = "房间成员列表，包含当前用户;")
-    private List<ImNetworkRoomMember> roomMemberList;
+    private List<ImNetworkRoomMember> members;
 
     @ApiModelProperty(value = "当前用户")
-    private ImNetworkRoomMember roomMember;
+    private ImNetworkRoomMember userInfo;
 
     @ApiModelProperty(value = "节拍器参数")
     private ImNetworkMetronomeMessage playMidiJson = new ImNetworkMetronomeMessage();
@@ -36,4 +36,7 @@ public class ImNetworkRoomResult extends ImNetworkRoom {
 
     @ApiModelProperty("群组id")
     private String groupId;
+
+    @ApiModelProperty("当前课程所有学员人数")
+    private Integer studentNums;
 }

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

@@ -125,13 +125,13 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         //定时销毁房间
         //初始化房间用户信息
         ImNetworkRoomMember roomMember = imNetworkRoomMemberService.initRoomMember(roomId,sysUser,userRole,!courseSchedule.getMuteAll());
-        joinRoomResult.setRoomMember(roomMember);
+        joinRoomResult.setUserInfo(roomMember);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(now, courseSchedule.getEndTime()));
         //获取房间所有成员
         List<ImNetworkRoomMember> roomMemberList = imNetworkRoomMemberService.queryByRoomId(roomId);
 
-        joinRoomResult.setRoomMemberList(roomMemberList);
+        joinRoomResult.setMembers(roomMemberList);
         //如果是老师，
         if(userRole == RoleEnum.RoleTeacher){
             //重置节拍器数据
@@ -160,6 +160,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         //获取腾讯所需基本信息配置
         joinRoomResult.setRtcRoomConfig(roomService.getRtcRoomConfig(courseSchedule.getServiceProvider(),roomMember));
         joinRoomResult.setGroupId(roomId);
+        joinRoomResult.setStudentNums(studentIds.size());
         return BaseResponse.success(joinRoomResult);
     }
 
@@ -191,13 +192,13 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         //初始化房间用户信息
         ImNetworkRoomMember roomMember = imNetworkRoomMemberService.lambdaQuery().eq(ImNetworkRoomMember::getRoomId,roomId)
                 .eq(ImNetworkRoomMember::getUserId,userId).last("LIMIT 1").one();
-        joinRoomResult.setRoomMember(roomMember);
+        joinRoomResult.setUserInfo(roomMember);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(new Date(), courseSchedule.getEndTime()));
         //获取房间所有成员
         List<ImNetworkRoomMember> roomMemberList = imNetworkRoomMemberService.queryByRoomId(roomId);
 
-        joinRoomResult.setRoomMemberList(roomMemberList);
+        joinRoomResult.setMembers(roomMemberList);
         //如果是老师，
         if(userRole == RoleEnum.RoleTeacher){
             //获取所有学员的伴奏下载详情
@@ -211,6 +212,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         //获取腾讯所需基本信息配置
         joinRoomResult.setRtcRoomConfig(roomService.getRtcRoomConfig(courseSchedule.getServiceProvider(),roomMember));
         joinRoomResult.setGroupId(roomId);
+        joinRoomResult.setStudentNums(courseScheduleStudentPaymentService.lambdaQuery().eq(CourseScheduleStudentPayment::getCourseId,roomId).count());
         return BaseResponse.success(joinRoomResult);
     }