Merge remote-tracking branch 'origin/master'

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -17,7 +17,7 @@
                 um.id as userId,
                 um.username as username,
                 um.phone as phone,
-                (select  uop.payment_client_ from user_order_payment uop where uop.order_no_ = o.order_sn order by  uop.id_ desc limit 1) as userType
+                o.platform_type as userType
 
         FROM
         oms_order o
@@ -45,6 +45,7 @@
             OR o.receiver_phone LIKE concat("%",#{queryParam.receiverKeyword},"%")
             )
         </if>
+        order by o.id desc
     </select>
     <update id="delivery">
         UPDATE oms_order

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderReturnApplyDao.xml

@@ -40,6 +40,7 @@
             AND (return_name LIKE concat("%",#{queryParam.receiverKeyword},"%")
             OR return_phone LIKE concat("%",#{queryParam.receiverKeyword},"%"))
         </if>
+        order by id desc
     </select>
     <select id="getDetail" resultMap="returnApplyDetailResultMap">
         SELECT

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrder.java

@@ -13,6 +13,9 @@ public class OmsOrder implements Serializable {
 
     private Long couponId;
 
+    @ApiModelProperty("下单平台 STUDENT TEACHER")
+    private String platformType;
+
     @ApiModelProperty(value = "订单编号")
     private String orderSn;
 
@@ -141,6 +144,14 @@ public class OmsOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public String getPlatformType() {
+        return platformType;
+    }
+
+    public void setPlatformType(String platformType) {
+        this.platformType = platformType;
+    }
+
     public Long getId() {
         return id;
     }

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/OmsOrderMapper.xml

@@ -47,6 +47,7 @@
     <result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime" />
     <result column="comment_time" jdbcType="TIMESTAMP" property="commentTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
+    <result column="platform_type" jdbcType="TIMESTAMP" property="platformType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -113,7 +114,7 @@
     integration, growth, promotion_info, bill_type, bill_header, bill_content, bill_receiver_phone, 
     bill_receiver_email, receiver_name, receiver_phone, receiver_post_code, receiver_province, 
     receiver_city, receiver_region, receiver_detail_address, note, confirm_status, delete_status, 
-    use_integration, payment_time, delivery_time, receive_time, comment_time, modify_time,cart_ids
+    use_integration, payment_time, delivery_time, receive_time, comment_time, modify_time,cart_ids,platform_type
   </sql>
   <select id="selectByExample" parameterType="com.yonge.cooleshow.mbg.model.OmsOrderExample" resultMap="BaseResultMap">
     select
@@ -163,7 +164,7 @@
       receiver_detail_address, note, confirm_status, 
       delete_status, use_integration, payment_time, 
       delivery_time, receive_time, comment_time, 
-      modify_time,cart_ids)
+      modify_time,cart_ids,platform_type)
     values (#{memberId,jdbcType=BIGINT}, #{couponId,jdbcType=BIGINT}, #{orderSn,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
       #{payAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL}, #{promotionAmount,jdbcType=DECIMAL}, 
@@ -178,7 +179,7 @@
       #{receiverDetailAddress,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{confirmStatus,jdbcType=INTEGER}, 
       #{deleteStatus,jdbcType=INTEGER}, #{useIntegration,jdbcType=INTEGER}, #{paymentTime,jdbcType=TIMESTAMP}, 
       #{deliveryTime,jdbcType=TIMESTAMP}, #{receiveTime,jdbcType=TIMESTAMP}, #{commentTime,jdbcType=TIMESTAMP}, 
-      #{modifyTime,jdbcType=TIMESTAMP},#{cartIds})
+      #{modifyTime,jdbcType=TIMESTAMP},#{cartIds},#{platformType})
   </insert>
   <insert id="insertSelective" parameterType="com.yonge.cooleshow.mbg.model.OmsOrder">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -318,6 +319,9 @@
       <if test="cartIds != null">
         cart_ids,
       </if>
+      <if test="platformType != null">
+        platform_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="memberId != null">
@@ -452,6 +456,9 @@
       <if test="cartIds != null">
         #{cartIds},
       </if>
+      <if test="platformType != null">
+        #{platformType},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.yonge.cooleshow.mbg.model.OmsOrderExample" resultType="java.lang.Long">
@@ -598,6 +605,9 @@
       <if test="record.cartIds != null">
         cart_ids = #{record.cartIds},
       </if>
+      <if test="record.platformType != null">
+        platform_type = #{record.platformType},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -649,6 +659,7 @@
       receive_time = #{record.receiveTime,jdbcType=TIMESTAMP},
       comment_time = #{record.commentTime,jdbcType=TIMESTAMP},
       cart_ids = #{record.cartIds},
+      platform_type = #{record.platformType},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -787,7 +798,10 @@
         modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
       <if test="cartIds != null">
-        cart_ids = #{cartIds,jdbcType=TIMESTAMP},
+        cart_ids = #{cartIds},
+      </if>
+      <if test="platformType != null">
+        platform_type = #{platformType},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -837,6 +851,7 @@
       receive_time = #{receiveTime,jdbcType=TIMESTAMP},
       comment_time = #{commentTime,jdbcType=TIMESTAMP},
       cart_ids = #{cartIds},
+      platform_type = #{platformType},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/domain/OrderParam.java

@@ -21,6 +21,17 @@ public class OrderParam {
     @ApiModelProperty("被选中的购物车商品ID")
     private List<Long> cartIds;
 
+    @ApiModelProperty("平台类型 STUDENT:学生端  TEACHER:老师端")
+    private String platformType;
+
+    public String getPlatformType() {
+        return platformType;
+    }
+
+    public void setPlatformType(String platformType) {
+        this.platformType = platformType;
+    }
+
     public Long getMemberReceiveAddressId() {
         return memberReceiveAddressId;
     }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -211,6 +211,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         order.setFreightAmount(new BigDecimal(0));
         order.setPromotionAmount(calcPromotionAmount(orderItemList));
         order.setPromotionInfo(getOrderPromotionInfo(orderItemList));
+        order.setPlatformType(orderParam.getPlatformType());
         if (orderParam.getCouponId() == null) {
             order.setCouponAmount(new BigDecimal(0));
         } else {

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/PortalOrderDao.xml

@@ -59,6 +59,11 @@
               WHEN #{item.productSkuId} THEN stock - #{item.productQuantity}
             </foreach>
             END,
+            sale = CASE id
+            <foreach collection="itemList" item="item">
+                WHEN #{item.productSkuId} THEN pms_sku_stock.sale + #{item.productQuantity}
+            </foreach>
+            END,
             lock_stock = CASE id
             <foreach collection="itemList" item="item">
               WHEN #{item.productSkuId} THEN lock_stock - #{item.productQuantity}

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/PortalProductDao.xml

@@ -104,6 +104,11 @@
             WHEN #{item.productId} THEN stock - #{item.stock}
         </foreach>
         END,
+        sale = CASE id
+        <foreach collection="itemList" item="item">
+            WHEN #{item.productId} THEN sale + #{item.stock}
+        </foreach>
+        END,
         lock_stock = CASE id
         <foreach collection="itemList" item="item">
             WHEN #{item.productId} THEN lock_stock - #{item.stock}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/constant/LiveRoomConstant.java

@@ -14,6 +14,9 @@ public interface LiveRoomConstant {
     //直播间累计用户信息-指只要进入到该房间的用户都要记录
     String LIVE_ROOM_TOTAL_USER_LIST = String.join(":", COOLESHOW, "LIVE_ROOM_TOTAL_USER_LIST", ROOM_UID);
 
+    //直播间在线用户信息
+    String LIVE_ROOM_ONLINE_USER_LIST = String.join(":", COOLESHOW, "LIVE_ROOM_ONLINE_USER_LIST", ROOM_UID);
+
     //用户当前对应的直播间Uid
     String LIVE_USER_ROOM = String.join(":", COOLESHOW, "LIVE_ROOM_USER", USER_ID);
 
@@ -24,5 +27,12 @@ public interface LiveRoomConstant {
     String LIVE_ROOM_INFO = String.join(":", COOLESHOW, "LIVE_ROOM_INFO", ROOM_UID);
 
     //记录老师最后变更的状态消息时间
-    String LIVE_TEACHER_LAST_TIME = String.join(":", COOLESHOW, "LIVE_TEACHER_LAST_TIME", USER_ID);
+    String LIVE_USER_LAST_TIME = String.join(":", COOLESHOW, "LIVE_USER_LAST_TIME", USER_ID);
+
+    //主讲人最近一次加入房间的clientIp
+    String LIVE_USER_LAST_CLIENT_IP = String.join(":", COOLESHOW, "LIVE_USER_LAST_CLIENT_IP", ROOM_UID, USER_ID);
+
+    //当前房间心跳
+    String LIVE_ROOM_HEART_BEAT = String.join(":", COOLESHOW, "LIVE_ROOM_HEART_BEAT", ROOM_UID);
+
 }

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

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.LiveRoom;
-import com.yonge.cooleshow.biz.dal.vo.RoomVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +16,6 @@ public interface LiveRoomDao extends BaseMapper<LiveRoom> {
 
     int insertBatch(@Param("entities") List<LiveRoom> entities);
 
-    LiveRoom getliveingRoomBySpeakerId(@Param("speakerId") Long speakerId);
+    LiveRoom getLiveInRoomBySpeakerId(@Param("speakerId") Long speakerId);
 }
 

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

@@ -26,5 +26,6 @@ public interface StudentAttendanceDao extends BaseMapper<StudentAttendance>{
      * @return: com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo
 	 */
 	List<StudentAttendanceVo> selectPage(@Param("page") IPage page, @Param("param") StudentAttendanceSearch studentAttendance);
-	
+
+    StudentAttendance findByUserIdAndCourseId(@Param("userId") Long userId, @Param("scheduleId") Long scheduleId);
 }

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

@@ -16,5 +16,6 @@ public interface TeacherAttendanceDao extends BaseMapper<TeacherAttendance> {
 
     int insertBatch(@Param("entities") List<TeacherAttendance> entities);
 
+    TeacherAttendance findByUserIdAndCourseId(@Param("userId") Long userId, @Param("scheduleId") Long scheduleId);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImRoomMessage.java

@@ -8,6 +8,8 @@ public class ImRoomMessage extends BaseMessage {
 
     //objectName 类型-观看者退出房间
     public static final String RC_CHATROOM_LEAVE = "RC:Chatroom:Leave";
+    //objectName 类型-观看者数量-该消息只有主播端接
+    public static final String MEMBER_COUNT = "RC:Chatroom:MemberCountUp";
 
     /**
      * 消息类型

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/RoomUserInfoCache.java

@@ -30,9 +30,6 @@ public class RoomUserInfoCache implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date lastOutTime;
 
-    @ApiModelProperty(value = "0:在房间 1:不在房间")
-    private Integer state;
-
     public Long getUserId() {
         return userId;
     }
@@ -73,11 +70,4 @@ public class RoomUserInfoCache implements Serializable {
         this.lastOutTime = lastOutTime;
     }
 
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/RoomTypeEnum.java

@@ -10,9 +10,9 @@ public enum RoomTypeEnum {
     PRACTICE("陪练课"),
     TEMP("临时直播间");
 
-    private String code;
+    private final String code;
 
-    private String msg;
+    private final String msg;
 
     RoomTypeEnum(String msg) {
         this.code = this.name();

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

@@ -8,9 +8,6 @@ import com.yonge.cooleshow.biz.dal.vo.RoomVo;
 import java.util.List;
 import java.util.Map;
 
-import static com.yonge.cooleshow.biz.dal.constant.LiveRoomConstant.LIVE_ROOM_LIKE;
-import static com.yonge.cooleshow.biz.dal.constant.LiveRoomConstant.ROOM_UID;
-
 /**
  * 直播房间与课程的关系表表(LiveRoom)表服务接口
  *
@@ -29,6 +26,13 @@ public interface LiveRoomService extends IService<LiveRoom> {
     RoomVo queryRoomInfo(String roomUid);
 
     /**
+     * 校验房间信息，及个人信息
+     *
+     * @param roomUid 房间uid
+     */
+    RoomVo studentCheckRoomInfo(String roomUid);
+
+    /**
      * 定时任务创建直播间
      */
     void createCourseLiveRoom();
@@ -65,19 +69,20 @@ public interface LiveRoomService extends IService<LiveRoom> {
     void syncLike(String roomUid, Integer likeNum);
 
     /**
-     * 进入房间
+     * 主讲人-进入房间
      *
      * @param roomUid 房间uid
-     * @param userId  用户id 主讲人或者用户的id
+     * @param userId  主讲人id
      */
-    RoomInfoCache joinRoom(String roomUid, Long userId);
+    RoomInfoCache speakerJoinRoom(String roomUid, Long userId);
 
     /**
-     * 查询在观看直播的用户信息
+     * 观看者-进入房间
      *
-     * @param roomUid 直播间uid
+     * @param roomUid 房间uid
+     * @param userId  观看者id
      */
-    List<RoomUserInfoCache> queryRoomUserInfo(String roomUid);
+    RoomInfoCache joinRoom(String roomUid, Long userId);
 
     /**
      * 发送消息
@@ -91,8 +96,12 @@ public interface LiveRoomService extends IService<LiveRoom> {
      */
     Map<String, Object> test(String roomUid);
 
-
-    LiveRoom getliveingRoomBySpeakerId(Long speakerId);
+    /**
+     * 根据主讲人id查询直播进行中的直播间信息
+     *
+     * @param speakerId 房间uid
+     */
+    LiveRoom getLiveInRoomBySpeakerId(Long speakerId);
 
 }
 

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

@@ -2,6 +2,9 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dao.StudentAttendanceDao;
+import com.yonge.cooleshow.biz.dal.dao.TeacherAttendanceDao;
+import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
@@ -13,6 +16,7 @@ import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
  * @date 2022-03-30
  */
 public interface StudentAttendanceService extends IService<StudentAttendance>  {
+	StudentAttendanceDao getDao();
 
 	/**
      * 查询详情
@@ -36,4 +40,10 @@ public interface StudentAttendanceService extends IService<StudentAttendance>  {
 	 * @return 考勤对象
 	 */
     StudentAttendance getByCourseTypeAndScheduleId(CourseScheduleEnum courseType, Long courseScheduleId);
+
+	//学员签到
+    StudentAttendance signIn(Long userId, CourseSchedule courseSchedule);
+
+	//学员签退
+	void signOut(Long userId, CourseSchedule courseSchedule);
 }

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.TeacherAttendanceDao;
+import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 
 /**
@@ -13,5 +14,11 @@ import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 public interface TeacherAttendanceService extends IService<TeacherAttendance> {
 
     TeacherAttendanceDao getDao();
+
+    //老师签到
+    TeacherAttendance signIn(Long userId, CourseSchedule courseSchedule);
+
+    //老师签退
+    void signOut(Long userId, CourseSchedule courseSchedule);
 }
 

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

@@ -48,7 +48,9 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -1113,6 +1115,13 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         Date startTime = adjustVo.getStartTime();
         Date endTime = adjustVo.getEndTime();
         Date now = new Date();
+
+        if(endTime==null){
+            CourseSchedule courseSchedule = baseMapper.selectById(courseId);
+            Integer minutes = Math.toIntExact(ChronoUnit.MINUTES.between(Instant.ofEpochMilli(courseSchedule.getStartTime().getTime()), Instant.ofEpochMilli(courseSchedule.getEndTime().getTime())));
+            endTime = DateUtil.offsetMinute(startTime, minutes);
+        }
+
         //校验时间是否为未来时刻
         if (startTime.before(now) || endTime.before(now)) {
             throw new BizException("排课日期必须大于当前日期");

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

@@ -59,6 +59,10 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Resource
     private MusicSheetAccompanimentService musicSheetAccompanimentService;
     @Resource
+    private StudentAttendanceService studentAttendanceService;
+    @Resource
+    private TeacherAttendanceService teacherAttendanceService;
+    @Resource
     private RedisTemplate<String,Object> redisTemplate;
 
     private String QUIT_ROOM_SUCCESS = "quitRoomSuccess:";
@@ -143,14 +147,16 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void joinRoomSuccess(String roomId,Long userId) throws Exception {
         log.info("joinRoomSuccess: roomId={}, userId={}", roomId, userId);
-        Long teacherId = Optional.ofNullable(courseScheduleService.getById(roomId)).
-                map(CourseSchedule::getTeacherId).
+        CourseSchedule courseSchedule = Optional.ofNullable(courseScheduleService.getById(roomId)).
                 orElseThrow(()->new BizException("房间信息不存在"));
         BasicUserInfo sysUser = Optional.ofNullable(teacherDao.getBasicUserInfo(userId)).
                 orElseThrow(()-> new BizException("用户信息不存在"));
         UserRoleEnum userRole = UserRoleEnum.STUDENT;
-        if(Objects.equals(teacherId,userId)){
+        if(Objects.equals(courseSchedule.getTeacherId(),userId)){
             userRole = UserRoleEnum.TEACHER;
+            teacherAttendanceService.signIn(userId,courseSchedule);
+        }else {
+            studentAttendanceService.signIn(userId,courseSchedule);
         }
         Date now = new Date();
         //获取房间信息
@@ -159,7 +165,6 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         ImNetworkRoomMember roomMember = imNetworkRoomMemberService.initRoomMember(roomId,sysUser,userRole);
         //发送人员变动消息
         publishMemberChangedMessage(roomMember);
-        //记录考勤
     }
 
     //发送人员变动消息
@@ -202,8 +207,11 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         UserRoleEnum roleEnum = UserRoleEnum.STUDENT;
         if(Objects.equals(courseSchedule.getTeacherId(),userId)){
             roleEnum = UserRoleEnum.TEACHER;
+            teacherAttendanceService.signOut(userId,courseSchedule);
+        }else {
+            //记录考勤签退
+            studentAttendanceService.signOut(userId,courseSchedule);
         }
-        //记录考勤信息
         ImNetworkRoom room = baseMapper.findByRoomId(roomId);
         if (roleEnum == UserRoleEnum.TEACHER){
             //如果老师退出房间，关闭伴奏

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.beust.jcommander.internal.Lists;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.LiveRoomDao;
@@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.yonge.cooleshow.biz.dal.constant.LiveRoomConstant.*;
@@ -68,8 +70,14 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     @Autowired
     private TeacherAttendanceService teacherAttendanceService;
 
-    //生成房间UID
-    public static BiFunction<Long, RoomTypeEnum, String> GenRoomUid = (userId, en) -> String.join("-", COOLESHOW, en.getCode(), userId.toString(), new Date().getTime() + "");
+    /**
+     * 生成房间UID
+     *
+     * <p> userId：主讲人id
+     * <p> en ：房间类型
+     */
+    private final BiFunction<Long, RoomTypeEnum, String> GenRoomUid = (userId, en) -> String
+            .join("-", COOLESHOW, en.getCode(), userId.toString(), new Date().getTime() + "");
 
     @Override
     public LiveRoomDao getDao() {
@@ -92,11 +100,23 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         BeanUtils.copyProperties(liveRoom, roomVo);
         roomVo.setSpeakerName(getSysUser(liveRoom.getSpeakerId()).getRealName());
         roomVo.setLikeNum(getLike(roomUid));
-        roomVo.setLookNum(getLooker(roomUid));
+        roomVo.setLookNum(getNum.apply(this::getOnlineUserCache, roomUid));
         return roomVo;
     }
 
     /**
+     * 校验房间信息，及个人信息
+     *
+     * @param roomUid 房间uid
+     */
+    @Override
+    public RoomVo studentCheckRoomInfo(String roomUid) {
+        //校验学生与房间的关系
+        checkStudentRoom(roomUid, getSysUser());
+        return queryRoomInfo(roomUid);
+    }
+
+    /**
      * 定时任务创建直播间
      */
     @Override
@@ -163,27 +183,33 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     public String createTempLiveRoom(Map<String, Object> param) {
         //查询主讲人信息
         SysUser sysUser = getSysUser();
-        Date now = new Date();
-        //当前时间有课程则不能开启直播
-        checkTempLive(sysUser.getId());
         String roomTitle = WrapperUtil.toStr(param, "roomTitle", "房间标题不能为空!");
         String liveRemark = WrapperUtil.toStr(param, "liveRemark", "直播间描述不能为空!");
-
-        Long id = sysUser.getId();
+        Integer liveTime = WrapperUtil.toInt(param, "liveTime","请选择直播时长!");
+        Date liveStartTime = new Date();
+        Date liveEndTime = DateUtil.addMinutes(liveStartTime, liveTime);
+        Long teacherId = sysUser.getId();
+        //当前时间有课程则不能开启直播
+        boolean check =  courseScheduleService.checkTeacherCourseTime(teacherId,liveStartTime,liveEndTime);
+        if (check) {
+            //如果当前时间和课程时间有交集则不能开启临时直播
+            throw new BizException("当前选择的时间段有课无法开启直播");
+        }
         RoomTypeEnum en = RoomTypeEnum.TEMP;
-        String roomUid = GenRoomUid.apply(id, en);
+        String roomUid = GenRoomUid.apply(teacherId, en);
         LiveRoom room = new LiveRoom();
         room.setCourseGroupId(-1L);
         room.setCourseId(-1L);
         room.setRoomUid(roomUid);
         room.setRoomTitle(roomTitle);
         room.setLiveRemark(liveRemark);
-        room.setSpeakerId(id);
-        room.setLiveStartTime(now);
+        room.setSpeakerId(teacherId);
+        room.setLiveStartTime(liveStartTime);
+        room.setLiveEndTime(liveEndTime);
         room.setLiveState(0);
         room.setRoomState(0);
-        room.setCreatedBy(id);
-        room.setCreatedTime(now);
+        room.setCreatedBy(teacherId);
+        room.setCreatedTime(liveStartTime);
         room.setType(en.getCode());
         this.save(room);
         log.info("createTempLiveRoom>>>>>>room:{}", room.getRoomUid());
@@ -193,27 +219,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     }
 
     /**
-     * 校验开启临时直播间是否会有课程冲突
-     */
-    @SuppressWarnings("unchecked")
-    private void checkTempLive(Long teacherId) {
-        //查询当前未锁的最近的一节课
-        CourseSchedule course = courseScheduleService.getOne(Wrappers.<CourseSchedule>lambdaQuery()
-                .eq(CourseSchedule::getTeacherId, teacherId)
-                .eq(CourseSchedule::getLock, 0)
-                .orderByDesc(CourseSchedule::getStartTime));
-        if (Objects.isNull(course)) {
-            return;
-        }
-        Date now = new Date();
-        Boolean check = WrapperUtil.inInterSection(now, now, course.getStartTime(), course.getEndTime(), false);
-        if (check) {
-            //如果当前时间和课程时间有交集则不能开启临时直播
-            throw new BizException("当前有课无法开启直播");
-        }
-    }
-
-    /**
      * 去融云创建房间及创建房间缓存信息-直播间
      */
     private void createLiveRoomInfo(LiveRoom room) {
@@ -307,30 +312,35 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                 //删除房间
                 destroyLiveRoom(room.getRoomUid());
                 //查询老师分润表
-                CourseScheduleTeacherSalary salary = courseScheduleTeacherSalaryService.getOne(Wrappers.<CourseScheduleTeacherSalary>lambdaQuery()
+                List<CourseScheduleTeacherSalary> salaryList = courseScheduleTeacherSalaryService.list(Wrappers.<CourseScheduleTeacherSalary>lambdaQuery()
                         .eq(CourseScheduleTeacherSalary::getCourseScheduleId, room.getCourseId())
                 );
-                if (Objects.isNull(salary)) {
-                    return;
-                }
-                //查询该学生及课程id 对应的支付订单号
-                CourseScheduleStudentPayment payment = courseScheduleStudentPaymentService.getOne(Wrappers.<CourseScheduleStudentPayment>lambdaQuery()
-                        .eq(CourseScheduleStudentPayment::getCourseId, room.getCourseId())
-                        .eq(CourseScheduleStudentPayment::getUserId, salary.getStudentId())
-                );
-                if (Objects.isNull(payment)) {
+                if (CollectionUtils.isEmpty(salaryList)) {
                     return;
                 }
-                //获取教师课酬写入到金额变更表
-                UserAccountRecordDto userAccountRecord = new UserAccountRecordDto();
-                userAccountRecord.setUserId(room.getSpeakerId());
-                userAccountRecord.setInOrOut(InOrOutEnum.IN);
-                userAccountRecord.setBizType(AccountBizTypeEnum.LIVE);
-                userAccountRecord.setBizId(room.getCourseId());
-                userAccountRecord.setBizName(room.getRoomTitle());
-                userAccountRecord.setTransAmount(salary.getActualSalary());//扣除手续费后所得金额
-                userAccountRecord.setOrderNo(payment.getOrderNo());
-                userAccountService.accountChange(userAccountRecord);
+                salaryList.forEach(salary -> {
+                    //查询该学生及课程id 对应的支付订单号
+                    CourseScheduleStudentPayment payment = courseScheduleStudentPaymentService.getOne(Wrappers.<CourseScheduleStudentPayment>lambdaQuery()
+                            .eq(CourseScheduleStudentPayment::getCourseId, room.getCourseId())
+                            .eq(CourseScheduleStudentPayment::getUserId, salary.getStudentId())
+                    );
+                    if (Objects.isNull(payment)) {
+                        return;
+                    }
+                    //获取教师课酬写入到金额变更表
+                    UserAccountRecordDto userAccountRecord = new UserAccountRecordDto();
+                    userAccountRecord.setUserId(room.getSpeakerId());
+                    userAccountRecord.setInOrOut(InOrOutEnum.IN);
+                    userAccountRecord.setBizType(AccountBizTypeEnum.LIVE);
+                    userAccountRecord.setBizId(room.getCourseId());
+                    userAccountRecord.setBizName(room.getRoomTitle());
+                    userAccountRecord.setTransAmount(salary.getActualSalary());//扣除手续费后所得金额
+                    userAccountRecord.setOrderNo(payment.getOrderNo());
+                    userAccountService.accountChange(userAccountRecord);
+                    //修改教师课酬状态-已结算
+                    salary.setStatus(TeacherSalaryEnum.COMPLETE.getCode());
+                    courseScheduleTeacherSalaryService.updateById(salary);
+                });
             }
         });
     }
@@ -396,20 +406,17 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
      * @param roomId 房间Uid
      */
     private void destroyLiveRoom(String roomId) {
-        //删除服务器房间
-        List<String> deleteRoomIds = new ArrayList<String>() {{
-            add(roomId);
-        }};
-        IMApiResultInfo resultInfo;
         try {
-            resultInfo = imHelper.deleteChrm(deleteRoomIds);
+            //删除服务器房间
+            List<String> deleteRoomIds = Lists.newArrayList(roomId);
+            IMApiResultInfo resultInfo = imHelper.deleteChrm(deleteRoomIds);
+            if (!resultInfo.isSuccess()) {
+                log.error("destroyLiveRoom error" + resultInfo.getErrorMessage());
+            }
+            log.info("destroyLiveRoom success: {}", roomId);
         } catch (Exception e) {
-            throw new BizException("关闭聊天室失败!" + e.getMessage());
+            log.error("destroyLiveRoom error" + e.getMessage());
         }
-        if (!resultInfo.isSuccess()) {
-            throw new BizException("关闭聊天室失败!" + resultInfo.getErrorMessage());
-        }
-        log.info("destroyLiveRoom success: {}", roomId);
     }
 
     /**
@@ -431,7 +438,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             //获取当前用户状态变更的时间
             long userStateTime = Optional.ofNullable(user.getTime()).orElse(now.getTime());
             String userIdStr = user.getUserid();
-            RBucket<Long> userStateTimeCache = redissonClient.getBucket(LIVE_TEACHER_LAST_TIME.replace(USER_ID, userIdStr));
+            RBucket<Long> userStateTimeCache = redissonClient.getBucket(LIVE_USER_LAST_TIME.replace(USER_ID, userIdStr));
             if (userStateTimeCache.isExists()) {
                 //缓存的时间比当前传入时间大则放弃这条数据
                 long cacheTime = userStateTimeCache.get();
@@ -441,101 +448,156 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             }
             //将最新的时间写入缓存
             userStateTimeCache.set(userStateTime, 5L, TimeUnit.MINUTES);
-            //直播间号
-            String roomUid;
-            //根据用户id获取用户当前房间号
-            RBucket<String> roomUidCache = redissonClient.getBucket(LIVE_USER_ROOM.replace(USER_ID, userIdStr));
-            if (!roomUidCache.isExists()) {
+            //获取当前用户所在房间的uid
+            RBucket<String> userRoom = redissonClient.getBucket(LIVE_USER_ROOM.replace(USER_ID, userIdStr));
+            if (!userRoom.isExists()) {
                 return;
             }
-            roomUid = roomUidCache.get();
+            String roomUid = userRoom.get();
             //根据房间号获取房间信息
             RBucket<RoomInfoCache> roomInfoCache = redissonClient.getBucket(LIVE_ROOM_INFO.replace(ROOM_UID, roomUid));
             if (!roomInfoCache.isExists()) {
                 return;
             }
             RoomInfoCache roomInfo = roomInfoCache.get();
-            //用户id
-            Long userId = Long.valueOf(userIdStr);
-            //主讲人
+            // 查询userId是不是主讲人 ,如果是主讲人则返回
             if (roomInfo.getSpeakerId().toString().equals(userIdStr)) {
-                //进退房间写老师考勤表
-                TeacherAttendance teacherAttendance = teacherAttendanceService.getOne(Wrappers.<TeacherAttendance>lambdaQuery()
-                        .eq(TeacherAttendance::getTeacherId, userId)
-                        .eq(TeacherAttendance::getCourseScheduleId, roomInfo.getCourseId()));
-                //主讲人进入房间
-                if (user.getStatus().equals("0")) {
-                    roomInfo.setSpeakerState(0);
-                    roomInfo.setJoinRoomTime(now);
-                    log.info("opsRoom>>>> join roomInfo {}", JSONObject.toJSONString(roomInfo));
-                    roomInfoCache.set(roomInfo);
-                    //查询老师是否有进入过，没有则写老师考勤表的进入时间
-                    if (Objects.isNull(teacherAttendance)) {
-                        setTeacherAttendance(userId, roomInfo.getCourseGroupId(), roomInfo.getCourseId());
-                    }
-                    return;
-                }
-                roomInfo.setSpeakerState(1);
-                roomInfo.setExitRoomTime(now);
-                log.info("opsRoom>>>> exit roomInfo {}", JSONObject.toJSONString(roomInfo));
-                roomInfoCache.set(roomInfo);
-                if (Objects.isNull(teacherAttendance)) {
-                    teacherAttendance = new TeacherAttendance();
-                    teacherAttendance.setTeacherId(userId);
-                    teacherAttendance.setCourseGroupType(CourseScheduleEnum.LIVE.getCode());
-                    teacherAttendance.setCourseGroupId(roomInfo.getCourseGroupId());
-                    teacherAttendance.setCourseScheduleId(roomInfo.getCourseId());
-                    teacherAttendance.setSignInTime(now);
-                    teacherAttendance.setSignOutTime(now);
-                    teacherAttendance.setCreateTime(now);
-                    teacherAttendanceService.save(teacherAttendance);
-                } else {
-                    //修改老师考勤表
-                    teacherAttendance.setSignOutTime(now);
-                    teacherAttendance.setUpdateTime(now);
-                    teacherAttendanceService.updateById(teacherAttendance);
-                }
+                opsSpeaker(roomInfoCache, user, now, userIdStr);
                 return;
             }
-            //观看者只需要接收退出房间的消息 status=0进入房间
+            //这里开始只处理观看者的数据，观看者只接受退出消息 status=0 是进入房间
             if (user.getStatus().equals("0")) {
                 return;
             }
+            //用户id
+            Long userId = Long.valueOf(userIdStr);
             //从房间累计用户信息中查询该用户的信息
-            RMap<Long, RoomUserInfoCache> roomTotalUser = redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid));
+            RMap<Long, String> roomTotalUser = getTotalUserCache(roomUid);
             //该房间未查询到用户数据则不处理
             if (!roomTotalUser.isExists() && !roomTotalUser.containsKey(userId)) {
                 return;
             }
-            //查询到用户数据
-            RoomUserInfoCache userInfo = roomTotalUser.get(userId);
-            //用户突然离线 - 那么融云会发送用户离线消息-此刻就发送退出房间消息给主讲人
-            if (user.getStatus().equals("1")) {
-                ImRoomMessage message = new ImRoomMessage();
-                message.setFromUserId(userId.toString());
-                message.setContent(userId.toString());
-                message.setToChatroomId(roomUid);
-                message.setObjectName(ImRoomMessage.RC_CHATROOM_LEAVE);
-                try {
-                    publishRoomMessage(message);
-                } catch (Exception e) {
-                    log.error("opsRoom>>>>  looker leave error {}", e.getMessage());
-                    log.error("opsRoom>>>>  looker leave error sendMessage {} : userInfo : {}", message, JSONObject.toJSONString(userInfo));
-                }
-                log.info("opsRoom>>>> looker leave userInfo : {}", JSONObject.toJSONString(userInfo));
-            }
-            //记录退出时间 并写入缓存
+            //查询用户数据
+            RoomUserInfoCache userInfo = JSONObject.toJavaObject(JSONObject.parseObject(roomTotalUser.get(userId)), RoomUserInfoCache.class);
             userInfo.setLastOutTime(now);
-            userInfo.setState(1);
-            roomTotalUser.fastPut(userId, userInfo);
-            //todo 写学生考勤表
-
-            log.info("opsRoom>>>> looker userInfo: {}", JSONObject.toJSONString(userInfo));
+            String userJsonStr = JSONObject.toJSONString(userInfo);
+            roomTotalUser.fastPut(userId, userJsonStr);
+            //查询在线人员列表
+            RMap<Long, String> onlineUserInfo = getOnlineUserCache(roomUid);
+            if (!onlineUserInfo.isExists()) {
+                return;
+            }
+            //从在线人员列表删除该人员
+            onlineUserInfo.fastRemove(userId);
+            //学员退出 写学生考勤表
+            StudentAttendance studentAttendance = studentAttendanceService.getOne(Wrappers.<StudentAttendance>lambdaQuery()
+                    .eq(StudentAttendance::getStudentId, userId)
+                    .eq(StudentAttendance::getCourseScheduleId, roomInfo.getCourseId()));
+            if (Objects.nonNull(studentAttendance)) {
+                studentAttendance.setSignOutTime(now);
+                studentAttendanceService.updateById(studentAttendance);
+            }
+            //向直播间发送当前在线人数消息
+            this.sendOnlineUserCount(roomUid, userId, onlineUserInfo.size());
+            log.info("opsRoom>>>> looker userInfo: {}", userJsonStr);
+            //用户离开直播间发送退出房间消息给主讲人
+            ImRoomMessage message = new ImRoomMessage();
+            message.setFromUserId(userId.toString());
+            message.setToChatroomId(roomUid);
+            message.setObjectName(ImRoomMessage.RC_CHATROOM_LEAVE);
+            message.setContent(userId);
+            try {
+                publishRoomMessage(message);
+                log.info("opsRoom>>>> looker RC_CHATROOM_LEAVE : {}", userJsonStr);
+            } catch (Exception e) {
+                log.error("opsRoom>>>>  looker error RC_CHATROOM_LEAVE {}", e.getMessage());
+                log.error("opsRoom>>>>  looker error sendMessage {} : RC_CHATROOM_LEAVE : {}", message, userJsonStr);
+            }
         });
 
     }
 
     /**
+     * 主讲人
+     *
+     * @return true 是主讲人 false 不是主讲人
+     */
+    private void opsSpeaker(RBucket<RoomInfoCache> roomInfoCache, ImUserStateSync user, Date now, String userIdStr) {
+        RoomInfoCache roomInfo = roomInfoCache.get();
+        String roomUid = roomInfo.getRoomUid();
+        //进退房间写老师考勤表
+        TeacherAttendance teacherAttendance = teacherAttendanceService.getOne(Wrappers.<TeacherAttendance>lambdaQuery()
+                .eq(TeacherAttendance::getTeacherId, userIdStr)
+                .eq(TeacherAttendance::getCourseScheduleId, roomInfo.getCourseId()));
+
+        //最后一次进入房间的clientIp
+        RBucket<String> lastClientIp = redissonClient.getBucket(LIVE_USER_LAST_CLIENT_IP.replace(ROOM_UID, roomUid).replace(USER_ID, userIdStr));
+        //主讲人进入房间
+        if (user.getStatus().equals("0")) {
+            roomInfo.setSpeakerState(0);
+            roomInfo.setJoinRoomTime(now);
+            //将本次进入房间的clientIp添加到主讲人最后一次clientIp缓存中
+            if (StringUtils.isNotBlank(user.getClientIp())) {
+                lastClientIp.set(user.getClientIp());
+            }
+            //查询老师是否有进入过放假，没有则写老师考勤表的进入时间
+            if (Objects.isNull(teacherAttendance)) {
+                setTeacherAttendance(Long.parseLong(userIdStr), roomInfo.getCourseGroupId(), roomInfo.getCourseId());
+            }
+            roomInfoCache.set(roomInfo);
+            log.info("opsRoom>>>> join speakerCache {}", JSONObject.toJSONString(roomInfo));
+            return;
+        }
+        //退出房间 - 校验本次退出直播间的clientIp 是不是上次进入房间的clientIp
+        if (StringUtils.isNotBlank(user.getClientIp())) {
+            if (lastClientIp.isExists()) {
+                //如果是上次进入房间的clientIp和本次退出房间的clientIp不相同，则直接忽略
+                if (!user.getClientIp().equals(lastClientIp.get())) {
+                    return;
+                }
+            }
+        }
+        //如果退出时间大于进入时间就无需再次退出-直接返回
+        if (compareDate.apply(roomInfo.getExitRoomTime(), roomInfo.getJoinRoomTime())) {
+            return;
+        }
+
+        roomInfo.setSpeakerState(1);
+        roomInfo.setExitRoomTime(now);
+        if (Objects.isNull(teacherAttendance)) {
+            teacherAttendance = new TeacherAttendance();
+            teacherAttendance.setTeacherId(Long.parseLong(userIdStr));
+            teacherAttendance.setCourseGroupType(CourseScheduleEnum.LIVE.getCode());
+            teacherAttendance.setCourseGroupId(roomInfo.getCourseGroupId());
+            teacherAttendance.setCourseScheduleId(roomInfo.getCourseId());
+            teacherAttendance.setSignInTime(now);
+            teacherAttendance.setSignOutTime(now);
+            teacherAttendance.setCreateTime(now);
+            teacherAttendanceService.save(teacherAttendance);
+        } else {
+            //修改老师考勤表
+            teacherAttendance.setSignOutTime(now);
+            teacherAttendance.setUpdateTime(now);
+            teacherAttendanceService.updateById(teacherAttendance);
+        }
+        log.info("opsRoom>>>> exit speakerCache {}", JSONObject.toJSONString(roomInfo));
+        roomInfoCache.set(roomInfo);
+    }
+
+    /**
+     * 对比时间,2个时间一个为空返回false,否则对比时间大小
+     * <p>- date1 时间1
+     * <p>- date2 时间2
+     */
+    private final BiFunction<Date, Date, Boolean> compareDate = (date1, date2) -> {
+        if (Objects.nonNull(date1) && Objects.nonNull(date2)) {
+            return date1.getTime() > date2.getTime();
+        } else {
+            return false;
+        }
+    };
+
+    /**
      * 同步点赞数量
      *
      * @param roomUid 房间uid
@@ -544,51 +606,62 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     @Override
     public void syncLike(String roomUid, Integer likeNum) {
         redissonClient.getBucket(LIVE_ROOM_LIKE.replace(ROOM_UID, roomUid)).set(likeNum);
+        //增加房间心跳
+        redissonClient.getBucket(LIVE_ROOM_HEART_BEAT.replace(ROOM_UID, roomUid)).set(new Date());
     }
 
     /**
-     * 进入房间
+     * 主讲人-进入房间
      *
      * @param roomUid 房间uid
-     * @param userId  用户id 主讲人或者用户的id
+     * @param userId  主讲人id
      */
-    public RoomInfoCache joinRoom(String roomUid, Long userId) {
+    public RoomInfoCache speakerJoinRoom(String roomUid, Long userId) {
         //校验房间是否存在
         RBucket<RoomInfoCache> roomInfoCache = redissonClient.getBucket(LIVE_ROOM_INFO.replace(ROOM_UID, roomUid));
         if (!roomInfoCache.isExists()) {
             throw new BizException("直播还未开始!");
         }
         RoomInfoCache roomInfo = roomInfoCache.get();
+        Date now = new Date();
+        //校验进入房间的是否是该直播间的主讲人
+        if (!roomInfo.getSpeakerId().equals(userId)) {
+            throw new BizException("您不是该直播间的主讲人!");
+        }
+        roomInfo.setSpeakerState(0);
+        roomInfo.setJoinRoomTime(now);
+        roomInfoCache.set(roomInfo);
+        //查询老师是否有进入过，没有则写老师考勤表的进入时间
+        setTeacherAttendance(userId, roomInfo.getCourseGroupId(), roomInfo.getCourseId());
         roomInfo.setLikeNum(getLike(roomUid));
-        roomInfo.setLookNum(getLooker(roomUid));
-
+        roomInfo.setLookNum(getNum.apply(this::getOnlineUserCache, roomUid));
         //记录当前用户对应的房间uid
         redissonClient.getBucket(LIVE_USER_ROOM.replace(USER_ID, userId.toString())).set(roomUid, 2L, TimeUnit.DAYS);
+        return roomInfo;
+    }
 
+    /**
+     * 观看者-进入房间
+     *
+     * @param roomUid 房间uid
+     * @param userId  用户id 观看者id
+     */
+    public RoomInfoCache joinRoom(String roomUid, Long userId) {
+        //获取进入房间人员信息
+        SysUser sysUser = getSysUser(userId);
+        //校验信息
+        RBucket<RoomInfoCache> roomInfoCache = checkStudentRoom(roomUid, sysUser);
+        RoomInfoCache roomInfo = roomInfoCache.get();
         Date now = new Date();
-        //进入房间的是主讲人
-        if (roomInfo.getSpeakerId().equals(userId)) {
-            roomInfo.setSpeakerState(0);
-            roomInfo.setJoinRoomTime(now);
-            roomInfoCache.set(roomInfo);
-            //查询老师是否有进入过，没有则写老师考勤表的进入时间
-            setTeacherAttendance(userId, roomInfo.getCourseGroupId(), roomInfo.getCourseId());
-            return roomInfo;
-        }
-        //todo 查询是否是临时直播间，临时直播间可以直接进入教师
-        //todo 校验观看者是否可以进入该房间，查询该学员购买成功则有权限进入该房间
-
-
         //房间累计用户信息-指只要进入到该房间的用户都要记录
-        RMap<Long, RoomUserInfoCache> roomTotalUser = redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid));
+        RMap<Long, String> roomTotalUser = getTotalUserCache(roomUid);
         //判断是否第一次进房间
         RoomUserInfoCache userInfo;
         if (roomTotalUser.containsKey(userId)) {
             //多次进入更新动态进入时间
-            userInfo = roomTotalUser.get(userId);
+            userInfo = JSONObject.toJavaObject(JSONObject.parseObject(roomTotalUser.get(userId)), RoomUserInfoCache.class);
         } else {
             //第一次进该房间 写入用户首次进入时间
-            SysUser sysUser = getSysUser(userId);
             userInfo = new RoomUserInfoCache();
             userInfo.setUserId(sysUser.getId());
             userInfo.setUserName(sysUser.getRealName());
@@ -596,13 +669,51 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             //查询学生是否有进入过，没有则写学生考勤表的进入时间
             setStudentAttendance(userId, roomInfo.getCourseGroupId(), roomInfo.getCourseId());
         }
-        userInfo.setState(0);//0:在房间 1:不在房间
         userInfo.setDynamicJoinTime(now);
-        roomTotalUser.fastPut(userId, userInfo);
-        log.info("joinRoom>>>> userInfo: {}", JSONObject.toJSONString(userInfo));
+        //用户json信息
+        String userJsonStr = JSONObject.toJSONString(userInfo);
+        //写入人员缓存
+        roomTotalUser.fastPut(userId, userJsonStr);
+        //写入在线人员缓存
+        RMap<Long, String> onlineUserCache = getOnlineUserCache(roomUid);
+        onlineUserCache.fastPut(userId, userJsonStr);
+        log.info("joinRoom>>>> userInfo: {}", userJsonStr);
+        //刷新当前房间的点赞及观看人数信息
+        roomInfo.setLikeNum(getLike(roomUid));
+        roomInfo.setLookNum(getNum.apply(this::getOnlineUserCache, roomUid));
+        roomInfoCache.set(roomInfo);
+        //向直播间发送当前在线人数消息
+        this.sendOnlineUserCount(roomUid, userId, onlineUserCache.size());
+        log.info("join sendOnlineUserCount>>>> param is null   roomUid: {}  fromUserId:{}  count:{}", roomUid, userId, onlineUserCache.size());
+        log.info("joinRoom>>>> userInfo: {}", userJsonStr);
+        //记录当前用户对应的房间uid
+        redissonClient.getBucket(LIVE_USER_ROOM.replace(USER_ID, userId.toString())).set(roomUid, 2L, TimeUnit.DAYS);
         return roomInfo;
     }
 
+    //校验学生与房间的关系
+    private RBucket<RoomInfoCache> checkStudentRoom(String roomUid, SysUser sysUser) {
+        //校验房间是否存在
+        RBucket<RoomInfoCache> roomInfoCache = redissonClient.getBucket(LIVE_ROOM_INFO.replace(ROOM_UID, roomUid));
+        if (!roomInfoCache.isExists()) {
+            throw new BizException("直播还未开始!");
+        }
+        RoomInfoCache roomInfo = roomInfoCache.get();
+        //校验观看者是否可以进入该房间,如果是非临时直播间，则校验是否已经买过课
+        if (!roomInfo.getRoomType().equals(RoomTypeEnum.TEMP.getCode())) {
+            // 查询该学员成功购买课程
+            int count = courseScheduleStudentPaymentService.count(Wrappers.<CourseScheduleStudentPayment>lambdaQuery()
+                    .eq(CourseScheduleStudentPayment::getUserId, sysUser.getId())
+                    .eq(CourseScheduleStudentPayment::getCourseId, roomInfo.getCourseId())
+                    .eq(CourseScheduleStudentPayment::getCourseGroupId, roomInfo.getCourseGroupId())
+                    .eq(CourseScheduleStudentPayment::getCourseType, CourseScheduleEnum.LIVE.getCode()));
+            if (count < 0) {
+                throw new BizException("您还未购买课程!");
+            }
+        }
+        return roomInfoCache;
+    }
+
     /**
      * 查询学生是否有进入过，没有则写学生考勤表的进入时间
      *
@@ -611,12 +722,12 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
      * @param courseId      课程id
      */
     private void setStudentAttendance(Long studentId, Long courseGroupId, Long courseId) {
-        Date now = new Date();
         //写学生第一次进入时间
         StudentAttendance studentAttendance = studentAttendanceService.getOne(Wrappers.<StudentAttendance>lambdaQuery()
                 .eq(StudentAttendance::getStudentId, studentId)
                 .eq(StudentAttendance::getCourseScheduleId, courseId));
         if (Objects.isNull(studentAttendance)) {
+            Date now = new Date();
             studentAttendance = new StudentAttendance();
             studentAttendance.setCourseGroupType(CourseScheduleEnum.LIVE.getCode());
             studentAttendance.setCourseGroupId(courseGroupId);
@@ -653,6 +764,36 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     }
 
     /**
+     * 向直播间发送当前在线人数消息
+     *
+     * @param roomUid    房间uid
+     * @param fromUserId 发送人id
+     * @param count      人数
+     */
+    private void sendOnlineUserCount(String roomUid, Long fromUserId, Integer count) {
+        //校验传入参数，房间uid和发送人id不能为空
+        if (!WrapperUtil.checkObj(roomUid, fromUserId, count)) {
+            log.info(" sendOnlineUserCount>>>> param is null   roomUid: {}  fromUserId:{}  count:{}", roomUid, fromUserId, count);
+            return;
+        }
+        ImRoomMessage message = new ImRoomMessage();
+        message.setObjectName(ImRoomMessage.MEMBER_COUNT);
+        message.setToChatroomId(roomUid);
+        HashMap<String, Integer> sendMap = new HashMap<>();
+        sendMap.put("count", count);
+        message.setFromUserId(fromUserId.toString());
+        message.setContent(sendMap);
+        //发送消息
+        try {
+            publishRoomMessage(message);
+            log.info("sendOnlineUserCount>>>> message: {}", JSONObject.toJSONString(message));
+        } catch (Exception e) {
+            log.error("sendOnlineUserCount>>>> error {}", e.getMessage());
+            log.error("sendOnlineUserCount>>>> sendMessage {} :", JSONObject.toJSONString(message));
+        }
+    }
+
+    /**
      * 发送消息
      *
      * @param message
@@ -689,26 +830,46 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
      *
      * @param roomUid 直播间uid
      */
-    @Override
-    public List<RoomUserInfoCache> queryRoomUserInfo(String roomUid) {
-        List<RoomUserInfoCache> roomUserInfoVos = queryTotalRoomUserInfo(roomUid);
-        return queryRoomUserInfo(roomUserInfoVos);
+    private List<RoomUserInfoCache> getTotalUserInfo(String roomUid) {
+        RMap<Long, String> roomTotalUser = getTotalUserCache(roomUid);
+        return roomTotalUser.values().parallelStream()
+                .map(a -> JSONObject.toJavaObject(JSONObject.parseObject(a), RoomUserInfoCache.class))
+                .collect(Collectors.toList());
     }
 
-    private List<RoomUserInfoCache> queryRoomUserInfo(List<RoomUserInfoCache> totalUserInfo) {
-        return totalUserInfo.stream()
-                .filter(o -> Objects.nonNull(o.getState()) && o.getState() == 0)
-                .collect(Collectors.toList());
+    /**
+     * 获取直播间所有用户信息缓存
+     *
+     * @param roomUid 直播间uid
+     * @return RMap key:userId value:RoomUserInfoCache -> jsonToString
+     */
+    private RMap<Long, String> getTotalUserCache(String roomUid) {
+        return redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid));
     }
 
-    private List<RoomUserInfoCache> queryTotalRoomUserInfo(String roomUid) {
-        RMap<Long, RoomUserInfoCache> roomTotalUser = redissonClient.getMap(LIVE_ROOM_TOTAL_USER_LIST.replace(ROOM_UID, roomUid));
-        return roomTotalUser.values().stream()
-                .filter(Objects::nonNull)
+    /**
+     * 查询在观看直播的用户信息
+     *
+     * @param roomUid 直播间uid
+     */
+    private List<RoomUserInfoCache> getOnlineUserInfo(String roomUid) {
+        RMap<Long, String> roomTotalUser = getOnlineUserCache(roomUid);
+        return roomTotalUser.values().parallelStream()
+                .map(a -> JSONObject.toJavaObject(JSONObject.parseObject(a), RoomUserInfoCache.class))
                 .collect(Collectors.toList());
     }
 
     /**
+     * 获取直播间在线用户信息缓存
+     *
+     * @param roomUid 直播间uid
+     * @return RMap key:userId value:BaseRoomUserVo -> jsonToString
+     */
+    private RMap<Long, String> getOnlineUserCache(String roomUid) {
+        return redissonClient.getMap(LIVE_ROOM_ONLINE_USER_LIST.replace(ROOM_UID, roomUid));
+    }
+
+    /**
      * 获取房间点赞数
      *
      * @param roomUid 房间UId
@@ -724,18 +885,17 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     }
 
     /**
-     * 获取房间当前观看人数
+     * 获取房间缓存中的用户数量/观看人数
      *
-     * @param roomUid 房间uid
-     * @return 当前观看人数
+     * <p> func：查询用户数量/观看人数的方法
+     * <p> roomUid ：房间uid
+     * <p> return ：用户数量/观看人数
      */
-    private int getLooker(String roomUid) {
-        List<RoomUserInfoCache> roomUserInfoCaches = queryRoomUserInfo(roomUid);
-        if (CollectionUtils.isEmpty(roomUserInfoCaches)) {
-            return 0;
-        }
-        return roomUserInfoCaches.size();
-    }
+    private final BiFunction<Function<String, RMap<Long, ?>>, String, Integer> getNum = (func, roomUid) -> Optional.of(roomUid)
+            .map(func)
+            .filter(RMap::isExists)
+            .map(RMap::size)
+            .orElse(0);
 
     /**
      * 方便测试观察房间数据的方法
@@ -743,16 +903,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
     public Map<String, Object> test(String roomUid) {
         //result
         Map<String, Object> result = new HashMap<>();
-//        Map<String, Object> param = new HashMap<>();
-//        param.put("day", "05");
-//        param.put("month", "06");
-//        param.put("year", "2022");
-//        param.put("teacherId", "174");
-//        param.put("studentId", 164);
-//        List<CourseCalendarEntity> courseTimeEntities = courseScheduleService.createPracticeCourseCalender(param);
-//        List<CourseCalendarEntity> courseTimeEntities = courseScheduleService.createLiveCourseCalendar(param);
-//        result.put("自动生成课时", courseTimeEntities);
-
         //获取房间信息
         RBucket<RoomInfoCache> speakerCache = redissonClient.getBucket(LIVE_ROOM_INFO.replace(ROOM_UID, roomUid));
         if (speakerCache.isExists()) {
@@ -761,6 +911,14 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             result.put("房间信息", "房间信息不存在");
         }
 
+        //校验房间心跳是否过期没续租
+        RBucket<Date> lastRoomHeartbeatCache = redissonClient.getBucket(LIVE_ROOM_HEART_BEAT.replace(ROOM_UID, roomUid));
+        if (lastRoomHeartbeatCache.isExists()) {
+            result.put("房间心跳", DateUtil.dateToString(lastRoomHeartbeatCache.get(), DateUtil.EXPANDED_DATE_TIME_FORMAT));
+        } else {
+            result.put("房间心跳", "房间心跳不存在");
+        }
+
         //点赞数
         Object like = redissonClient.getBucket(LIVE_ROOM_LIKE.replace(ROOM_UID, roomUid)).get();
         if (Objects.isNull(like)) {
@@ -770,33 +928,31 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
 
         int totalLook = 0;
         int look = 0;
-        List<RoomUserInfoCache> inRoomUserInfo;
 
         //累计总观看的用户数量
-        List<RoomUserInfoCache> totalUserInfo = queryTotalRoomUserInfo(roomUid);
+        List<RoomUserInfoCache> totalUserInfo = getTotalUserInfo(roomUid);
         if (CollectionUtils.isNotEmpty(totalUserInfo)) {
-            //正在房间观看的用户数据
-            inRoomUserInfo = queryRoomUserInfo(totalUserInfo);
-            if (CollectionUtils.isNotEmpty(inRoomUserInfo)) {
-                look = inRoomUserInfo.size();
-                result.put("正在观看的人员信息", inRoomUserInfo);
-            } else {
-                result.put("正在观看的人员信息", "没有正在观看的人员数据");
-            }
             totalLook = totalUserInfo.size();
             result.put("总人员数据", totalUserInfo);
         } else {
             result.put("总人员数据", "没有人员数据");
         }
-
         result.put("总观看人数", totalLook);
+        //正在房间观看的用户数据
+        List<RoomUserInfoCache> onlineUserInfo = getOnlineUserInfo(roomUid);
+        if (CollectionUtils.isNotEmpty(onlineUserInfo)) {
+            look = onlineUserInfo.size();
+            result.put("正在观看的人员信息", onlineUserInfo);
+        } else {
+            result.put("正在观看的人员信息", "没有正在观看的人员数据");
+        }
         result.put("实时观看数", look);
         return result;
     }
 
     @Override
-    public LiveRoom getliveingRoomBySpeakerId(Long speakerId) {
-        return baseMapper.getliveingRoomBySpeakerId(speakerId);
+    public LiveRoom getLiveInRoomBySpeakerId(Long speakerId) {
+        return baseMapper.getLiveInRoomBySpeakerId(speakerId);
     }
 }
 

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

@@ -2,6 +2,9 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.TeacherAttendanceDao;
+import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
@@ -9,14 +12,22 @@ import com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
 import com.yonge.cooleshow.biz.dal.dao.StudentAttendanceDao;
 import com.yonge.cooleshow.biz.dal.service.StudentAttendanceService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 
 @Service
 public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceDao, StudentAttendance> implements StudentAttendanceService {
 
+    @Override
+    public StudentAttendanceDao getDao() {
+        return this.baseMapper;
+    }
+
 	@Override
     public StudentAttendanceVo detail(Long id) {
         StudentAttendanceVo detail = baseMapper.detail(id);
@@ -40,4 +51,52 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceD
         return null;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StudentAttendance signIn(Long userId, CourseSchedule courseSchedule) {
+        //查询是否已经签到
+        //如果存在则跳过，如果不存在则新增
+        StudentAttendance studentAttendance = getDao().findByUserIdAndCourseId(userId, courseSchedule.getId());
+        if (Objects.nonNull(studentAttendance)) {
+            if(Objects.isNull(studentAttendance.getSignInTime())){
+                studentAttendance.setSignInTime(new Date());
+                getDao().updateById(studentAttendance);
+            }
+            return studentAttendance;
+        }
+        Date now = new Date();
+        studentAttendance = createAttendance(userId, courseSchedule, now);
+        getDao().insert(studentAttendance);
+        return studentAttendance;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void signOut(Long userId, CourseSchedule courseSchedule) {
+        //更新签到记录
+        StudentAttendance studentAttendance = getDao().findByUserIdAndCourseId(userId, courseSchedule.getId());
+        Date now = new Date();
+        if (Objects.isNull(studentAttendance)) {
+            studentAttendance = createAttendance(userId, courseSchedule,now);
+            studentAttendance.setSignOutTime(now);
+            studentAttendance.setSignInTime(courseSchedule.getStartTime());
+            getDao().insert(studentAttendance);
+        }else {
+            studentAttendance.setSignOutTime(now);
+            studentAttendance.setUpdateTime(now);
+            getDao().updateById(studentAttendance);
+        }
+    }
+    private StudentAttendance createAttendance(Long userId, CourseSchedule courseSchedule,Date now) {
+        StudentAttendance studentAttendance = new StudentAttendance();
+        studentAttendance.setCourseScheduleId(courseSchedule.getId());
+        studentAttendance.setStudentId(userId);
+        studentAttendance.setSignInTime(now);
+        studentAttendance.setCourseGroupId(courseSchedule.getCourseGroupId());
+        studentAttendance.setCourseGroupType(courseSchedule.getType());
+        studentAttendance.setCreateTime(now);
+        studentAttendance.setUpdateTime(now);
+        return studentAttendance;
+    }
+
 }

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

@@ -2,11 +2,17 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.TeacherAttendanceDao;
+import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 import com.yonge.cooleshow.biz.dal.service.TeacherAttendanceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * 老师考勤表(TeacherAttendance)表服务实现类
@@ -24,5 +30,52 @@ public class TeacherAttendanceServiceImpl extends ServiceImpl<TeacherAttendanceD
         return this.baseMapper;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public TeacherAttendance signIn(Long userId, CourseSchedule courseSchedule) {
+        //查询是否已经签到
+        //如果存在则跳过，如果不存在则新增
+        TeacherAttendance teacherAttendance = getDao().findByUserIdAndCourseId(userId, courseSchedule.getId());
+        if (Objects.nonNull(teacherAttendance)) {
+            if(Objects.isNull(teacherAttendance.getSignInTime())){
+                teacherAttendance.setSignInTime(new Date());
+                getDao().updateById(teacherAttendance);
+            }
+            return teacherAttendance;
+        }
+        teacherAttendance = createAttendance(userId, courseSchedule,new Date());
+        getDao().insert(teacherAttendance);
+        return teacherAttendance;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void signOut(Long userId, CourseSchedule courseSchedule) {
+        //更新签到记录
+        TeacherAttendance teacherAttendance = getDao().findByUserIdAndCourseId(userId, courseSchedule.getId());
+        Date now = new Date();
+        if (Objects.isNull(teacherAttendance)) {
+            teacherAttendance = createAttendance(userId, courseSchedule, now);
+            teacherAttendance.setSignOutTime(teacherAttendance.getSignInTime());
+            teacherAttendance.setSignInTime(courseSchedule.getStartTime());
+            getDao().insert(teacherAttendance);
+        }else {
+            teacherAttendance.setSignOutTime(now);
+            teacherAttendance.setUpdateTime(now);
+            getDao().updateById(teacherAttendance);
+        }
+    }
+
+    private TeacherAttendance createAttendance(Long userId, CourseSchedule courseSchedule,Date now) {
+        TeacherAttendance teacherAttendance = new TeacherAttendance();
+        teacherAttendance.setCourseScheduleId(courseSchedule.getId());
+        teacherAttendance.setTeacherId(userId);
+        teacherAttendance.setSignInTime(now);
+        teacherAttendance.setCourseGroupId(courseSchedule.getCourseGroupId());
+        teacherAttendance.setCourseGroupType(courseSchedule.getType());
+        teacherAttendance.setCreateTime(now);
+        teacherAttendance.setUpdateTime(now);
+        return teacherAttendance;
+    }
 }
 

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

@@ -315,7 +315,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null == data) {
             return HttpResponseResult.failed("未查询到用户信息");
         }
-        LiveRoom liveRoom = liveRoomService.getliveingRoomBySpeakerId(teacherId);
+        LiveRoom liveRoom = liveRoomService.getLiveInRoomBySpeakerId(teacherId);
         if (null != liveRoom) {
             data.setRoomUid(liveRoom.getRoomUid());
             data.setLiveing(YesOrNoEnum.YES);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/IMHelper.java

@@ -429,6 +429,7 @@ public class IMHelper {
         log.info("publish msg: {}", msgStr);
         sb.append("&objectName=").append(URLEncoder.encode(message.getObjectName(), UTF8));
         sb.append("&content=").append(URLEncoder.encode(msgStr, UTF8));
+        sb.append("&isIncludeSender=1");
 
         String body = sb.toString();
         if (body.indexOf("&") == 0) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseAdjustVo.java

@@ -26,7 +26,6 @@ public class CourseAdjustVo implements Serializable {
     private Date startTime;
 
     @ApiModelProperty(value = "下课时间")
-    @NotNull(message = "下课时间")
     private Date endTime;
 
     public Integer getCourseId() {

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleRecordMapper.xml

@@ -73,6 +73,7 @@
         s.end_time_ AS endTime,
         s.single_course_time_ AS singleCourseTime,
         a.count_ AS studentCount,
+        (CASE WHEN s.status_ = 'NOT_START' THEN 0 ELSE ( a.count_ + 1 )*(a.count_)* s.single_course_time_ END) AS consumTime,
         i.id_ AS imGroupId
         FROM course_schedule s
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_

cooleshow-user/user-biz/src/main/resources/config/mybatis/LiveRoomMapper.xml

@@ -40,7 +40,7 @@
         </foreach>
     </insert>
 
-    <select id="getliveingRoomBySpeakerId" resultType="com.yonge.cooleshow.biz.dal.entity.LiveRoom">
+    <select id="getLiveInRoomBySpeakerId" resultType="com.yonge.cooleshow.biz.dal.entity.LiveRoom">
         select * from live_room
         where speaker_id_ = #{speakerId} and live_state_ = 1 and room_state_ = 0
         order by live_start_time_ desc limit 1

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentAttendanceMapper.xml

@@ -38,4 +38,8 @@
         	<include refid="baseColumns" />
 		FROM student_attendance t
 	</select>
+    <select id="findByUserIdAndCourseId" resultMap="BaseResultMap">
+        select * from student_attendance where student_id_ = #{userId} and
+        course_schedule_id_ = #{courseId} LIMIT 1
+    </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -29,5 +29,9 @@
             #{entity.signInTime}, #{entity.signOutTime}, #{entity.createTime}, #{entity.updateTime})
         </foreach>
     </insert>
+    <select id="findByUserIdAndCourseId" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" /> from teacher_attendance where teacher_id_ = #{userId} and
+        course_schedule_id_ = #{courseId} LIMIT 1
+    </select>
 
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentLiveRoomController.java

@@ -44,22 +44,14 @@ public class StudentLiveRoomController extends BaseController {
         return succeed(liveRoomService.queryRoomInfo(roomUid));
     }
 
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "roomTitle", dataType = "String", value = "房间标题"),
-            @ApiImplicitParam(name = "liveRemark", dataType = "String", value = "直播内容/最多200个字"),
-    })
-    @ApiOperation("创建临时房间-直播间")
-    @PostMapping("/createTempLiveRoom")
-    public HttpResponseResult<String> createTempLiveRoom(@RequestBody Map<String, Object> param) {
-        return succeed(liveRoomService.createTempLiveRoom(param));
-    }
-
-    @ApiOperation("同步点赞数量")
-    @GetMapping("/syncLike")
-    public HttpResponseResult<Object> syncLike(@ApiParam(value = "房间uid", required = true) String roomUid,
-                                       @ApiParam(value = "点赞数", required = true) Integer likeNum) {
-        liveRoomService.syncLike(roomUid, likeNum);
-        return succeed();
+    /**
+     * 校验房间信息，及个人信息
+     *
+     * @param roomUid 房间uid
+     */
+    @GetMapping("/studentCheckRoomInfo")
+    public HttpResponseResult<RoomVo> studentCheckRoomInfo(@RequestParam("roomUid") String roomUid) {
+        return succeed(liveRoomService.studentCheckRoomInfo(roomUid));
     }
 
     @ApiOperation("进入房间")
@@ -68,24 +60,6 @@ public class StudentLiveRoomController extends BaseController {
         return succeed(liveRoomService.joinRoom(roomUid, userId));
     }
 
-    @ApiOperation("定时任务-创建房间-直播间")
-    @GetMapping("/createCourseLiveRoom")
-    public void createCourseLiveRoom() {
-        liveRoomService.createCourseLiveRoom();
-    }
-
-    @ApiOperation("定时任务-销毁房间-直播间")
-    @GetMapping("/destroyExpiredLiveRoom")
-    public void destroyExpiredLiveRoom() {
-        liveRoomService.destroyExpiredLiveRoom();
-    }
-
-    @ApiOperation("定时任务-销毁房间-直播间-陪练课")
-    @GetMapping("/destroyExpiredPracticeRoom")
-    public void destroyExpiredPracticeRoom() {
-        liveRoomService.destroyExpiredPracticeRoom();
-    }
-
     /**
      * 同步融云用户状态变更
      *

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

@@ -47,6 +47,7 @@ public class TeacherLiveRoomController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "roomTitle", dataType = "String", value = "房间标题"),
             @ApiImplicitParam(name = "liveRemark", dataType = "String", value = "直播内容/最多200个字"),
+            @ApiImplicitParam(name = "liveTime", dataType = "Integer", value = "直播时长"),
     })
     @ApiOperation("创建临时房间-直播间")
     @PostMapping("/createTempLiveRoom")
@@ -63,9 +64,9 @@ public class TeacherLiveRoomController extends BaseController {
     }
 
     @ApiOperation("进入房间")
-    @GetMapping(value = "/joinRoom")
-    public HttpResponseResult<RoomInfoCache> joinRoom(String roomUid, Long userId) {
-        return succeed(liveRoomService.joinRoom(roomUid, userId));
+    @GetMapping(value = "/speakerJoinRoom")
+    public HttpResponseResult<RoomInfoCache> speakerJoinRoom(String roomUid, Long userId) {
+        return succeed(liveRoomService.speakerJoinRoom(roomUid, userId));
     }
 
     @ApiOperation("定时任务-创建房间-直播间")

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -141,4 +141,30 @@ public class MusicSheetController extends BaseController {
         musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());
         return succeed("新增曲谱成功");
     }
+
+
+
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheetDto musicSheet) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicSheet.getId()==null){
+            return failed("缺少ID");
+        }
+
+        musicSheet.setUpdateBy(sysUser.getId());
+        musicSheet.setUpdateTime(new Date());
+        musicSheet.setSubmitAuditTime(new Date());
+        musicSheet.setAuditStatus(AuthStatusEnum.DOING);
+        musicSheet.setUpdateBy(sysUser.getId());
+        musicSheet.setUpdateTime(new Date());
+        if ( musicSheetService.saveMusicSheet(musicSheet,sysUser.getId())){
+            return succeed("修改成功");
+        } else {
+            return failed("修改失败");
+        }
+    }
 }