From da20820627b23185b8f157f42e11fe4f0e6b2c6b 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 16:28:54 +0800
Subject: [PATCH] =?UTF-8?q?09-15-netty=E4=BC=98=E5=8C=96,=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0roomId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusLandTransferLedgerController.java      |  4 +-
 .../dromara/websocket/ChatServerHandler.java  | 40 +++++++++++--------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java
index 7e2c889b..74924425 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java
@@ -167,7 +167,9 @@ public class BusLandTransferLedgerController extends BaseController {
                     }
                 }
             }
-            areaSum = areaSum.add(busLandTransferLedger.getDesignArea());
+            if (busLandTransferLedger.getDesignArea()!=null) {
+                areaSum = areaSum.add(busLandTransferLedger.getDesignArea());
+            }
         }
         map.put("areaSum",areaSum);
         map.put("transferAreaSum",transferAreaSum);
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 67f89129..47075a1b 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
@@ -37,26 +37,30 @@ import java.util.concurrent.ConcurrentHashMap;
 public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
 
     // 移除 @Autowired 注解
-    private static ChatHistoryServiceImpl chatHistoryService;
-    private static ChatGroupServiceImpl chatGroupService;
-    private static SysUserServiceImpl sysUserService;
-    private static SysOssServiceImpl sysOssService;
     @Autowired
-    public void setChatHistoryService(ChatHistoryServiceImpl service) {
-        chatHistoryService = service;
-    }
+    private  ChatHistoryServiceImpl chatHistoryService;
     @Autowired
-    public void setChatGroupService(ChatGroupServiceImpl service){
-        chatGroupService = service;
-    }
+    private  ChatGroupServiceImpl chatGroupService;
     @Autowired
-    public void setSysUserService(SysUserServiceImpl service){
-        sysUserService = service;
-    }
+    private  SysUserServiceImpl sysUserService;
     @Autowired
-    public void setSysOssService(SysOssServiceImpl service){
-        sysOssService = service;
-    }
+    private  SysOssServiceImpl sysOssService;
+//    @Autowired
+//    public void setChatHistoryService(ChatHistoryServiceImpl service) {
+//        chatHistoryService = service;
+//    }
+//    @Autowired
+//    public void setChatGroupService(ChatGroupServiceImpl service){
+//        chatGroupService = service;
+//    }
+//    @Autowired
+//    public void setSysUserService(SysUserServiceImpl service){
+//        sysUserService = service;
+//    }
+//    @Autowired
+//    public void setSysOssService(SysOssServiceImpl service){
+//        sysOssService = service;
+//    }
 
     // 存储所有连接的客户端Channel
     private static ChannelGroup channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
@@ -456,6 +460,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
                 chatHistoryService.save(chatHistory);
+                jsonObject.put("roomId", groupServiceOne.getId());
             }
 
             //2:考勤消息
@@ -483,6 +488,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
                 chatHistoryService.save(chatHistory);
+                jsonObject.put("roomId", groupServiceOne.getId());
             }
 
             //安全消息
@@ -510,6 +516,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
                 chatHistoryService.save(chatHistory);
+                jsonObject.put("roomId", groupServiceOne.getId());
             }
 
             //质量消息
@@ -537,6 +544,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 chatHistory.setMessageDate(new Date());
                 chatHistory.setIsRead("1");//未读
                 chatHistoryService.save(chatHistory);
+                jsonObject.put("roomId", groupServiceOne.getId());
             }
 
             default -> {