diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java index a6c282af..fa967bc4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java @@ -80,6 +80,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler userIds = new ArrayList<>(); - //类型转换 - for (String s : onlineUserList) { - userIds.add(Long.parseLong(s)); - } +// List userIds = new ArrayList<>(); +// //类型转换 +// for (String s : onlineUserList) { +// userIds.add(Long.parseLong(s)); +// } // List userDTOS = sysUserService.selectListByIds(userIds); //构建各个聊天房间未读 数量 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(ChatGroup::getMembers, loginUser.getUserId()+",").or().like(ChatGroup::getMembers,loginUser.getUserId()+"]"); - //拿到该用户的房间列表 + //拿到该用户所参与的房间列表 List chatGroups = chatGroupService.list(queryWrapper); + boolean isHaveSystemRoom = false; if (chatGroups != null && !chatGroups.isEmpty()) { -// List> roomCounts = new ArrayList<>(); HashMap roomCounts = new HashMap<>(); for (ChatGroup chatGroup : chatGroups) { - LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); - queryWrapper1.eq(ChatHistory::getGeterId, chatGroup.getId()); - queryWrapper1.ne(ChatHistory::getSenderId, loginUser.getUserId()); - queryWrapper1.eq(ChatHistory::getIsRead, "1"); - List list = chatHistoryService.list(queryWrapper1); + LambdaQueryWrapper historyLambdaQueryWrapper = new LambdaQueryWrapper<>(); + historyLambdaQueryWrapper.eq(ChatHistory::getGeterId, chatGroup.getId()); + historyLambdaQueryWrapper.ne(ChatHistory::getSenderId, loginUser.getUserId()); + historyLambdaQueryWrapper.eq(ChatHistory::getIsRead, "1"); + List list = chatHistoryService.list(historyLambdaQueryWrapper); if (list != null && !list.isEmpty()) { -// HashMap map = new HashMap<>(); roomCounts.put(chatGroup.getId().toString(), list.size()); -// roomCounts.add(map); + } + //在遍历的同时寻找是否有系统消息房间 + if (chatGroup.getMembers().contains("system")){ + isHaveSystemRoom = true; } } - - JSONObject message = new JSONObject(); -// message.put("type", "2"); -// message.put("onLineUser", userDTOS); message.put("type", "3"); message.put("unReadCount", roomCounts); log.info("发送所有未读消息:{}",message); -// channelGroup.writeAndFlush(new TextWebSocketFrame(message.toJSONString())); - sendMessage(ctx, message.toJSONString()); - } + //认证完成后开始构建系统消息房间 判断是否有系统消息房间 没有则增加 + if (!isHaveSystemRoom){ + ChatGroup chatGroup = new ChatGroup(); + chatGroup.setType(String.valueOf(0)); + chatGroup.setMembers("[system, "+loginUser.getUserId()+"]"); + chatGroupService.save(chatGroup); + } + } } super.userEventTriggered(ctx, evt); } @@ -249,16 +253,16 @@ public class ChatServerHandler extends SimpleChannelInboundHandler channelHandlerContexts = userChannelMap.get(id.toString()); //如果满足则说明用户在线 if (channelHandlerContexts != null && !channelHandlerContexts.isEmpty()) { - //只要发送一条数据，就要给接收方推送所有未读消息 - if (!userRoomCountMap.containsKey(id + "+" + RoomId)) { - userRoomCountMap.put(id + "+" + RoomId, 1); - }else { - userRoomCountMap.put(id + "+" + RoomId, userRoomCountMap.get(id + "+" + RoomId) + 1); - } //所有房间的未读消息数 jsonObject.put("countValue", JsonUtils.toJsonString(userRoomCountMap)); //给每个通道发送对应消息 @@ -285,12 +289,12 @@ public class ChatServerHandler extends SimpleChannelInboundHandler lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper .eq(ChatHistory::getSenderId,jsonObject.get("from")) .eq(ChatHistory::getGeterId,jsonObject.get("roomId")) - .eq(ChatHistory::getMessage,jsonObject.get("message")) +// .eq(ChatHistory::getMessage,jsonObject.get("message")) .eq(ChatHistory::getIsRead,"1"); List list = chatHistoryService.list(lambdaQueryWrapper); if (list != null && !list.isEmpty()){ @@ -300,13 +304,19 @@ public class ChatServerHandler extends SimpleChannelInboundHandler 0) { - userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), userRoomCountMap.get(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId")) - 1); - }else { - userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), 0); - } + //将该房间未读消息 清空 + userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), 0); +// if(userRoomCountMap.get(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId")) != null && userRoomCountMap.get(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId")) > 0) { +// userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), userRoomCountMap.get(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId")) - 1); +// }else { +// userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), 0); +// } } +// else if ("2".equals(type)){ +// //前端点击某个聊天房间进入时 仅需发送type2 清空该房间的未读消息数 +// userRoomCountMap.put(channelUserMap.get(ctx) + "+" + jsonObject.get("roomId"), 0); +// //将该房间对应消息都置为已读 +// } } // 处理异常 @@ -330,7 +340,52 @@ public class ChatServerHandler extends SimpleChannelInboundHandler channelHandlerContexts = userChannelMap.get(userId.toString()); + if (channelHandlerContexts != null && !channelHandlerContexts.isEmpty()) { + //给每个通道发送对应消息 + for (ChannelHandlerContext handlerContext : channelHandlerContexts) { + sendMessage(handlerContext, jsonObject.toString()); + } + } + //生成系统消息的聊天记录 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ChatGroup::getMembers,"[system, "+userId+"]"); + ChatGroup groupServiceOne = chatGroupService.getOne(lambdaQueryWrapper); + //如果给成员发送系统消息 而该成员还没有建立过连接从而没有群聊房间 则创建该成员系统消息房间 + if (groupServiceOne == null){ + groupServiceOne = new ChatGroup(); + groupServiceOne.setType(String.valueOf(0)); + groupServiceOne.setMembers("[system, "+userId+"]"); + chatGroupService.save(groupServiceOne); + } + ChatHistory chatHistory = new ChatHistory(); + //发送方设置为0 表示系统消息 + chatHistory.setSenderId(0L); + chatHistory.setGeterId(groupServiceOne.getId()); + chatHistory.setMessage(message); + chatHistory.setMessageDate(new Date()); + chatHistory.setIsRead("1");//未读 + chatHistoryService.save(chatHistory); + + //发送消息后 将该房间未读消息数加1 + if (userRoomCountMap.containsKey(userId+"+"+groupServiceOne.getId())){ + //该房间未读消息数加1 + userRoomCountMap.put(userId+"+"+groupServiceOne.getId(), userRoomCountMap.get(userId+"+"+groupServiceOne.getId())+1); + }else{ + //将该房间未读消息数设置为1 + userRoomCountMap.put(userId+"+"+groupServiceOne.getId(), 1); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java index 39e17fb0..f60c4bf5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/controller/ChatGroupController.java @@ -149,13 +149,22 @@ public class ChatGroupController { List list = JSONObject.parseArray(members, Long.class); list.remove(userId); //如果单聊 则集合只剩有一人 - SysUserVo sysUserVo = sysUserService.selectUserById(list.get(0)); - byId.setName(sysUserVo.getNickName()); - byId.setAvatar(sysUserVo.getAvatar()); + SysUserVo sysUserVo = sysUserService.selectUserById(list.getFirst()); + if (sysUserVo != null) { + byId.setName(sysUserVo.getNickName()); + byId.setAvatar(sysUserVo.getAvatar()); + }else{ + byId.setName("此用户已注销"); + byId.setAvatar(null); + } }else { //群聊 则只需要将群主头像赋值给群聊头像 SysUserVo sysUserVo = sysUserService.selectUserById(byId.getOwerId()); - byId.setAvatar(sysUserVo.getAvatar()); + if (sysUserVo != null){ + byId.setAvatar(sysUserVo.getAvatar()); + }else { + byId.setAvatar(null); + } } }