lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

09-17-netty完善

Browse Source
This commit is contained in:
青云
2025-09-17 18:32:52 +08:00
parent 4ffb639d33
commit b35ff07ba4
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
View File

@ -135,12 +135,12 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
//拿到该用户所参与的房间列表 //拿到该用户所参与的房间列表
List<ChatGroup> chatGroups = chatGroupService.list(queryWrapper); List<ChatGroup> chatGroups = chatGroupService.list(queryWrapper);
boolean isHaveSystemRoom = false; boolean isHaveSystemRoom = false;
//考勤 // //考勤
boolean isHaveAttendanceRoom = false; // boolean isHaveAttendanceRoom = false;
//安全 // //安全
boolean isHaveSafeRoom = false; // boolean isHaveSafeRoom = false;
//质量 // //质量
boolean isHaveQualityRoom = false; // boolean isHaveQualityRoom = false;
if (chatGroups != null && !chatGroups.isEmpty()) { if (chatGroups != null && !chatGroups.isEmpty()) {
HashMap<String, Object> roomCounts = new HashMap<>(); HashMap<String, Object> roomCounts = new HashMap<>();
for (ChatGroup chatGroup : chatGroups) { for (ChatGroup chatGroup : chatGroups) {
@ -269,7 +269,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
channelUserMap.remove(ctx); channelUserMap.remove(ctx);
} }
log.info(ctx.channel().remoteAddress() + " 下线了"); log.info("{} 下线了", ctx.channel().remoteAddress());
} }
// 当通道就绪时调用 // 当通道就绪时调用
@ -485,11 +485,10 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory = new ChatHistory(); chatHistory = new ChatHistory();
//发送方设置为99 表示系统消息 //发送方设置为99 表示系统消息
chatHistory.setSenderId(99L); chatHistory.setSenderId(99L);
chatHistory.setGeterId(groupServiceOne.getId());
chatHistory.setMessage(jsonObject.toString()); chatHistory.setMessage(jsonObject.toString());
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
jsonObject.put("roomId", groupServiceOne.getId());
} }
//2:考勤消息 //2:考勤消息
@ -510,11 +509,10 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory = new ChatHistory(); chatHistory = new ChatHistory();
//发送方设置为100 表示系统消息中的考勤消息 //发送方设置为100 表示系统消息中的考勤消息
chatHistory.setSenderId(100L); chatHistory.setSenderId(100L);
chatHistory.setGeterId(groupServiceOne.getId());
chatHistory.setMessage(jsonObject.toString()); chatHistory.setMessage(jsonObject.toString());
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
jsonObject.put("roomId", groupServiceOne.getId()); jsonObject.put("nickName","考勤消息");
} }
//安全消息 //安全消息
@ -535,11 +533,10 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory = new ChatHistory(); chatHistory = new ChatHistory();
//发送方设置为101 表示系统消息中的安全消息 //发送方设置为101 表示系统消息中的安全消息
chatHistory.setSenderId(101L); chatHistory.setSenderId(101L);
chatHistory.setGeterId(groupServiceOne.getId());
chatHistory.setMessage(jsonObject.toString()); chatHistory.setMessage(jsonObject.toString());
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
jsonObject.put("roomId", groupServiceOne.getId()); jsonObject.put("nickName","安全消息");
} }
//质量消息 //质量消息
@ -556,17 +553,14 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
}else { }else {
groupServiceOne.setLastMessage(message); groupServiceOne.setLastMessage(message);
groupServiceOne.setLastMessageTime(new Date()); groupServiceOne.setLastMessageTime(new Date());
// chatGroupService.updateById(groupServiceOne);
} }
chatHistory = new ChatHistory(); chatHistory = new ChatHistory();
//发送方设置为102 表示系统消息中的质量消息 //发送方设置为102 表示系统消息中的质量消息
chatHistory.setSenderId(102L); chatHistory.setSenderId(102L);
chatHistory.setGeterId(groupServiceOne.getId());
chatHistory.setMessage(jsonObject.toString()); chatHistory.setMessage(jsonObject.toString());
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
jsonObject.put("nickName","质量消息");
jsonObject.put("roomId", groupServiceOne.getId());
} }
default -> { default -> {
@ -575,7 +569,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
} }
chatGroupService.saveOrUpdate(groupServiceOne); chatGroupService.saveOrUpdate(groupServiceOne);
jsonObject.put("roomId", groupServiceOne.getId());
chatHistory.setMessageType(jsonObject.get("messageType").toString()); chatHistory.setMessageType(jsonObject.get("messageType").toString());
chatHistory.setGeterId(groupServiceOne.getId());
chatHistoryService.save(chatHistory); chatHistoryService.save(chatHistory);
//发送消息后 将该房间未读消息数加1 //发送消息后 将该房间未读消息数加1