From 3e1b698ea8086991e3023b1cac9e79c34f9f6a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Mon, 15 Sep 2025 15:24:52 +0800
Subject: [PATCH] =?UTF-8?q?09-14-netty=E4=BC=98=E5=8C=96,=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E6=9A=82=E7=95=99=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysUserController.java  |  2 +-
 .../controller/ChatGroupController.java       | 76 +++++++++++--------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
index f349dacc..2317252a 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -59,7 +59,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-//    @SaCheckPermission("system:user:list")
+    @SaCheckPermission("system:user:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
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 506565d1..6b41bbe2 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
@@ -98,7 +98,7 @@ public class ChatGroupController {
 
 
     /***
-     * 查看与自己有关聊天房间 不论单群
+     * 查看与自己有关聊天房间列表 不论单群
      */
 //    @SaCheckPermission("chatGroup:list:getList")
     @GetMapping("/list")
@@ -115,6 +115,7 @@ public class ChatGroupController {
         if (!list.isEmpty()) {
             for (ChatGroup chatGroup : list) {
                 setValue(chatGroup, userId);
+                //过滤搜索
                 if (searchObject != null && searchObject.getName() != null && !searchObject.getName().isEmpty()) {
                     if (chatGroup.getName().contains(searchObject.getName())) {
                         searchTemp.add(chatGroup);
@@ -180,41 +181,52 @@ public class ChatGroupController {
      * 将房间进行返回前的处理
      */
     private void setValue(ChatGroup byId, Long userId){
-        if (byId.getType().equals("0")){
-            //单聊 要获取对方头像 对方的名称作为聊天昵称
-            String members = byId.getMembers();
-            List<Long> list = JSONObject.parseArray(members, Long.class);
-            list.remove(userId);
-            //如果单聊 则集合只剩有一人
-            SysUserVo sysUserVo = sysUserService.selectUserById(list.getFirst());
-            if (sysUserVo != null) {
-                byId.setName(sysUserVo.getNickName());
-                byId.setAvatar(sysUserVo.getAvatar());
-            }else{
-                byId.setName("此用户已注销");
+
+        switch (byId.getType()) {
+            case "0" -> {
+                //单聊 要获取对方头像 对方的名称作为聊天昵称
+                String members = byId.getMembers();
+                List<Long> list = JSONObject.parseArray(members, Long.class);
+                list.remove(userId);
+                //如果单聊 则集合只剩有一人
+                SysUserVo sysUserVo = sysUserService.selectUserById(list.getFirst());
+                if (sysUserVo != null) {
+                    byId.setName(sysUserVo.getNickName());
+                    byId.setAvatar(sysUserVo.getAvatar());
+                } else {
+                    byId.setName("此用户已注销");
+                    byId.setAvatar(null);
+                }
+            }
+            case "1" -> {
+                //群聊 则只需要将群主头像赋值给群聊头像
+                SysUserVo sysUserVo = sysUserService.selectUserById(byId.getOwerId());
+                if (sysUserVo != null) {
+                    byId.setAvatar(sysUserVo.getAvatar());
+                } else {
+                    byId.setAvatar(null);
+                }
+            }
+            case "2" -> {
+                //消息通知
+                byId.setName("系统消息");
                 byId.setAvatar(null);
             }
-        }else if (byId.getType().equals("2")){
-            //消息通知
-            byId.setName("系统消息");
-            byId.setAvatar(null);
-        } else if (byId.getType().equals("3")) {
-            byId.setName("考勤消息");
-            byId.setAvatar( null);
-        }else if (byId.getType().equals("4")){
-            byId.setName("安全消息");
-            byId.setAvatar( null);
-        }else if (byId.getType().equals("5")){
-            byId.setName("质量消息");
-            byId.setAvatar( null);
-        } else {
-            //群聊 则只需要将群主头像赋值给群聊头像
-            SysUserVo sysUserVo = sysUserService.selectUserById(byId.getOwerId());
-            if (sysUserVo != null) {
-                byId.setAvatar(sysUserVo.getAvatar());
-            } else {
+            case "3" -> {
+                byId.setName("考勤消息");
                 byId.setAvatar(null);
             }
+            case "4" -> {
+                byId.setName("安全消息");
+                byId.setAvatar(null);
+            }
+            case "5" -> {
+                byId.setName("质量消息");
+                byId.setAvatar(null);
+            }
+            default -> {
+
+            }
         }
 
         LambdaQueryWrapper<ChatHistory> historyLambdaQueryWrapper = new LambdaQueryWrapper<>();