Merge remote-tracking branch 'origin/master'

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

@@ -33,6 +33,12 @@ public class RoomInfoCache implements Serializable {
     @ApiModelProperty(value = "房间uid")
     private String roomUid;
 
+    @ApiModelProperty(value = "房间标题/最多12个字")
+    private String roomTitle;
+
+    @ApiModelProperty(value = "直播内容/最多200个字")
+    private String liveRemark;
+
     @ApiModelProperty(value = "直播开始时间")
     private Date liveStartTime;
 
@@ -190,4 +196,20 @@ public class RoomInfoCache implements Serializable {
     public void setSpeakerPic(String speakerPic) {
         this.speakerPic = speakerPic;
     }
+
+    public String getRoomTitle() {
+        return roomTitle;
+    }
+
+    public void setRoomTitle(String roomTitle) {
+        this.roomTitle = roomTitle;
+    }
+
+    public String getLiveRemark() {
+        return liveRemark;
+    }
+
+    public void setLiveRemark(String liveRemark) {
+        this.liveRemark = liveRemark;
+    }
 }

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

@@ -337,6 +337,8 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         roomCache.setSpeakerPic(sysUser.getAvatar());
         roomCache.setSpeakerState(1);
         roomCache.setRoomUid(room.getRoomUid());
+        roomCache.setRoomTitle(room.getRoomTitle());
+        roomCache.setLiveRemark(room.getLiveRemark());
         roomCache.setLiveStartTime(room.getLiveStartTime());
         roomCache.setLiveEndTime(room.getLiveEndTime());
         roomCache.setCreateRoomTime(new Date());
@@ -621,8 +623,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
 
     /**
      * 主讲人
-     *
-     * @return true 是主讲人 false 不是主讲人
      */
     private void opsSpeaker(RBucket<RoomInfoCache> roomInfoCache, ImUserStateSync user, Date now, String userIdStr) {
         RoomInfoCache roomInfo = roomInfoCache.get();