From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 55 +++++++++++++++++--------------------------------------
1 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java b/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
index 5a0cebb..82af738 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
@@ -4,7 +4,10 @@
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.app.position.service.impl.AppPositionPush;
+import com.ruoyi.app.position.service.impl.AppPositionPushService;
+import com.ruoyi.app.position.service.impl.ArdAppPositionServiceImpl;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
@@ -16,15 +19,12 @@
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
/**
* @ClassName ChatServerEndpoint
- * @Description:
+ * @Description: websocket操作类
* @Author 刘苏义
* @Date 2023/1/27 7:42
* @Version 1.0
@@ -34,61 +34,40 @@
@Slf4j(topic = "websocket")
@ServerEndpoint("/websocket/{userId}")
public class ChatServerEndpoint {
-
@OnOpen
public void openSession(@PathParam("userId") String userId, Session session) {
WebSocketUtils.ONLINE_USER_SESSIONS.put(userId, session);
String message = "用户[" + userId + "] 成功连接！";
log.info("用户登录：" + message);
WebSocketUtils.sendMessage(session, message);
- //每个用户连接时，启动初始所有app用户位置发送
-
- List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);
- AppPositionPush.initDataMap.put(userId,positionList);
- AppPositionPush.initPushTask(userId,session,3000);
+ //region 旧方法
+// //每个用户连接时，启动初始所有app用户位置发送
+// AppPositionPush.initDataMap.put(userId,AppPositionPush.getAppPositionList());
+// AppPositionPush.initPushTask(userId,session,3000);
+ //endregion
}
@OnMessage
public void onMessage(@PathParam("userId") String userId, String message) {
log.info("收到消息：" + message);
Session session = WebSocketUtils.ONLINE_USER_SESSIONS.get(userId);
- // WebSocketUtils.sendMessage(session, message);
+ WebSocketUtils.sendMessage(session, message);
// sendMessageAll("用户[" + userid + "] : " + message);
// 根据用户新的频率重新调整定时任务
- Map<String,Object> map = JSONObject.parseObject(message, Map.class);
- if(map.size()>0) {
- Integer frequency = (Integer)map.get("frequency");
- String uId = (String) map.get("userId");
- Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
- List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);//获取当前用户的默认发送的数据map
- if(frequency>0)
- {
- //接收到频率大于0，属于申请引导，获取除引导外的其他app用户的位置List
- List<ArdAppPosition> appPositionList = positionList.stream()
- .filter(obj -> !obj.getUserId().equals(uId))
- .collect(Collectors.toList());
- dataMap.put(userId,appPositionList);
- }
- else {
- //接收到频率等于0，属于释放引导，获取到全部app用户的位置List
- dataMap.put(userId,AppPositionPush.getAppPositionList());
- }
- AppPositionPush.initDataMap.putAll(dataMap);//更新初始会话默认数据map
- AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//开启新任务
- }
+ AppPositionPushService.messageHandler(userId,message);
}
@OnClose
public void onClose(@PathParam("userId") String userId, Session session) {
//当前的Session 移除
WebSocketUtils.ONLINE_USER_SESSIONS.remove(userId);
-// //并且通知其他人当前用户已经离开聊天室了
- String message="用户[" + userId + "] 断开连接！";
-// sendMessage(session,message);
- log.info("消息："+message);
+ //并且通知其他人当前用户已经离开聊天室了
+ String message = "用户[" + userId + "] 断开连接！";
+ //sendMessage(session,message);
+ log.info("消息：" + message);
try {
session.close();
- AppPositionPush.stopLocationPushTask(session);
+ AppPositionPushService.stopHandler(userId);
} catch (IOException e) {
log.error("onClose error", e);
}
--
Gitblit v1.9.3