From 6b44b988edd13970fb982284799eaa4593002d89 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 周四, 27 7月 2023 17:24:32 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 35 +++++++++++------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java | 47 ++++++++++-------------
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 7 +++
4 files changed, 52 insertions(+), 39 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 3314c4d..8e3f633 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
@@ -6,7 +6,10 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.system.service.ISysUserService;
+import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import javax.websocket.Session;
import java.util.ArrayList;
import java.util.HashMap;
@@ -16,6 +19,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* @Description: app位置推送
@@ -29,48 +33,40 @@
//app位置上传
public static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(20);
public static final Map<Session, ScheduledFuture<?>> taskMap = new HashMap<>();
- public static final Map<Session, Map<String, ArdAppPosition>> defaultDataMap = new HashMap<>();//默认会话发送数据map
+ public static final Map<String, List<ArdAppPosition>> defaultDataMap = new HashMap<>();//默认会话发送数据map
// 初始定时任务，根据用户设置的频率定期推送实时位置信息
- public static void initPushTask(Session session, int pushFrequency) {
+ public static void initPushTask(String userId,Session session, int pushFrequency) {
+ defaultDataMap.put(userId,getAppPositionList());
// 启动新的定时任务
if (pushFrequency > 0) {
scheduler.scheduleAtFixedRate(() -> {
- Map<String, ArdAppPosition> map = defaultDataMap.get(session);
+ List<ArdAppPosition> appPositionList = defaultDataMap.get(userId);
Map newMap = new HashMap<>();
- List<ArdAppPosition> positionList = new ArrayList<>();
- for (String key : map.keySet()) {
- positionList.add(map.get(key));
- }
- newMap.put("50000", positionList);
+ newMap.put("50000", appPositionList);
WebSocketUtils.sendMessage(session, newMap);
}, 0, pushFrequency, TimeUnit.MILLISECONDS);
}
}
// 新的定时任务，根据用户设置的频率定期推送实时位置信息
- public static void startLocationPushTask(String userId, Session session, int pushFrequency) {
+ public static void startLocationPushTask(String userId, Session session,String guideUserId, int pushFrequency) {
// 取消之前设置的定时任务
stopLocationPushTask(session);
-
// 启动新的定时任务
if (pushFrequency > 0) {
- ScheduledFuture<?> task = ScheduledFutureTask(session, userId, pushFrequency);
+ ScheduledFuture<?> task = ScheduledFutureTask(session, userId,guideUserId, pushFrequency);
taskMap.put(session, task); // 存储新的定时任务
}
}
- public static ScheduledFuture<?> ScheduledFutureTask(Session session, String userId, Integer pushFrequency) {
+ public static ScheduledFuture<?> ScheduledFutureTask(Session session, String userId,String guideUserId, Integer pushFrequency) {
return scheduler.scheduleAtFixedRate(() -> {
- ArdAppPosition ardAppPosition = getAppPositionList().get(userId);
- Map<String, ArdAppPosition> DataMap = new HashMap<>();
- DataMap.put(userId, ardAppPosition);
+ List<ArdAppPosition> appPositionList = getAppPositionList().stream()
+ .filter(obj -> obj.getUserId().equals(guideUserId))
+ .collect(Collectors.toList());
Map newMap = new HashMap<>();
- List<ArdAppPosition> positionList = new ArrayList<>();
- for (String key : DataMap.keySet()) {
- positionList.add(DataMap.get(key));
- }
- newMap.put("50000", positionList);
+ newMap.put("50000", appPositionList);
WebSocketUtils.sendMessage(session, newMap);
}, 0, pushFrequency, TimeUnit.MILLISECONDS);
}
@@ -84,18 +80,17 @@
}
//查询所有app用户的位置信息
- public static Map<String, ArdAppPosition> getAppPositionList() {
- Map<String, ArdAppPosition> userMap = new HashMap<>();
+ public static List<ArdAppPosition> getAppPositionList() {
+ List<ArdAppPosition>ArdAppPositions = new ArrayList<>();
ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
//获取所有app用户
- List<SysUser> list = sysUserService.selectAllocatedList(new SysUser());
+ List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
for (SysUser sysUser : list) {
IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
- userMap.put(sysUser.getUserId(), ardAppPosition);
+ ArdAppPositions.add(ardAppPosition);
}
-
- return userMap;
+ return ArdAppPositions;
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
index 18e068d..a33cb51 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
@@ -3,12 +3,18 @@
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.mapper.ArdAppPositionMapper;
import com.ruoyi.app.position.service.IArdAppPositionService;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.service.ISysUserService;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -22,6 +28,7 @@
@Resource
private ArdAppPositionMapper ardAppPositionMapper;
+
/**
* 查询app位置
*
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 31aaffd..92c5fc3 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
@@ -2,17 +2,25 @@
import com.alibaba.fastjson2.JSONObject;
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.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import javax.websocket.*;
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.stream.Collectors;
/**
* @ClassName ChatServerEndpoint
@@ -34,9 +42,10 @@
log.info("用户登录：" + message);
WebSocketUtils.sendMessage(session, message);
//每个用户连接时，启动初始所有app用户位置发送
- Map<String, ArdAppPosition> appPositionMap = AppPositionPush.getAppPositionList();
- AppPositionPush.defaultDataMap.put(session,appPositionMap);
- AppPositionPush.initPushTask(session,3000);
+
+ List<ArdAppPosition> positionList = AppPositionPush.defaultDataMap.get(userId);
+ AppPositionPush.defaultDataMap.put(userId,positionList);
+ AppPositionPush.initPushTask(userId,session,3000);
}
@OnMessage
@@ -50,20 +59,22 @@
if(map.size()>0) {
Integer frequency = (Integer)map.get("frequency");
String uId = (String) map.get("userId");
- Map allMap = AppPositionPush.defaultDataMap.get(session);//获取当前session的默认发送的数据map
+ Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
+ List<ArdAppPosition> positionList = AppPositionPush.defaultDataMap.get(userId);//获取当前用户的默认发送的数据map
if(frequency>0)
{
- //接收到频率大于0，属于申请引导，将app从默认map中移除
- allMap.remove(uId);
- AppPositionPush.defaultDataMap.putAll(allMap);
+ //接收到频率大于0，属于申请引导，获取除引导外的其他app用户的位置List
+ List<ArdAppPosition> appPositionList = positionList.stream()
+ .filter(obj -> !obj.getUserId().equals(uId))
+ .collect(Collectors.toList());
+ dataMap.put(userId,appPositionList);
}
else {
- //接收到频率等于0，属于释放引导，将app恢复到初始map
- Map<String, ArdAppPosition> appPositionList = AppPositionPush.getAppPositionList();
- allMap.put(uId,appPositionList.get(uId));
- AppPositionPush.defaultDataMap.putAll(allMap);
+ //接收到频率等于0，属于释放引导，获取到全部app用户的位置List
+ dataMap.put(userId,AppPositionPush.getAppPositionList());
}
- AppPositionPush.startLocationPushTask(uId, session, frequency);
+ AppPositionPush.defaultDataMap.putAll(dataMap);//更新初始会话默认数据map
+ AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//开启新任务
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 67dbedb..826975b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -143,7 +143,7 @@
* @return 用户信息集合信息
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
+ //@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectAllAppUserList(SysUser user) {
return userMapper.selectAllAppUserList(user);
}
--
Gitblit v1.9.3