From afeeaebde614bd4e8ef20cee1402011da9c7f92b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 14 六月 2023 08:18:24 +0800
Subject: [PATCH] 修改报警list查询按时间逆序
---
ruoyi-common/src/main/java/com/ruoyi/common/websocket/service/ChatServerEndpoint.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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..7ed66be 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,30 +23,35 @@
@Component
@Slf4j(topic = "websocket")
-@ServerEndpoint("/websocket/{userid}")
+@ServerEndpoint("/websocket")
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( Session session) {
+ String userId = SecurityUtils.getUserId();
+ 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( String message) {
+ log.info("鏀跺埌娑堟伅锛�"+message);
+ String userId = SecurityUtils.getUserId();
+ 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( Session session) {
+ String userId = SecurityUtils.getUserId();
//褰撳墠鐨凷ession 绉婚櫎
- ONLINE_USER_SESSIONS.remove(userid);
+ ONLINE_USER_SESSIONS.remove(userId);
//骞朵笖閫氱煡鍏朵粬浜哄綋鍓嶇敤鎴峰凡缁忕寮�鑱婂ぉ瀹や簡
- String message="鐢ㄦ埛[" + userid + "] 鏂紑杩炴帴锛�";
- sendMessageAll(message);
+ String message="鐢ㄦ埛[" + userId + "] 鏂紑杩炴帴锛�";
+ sendMessage(session,message);
log.info("鍙戦�佹秷鎭細"+message);
try {
session.close();
--
Gitblit v1.9.3