From f1e1115bd10c15dec59f8770538ad1642fb3a2e8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Thu, 27 Jul 2023 17:28:51 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 8 ++++----
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java | 32 ++++++++++++++------------------
2 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java
index 8e3f633..52ba743 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java
@@ -33,15 +33,15 @@
//app位置上传
public static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(20);
public static final Map<Session, ScheduledFuture<?>> taskMap = new HashMap<>();
- public static final Map<String, List<ArdAppPosition>> defaultDataMap = new HashMap<>();//默认会话发送数据map
+ public static final Map<String, List<ArdAppPosition>> initDataMap = new HashMap<>();//每个会话初始发送数据map
// 初始定时任务，根据用户设置的频率定期推送实时位置信息
- public static void initPushTask(String userId,Session session, int pushFrequency) {
- defaultDataMap.put(userId,getAppPositionList());
+ public static void initPushTask(String userId, Session session, int pushFrequency) {
+ initDataMap.put(userId, getAppPositionList());
// 启动新的定时任务
if (pushFrequency > 0) {
scheduler.scheduleAtFixedRate(() -> {
- List<ArdAppPosition> appPositionList = defaultDataMap.get(userId);
+ List<ArdAppPosition> appPositionList = initDataMap.get(userId);
Map newMap = new HashMap<>();
newMap.put("50000", appPositionList);
WebSocketUtils.sendMessage(session, newMap);
@@ -50,25 +50,21 @@
}
// 新的定时任务，根据用户设置的频率定期推送实时位置信息
- public static void startLocationPushTask(String userId, Session session,String guideUserId, int pushFrequency) {
+ public static void startLocationPushTask(String userId, Session session, String guideUserId, int pushFrequency) {
// 取消之前设置的定时任务
stopLocationPushTask(session);
// 启动新的定时任务
if (pushFrequency > 0) {
- ScheduledFuture<?> task = ScheduledFutureTask(session, userId,guideUserId, pushFrequency);
+ ScheduledFuture<?> task = scheduler.scheduleAtFixedRate(() -> {
+ List<ArdAppPosition> appPositionList = getAppPositionList().stream()
+ .filter(obj -> obj.getUserId().equals(guideUserId))
+ .collect(Collectors.toList());
+ Map newMap = new HashMap<>();
+ newMap.put("50000", appPositionList);
+ WebSocketUtils.sendMessage(session, newMap);
+ }, 0, pushFrequency, TimeUnit.MILLISECONDS);
taskMap.put(session, task); // 存储新的定时任务
}
- }
-
- public static ScheduledFuture<?> ScheduledFutureTask(Session session, String userId,String guideUserId, Integer pushFrequency) {
- return scheduler.scheduleAtFixedRate(() -> {
- List<ArdAppPosition> appPositionList = getAppPositionList().stream()
- .filter(obj -> obj.getUserId().equals(guideUserId))
- .collect(Collectors.toList());
- Map newMap = new HashMap<>();
- newMap.put("50000", appPositionList);
- WebSocketUtils.sendMessage(session, newMap);
- }, 0, pushFrequency, TimeUnit.MILLISECONDS);
}
//取消定时任务
@@ -81,7 +77,7 @@
//查询所有app用户的位置信息
public static List<ArdAppPosition> getAppPositionList() {
- List<ArdAppPosition>ArdAppPositions = new ArrayList<>();
+ List<ArdAppPosition> ArdAppPositions = new ArrayList<>();
ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
//获取所有app用户
List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
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 92c5fc3..5a0cebb 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
@@ -43,8 +43,8 @@
WebSocketUtils.sendMessage(session, message);
//每个用户连接时，启动初始所有app用户位置发送
- List<ArdAppPosition> positionList = AppPositionPush.defaultDataMap.get(userId);
- AppPositionPush.defaultDataMap.put(userId,positionList);
+ List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);
+ AppPositionPush.initDataMap.put(userId,positionList);
AppPositionPush.initPushTask(userId,session,3000);
}
@@ -60,7 +60,7 @@
Integer frequency = (Integer)map.get("frequency");
String uId = (String) map.get("userId");
Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
- List<ArdAppPosition> positionList = AppPositionPush.defaultDataMap.get(userId);//获取当前用户的默认发送的数据map
+ List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);//获取当前用户的默认发送的数据map
if(frequency>0)
{
//接收到频率大于0，属于申请引导，获取除引导外的其他app用户的位置List
@@ -73,7 +73,7 @@
//接收到频率等于0，属于释放引导，获取到全部app用户的位置List
dataMap.put(userId,AppPositionPush.getAppPositionList());
}
- AppPositionPush.defaultDataMap.putAll(dataMap);//更新初始会话默认数据map
+ AppPositionPush.initDataMap.putAll(dataMap);//更新初始会话默认数据map
AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//开启新任务
}
}
--
Gitblit v1.9.3