|
@@ -11,6 +11,7 @@ import com.zanxiang.game.module.manage.service.IKfSessionUserService;
|
|
|
import com.zanxiang.game.module.mybatis.entity.KfRoomMsg;
|
|
|
import com.zanxiang.game.module.mybatis.entity.KfSessionUser;
|
|
|
import com.zanxiang.game.module.mybatis.mapper.KfSessionUserMapper;
|
|
|
+import com.zanxiang.module.util.JsonUtil;
|
|
|
import com.zanxiang.module.util.bean.BeanUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -51,8 +52,16 @@ public class KfSessionUserServiceImpl extends ServiceImpl<KfSessionUserMapper, K
|
|
|
.eq(KfRoomMsg::getReadStatus, Boolean.FALSE)
|
|
|
.isNull(KfRoomMsg::getRoomId)
|
|
|
.orderByDesc(KfRoomMsg::getCreateTime));
|
|
|
+
|
|
|
+ log.error("查询待接入消息 : kfRoomMsgPage : {}", JsonUtil.toString(kfRoomMsgPage));
|
|
|
+
|
|
|
+
|
|
|
List<KfWebSocketMsgDTO.WaitUserMsgBean> waitUserMsgList = kfRoomMsgPage.getRecords()
|
|
|
.stream().map(this::transform).collect(Collectors.toList());
|
|
|
+
|
|
|
+ log.error("设置待接入玩家消息 records : {}, waitUserMsgList : {}", JsonUtil.toString(kfRoomMsgPage.getRecords()),
|
|
|
+ JsonUtil.toString(waitUserMsgList));
|
|
|
+
|
|
|
waitUserBean.setWaitUserMsgList(waitUserMsgList);
|
|
|
waitUserBean.setUnReadMsgCount(kfRoomMsgPage.getTotal());
|
|
|
return waitUserBean;
|
|
@@ -64,8 +73,15 @@ public class KfSessionUserServiceImpl extends ServiceImpl<KfSessionUserMapper, K
|
|
|
}
|
|
|
//等待消息对象
|
|
|
KfWebSocketMsgDTO.WaitUserMsgBean waitUserMsgBean = BeanUtil.copy(kfRoomMsg.getContent(), KfWebSocketMsgDTO.WaitUserMsgBean.class);
|
|
|
+
|
|
|
+ log.error("等待消息对象 waitUserMsgBean : {}", JsonUtil.toString(waitUserMsgBean));
|
|
|
+
|
|
|
//消息内容解析
|
|
|
KfWebSocketMsgDTO.MsgContentBean msgContent = BeanUtil.copy(waitUserMsgBean.getContent(), KfWebSocketMsgDTO.MsgContentBean.class);
|
|
|
+
|
|
|
+ log.error("消息内容解析 msgContent : {}", JsonUtil.toString(msgContent));
|
|
|
+
|
|
|
+
|
|
|
//消息内容转换
|
|
|
if (Objects.equals(waitUserMsgBean.getMsgType(), KfRoomMsgTypeEnum.KF_MSG_TYPE_TEXT.getValue())) {
|
|
|
waitUserMsgBean.setContent(msgContent.getText());
|