From 0362c0c8502a81fc974afb8d2aff85d9efd7bbb1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 六月 2023 17:28:22 +0800
Subject: [PATCH] 修改报警逻辑 增加优先级队列

---
 ruoyi-common/src/main/java/com/ruoyi/common/websocket/service/ChatServerEndpoint.java |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/websocket/service/ChatServerEndpoint.java b/ruoyi-common/src/main/java/com/ruoyi/common/websocket/service/ChatServerEndpoint.java
index c9b7180..5e7303d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/websocket/service/ChatServerEndpoint.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/websocket/service/ChatServerEndpoint.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.websocket.service;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
@@ -9,8 +10,7 @@
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
 
-import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
-import static com.ruoyi.common.websocket.util.WebSocketUtils.sendMessageAll;
+import static com.ruoyi.common.websocket.util.WebSocketUtils.*;
 
 
 /**
@@ -23,31 +23,34 @@
 
 @Component
 @Slf4j(topic = "websocket")
-@ServerEndpoint("/websocket/{userid}")
+@ServerEndpoint("/websocket/{userId}")
 public class ChatServerEndpoint {
 
     @OnOpen
-    public void openSession(@PathParam("userid") String userid, Session session) {
-        ONLINE_USER_SESSIONS.put(userid, session);
-        String message = "鐢ㄦ埛[" + userid + "] 鎴愬姛杩炴帴锛�";
+    public void openSession( @PathParam("userId")String userId, Session session) {
+
+        ONLINE_USER_SESSIONS.put(userId, session);
+        String message = "鐢ㄦ埛[" + userId + "] 鎴愬姛杩炴帴锛�";
         log.info("鐢ㄦ埛鐧诲綍锛�"+message);
-        sendMessageAll(message);
+        sendMessage(session,message);
     }
 
     @OnMessage
-    public void onMessage(@PathParam("userid") String userid, String message) {
-        log.info("鍙戦�佹秷鎭細"+message);
-        sendMessageAll("鐢ㄦ埛[" + userid + "] : " + message);
+    public void onMessage(@PathParam("userId")String userId, String message) {
+        log.info("鏀跺埌娑堟伅锛�"+message);
+        Session session = ONLINE_USER_SESSIONS.get(userId);
+        sendMessage(session,message);
+//        sendMessageAll("鐢ㄦ埛[" + userid + "] : " + message);
     }
 
     @OnClose
-    public void onClose(@PathParam("userid") String userid, Session session) {
+    public void onClose( @PathParam("userId")String userId,Session session) {
         //褰撳墠鐨凷ession 绉婚櫎
-        ONLINE_USER_SESSIONS.remove(userid);
-        //骞朵笖閫氱煡鍏朵粬浜哄綋鍓嶇敤鎴峰凡缁忕寮�鑱婂ぉ瀹や簡
-        String message="鐢ㄦ埛[" + userid + "] 鏂紑杩炴帴锛�";
-        sendMessageAll(message);
-        log.info("鍙戦�佹秷鎭細"+message);
+        ONLINE_USER_SESSIONS.remove(userId);
+//        //骞朵笖閫氱煡鍏朵粬浜哄綋鍓嶇敤鎴峰凡缁忕寮�鑱婂ぉ瀹や簡
+//        String message="鐢ㄦ埛[" + userId + "] 鏂紑杩炴帴锛�";
+//        sendMessage(session,message);
+//        log.info("鍙戦�佹秷鎭細"+message);
         try {
             session.close();
         } catch (IOException e) {

--
Gitblit v1.9.3