From 646b503d47fa4a2baea90914556d2e10a294780f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 17 Sep 2025 14:54:03 +0800
Subject: [PATCH] =?UTF-8?q?09-17-netty=E8=BF=9E=E6=8E=A5=E5=90=8E=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=8F=AA=E5=88=9B=E5=BB=BA=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/websocket/ChatServerHandler.java  | 57 +++++++------------
 1 file changed, 22 insertions(+), 35 deletions(-)

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 e0aa8706..0ae76860 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
@@ -186,30 +186,28 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
             }
 
             //考勤
-            if (!isHaveAttendanceRoom){
-                ChatGroup chatGroup = new ChatGroup();
-                chatGroup.setType(String.valueOf(3));
-                chatGroup.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId() +", "+loginUser.getUserId()+"]");
-                chatGroupService.save(chatGroup);
-            }
-
-            //安全
-            if (!isHaveSafeRoom){
-                ChatGroup chatGroup = new ChatGroup();
-                chatGroup.setType(String.valueOf(4));
-                chatGroup.setMembers("["+ChatRoomEnum.SAFE.getRoomId() +", "+loginUser.getUserId()+"]");
-//                chatGroup.setMembers("[101, "+loginUser.getUserId()+"]");
-                chatGroupService.save(chatGroup);
-            }
-
-            //质量
-            if (!isHaveQualityRoom){
-                ChatGroup chatGroup = new ChatGroup();
-                chatGroup.setType(String.valueOf(5));
-                chatGroup.setMembers("["+ChatRoomEnum.QUALITY.getRoomId() +", "+loginUser.getUserId()+"]");
-//                chatGroup.setMembers("[102, "+loginUser.getUserId()+"]");
-                chatGroupService.save(chatGroup);
-            }
+//            if (!isHaveAttendanceRoom){
+//                ChatGroup chatGroup = new ChatGroup();
+//                chatGroup.setType(String.valueOf(3));
+//                chatGroup.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId() +", "+loginUser.getUserId()+"]");
+//                chatGroupService.save(chatGroup);
+//            }
+//
+//            //安全
+//            if (!isHaveSafeRoom){
+//                ChatGroup chatGroup = new ChatGroup();
+//                chatGroup.setType(String.valueOf(4));
+//                chatGroup.setMembers("["+ChatRoomEnum.SAFE.getRoomId() +", "+loginUser.getUserId()+"]");
+//                chatGroupService.save(chatGroup);
+//            }
+//
+//            //质量
+//            if (!isHaveQualityRoom){
+//                ChatGroup chatGroup = new ChatGroup();
+//                chatGroup.setType(String.valueOf(5));
+//                chatGroup.setMembers("["+ChatRoomEnum.QUALITY.getRoomId() +", "+loginUser.getUserId()+"]");
+//                chatGroupService.save(chatGroup);
+//            }
 
             //等待全部创建完成后 初次创建系统房间后 发送一条初始化信息
             if (!isHaveSystemRoom) {
@@ -480,11 +478,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                     groupServiceOne.setMembers("["+ChatRoomEnum.SYSTEM.getRoomId()+", "+userId+"]");
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.save(groupServiceOne);
                 }else {
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.updateById(groupServiceOne);
                 }
                 chatHistory = new ChatHistory();
                 //发送方设置为99 表示系统消息
@@ -493,13 +489,11 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessage(jsonObject.toString());
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
-//                chatHistoryService.save(chatHistory);
                 jsonObject.put("roomId", groupServiceOne.getId());
             }
 
             //2:考勤消息
             case "1" ->{
-//                lambdaQueryWrapper.eq(ChatGroup::getMembers,"[100, "+userId+"]");
                 lambdaQueryWrapper.eq(ChatGroup::getMembers,"["+ChatRoomEnum.ATTENDANCE.getRoomId()+", "+userId+"]");
                 groupServiceOne = chatGroupService.getOne(lambdaQueryWrapper);
                 //如果给成员发送考勤消息 而该成员还没有建立过连接从而没有考勤房间 则创建该成员考勤消息房间
@@ -509,11 +503,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                     groupServiceOne.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId()+", "+userId+"]");
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.save(groupServiceOne);
                 }else {
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.updateById(groupServiceOne);
                 }
                 chatHistory = new ChatHistory();
                 //发送方设置为100 表示系统消息中的考勤消息
@@ -522,7 +514,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessage(jsonObject.toString());
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
-//                chatHistoryService.save(chatHistory);
                 jsonObject.put("roomId", groupServiceOne.getId());
             }
 
@@ -537,11 +528,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                     groupServiceOne.setMembers("["+ChatRoomEnum.SAFE.getRoomId()+", "+userId+"]");
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.save(groupServiceOne);
                 }else {
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.updateById(groupServiceOne);
                 }
                 chatHistory = new ChatHistory();
                 //发送方设置为101 表示系统消息中的安全消息
@@ -550,7 +539,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessage(jsonObject.toString());
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
-//                chatHistoryService.save(chatHistory);
                 jsonObject.put("roomId", groupServiceOne.getId());
             }
 
@@ -565,7 +553,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                     groupServiceOne.setMembers("["+ChatRoomEnum.QUALITY.getRoomId()+", "+userId+"]");
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());
-//                    chatGroupService.save(groupServiceOne);
                 }else {
                     groupServiceOne.setLastMessage(message);
                     groupServiceOne.setLastMessageTime(new Date());