From 4155135bb0247685ce3652fe0257c39ff3e21ced Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 14:45:00 +0800
Subject: [PATCH] 重构app用户由角色转为用户配置
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 a3c2f72..3314c4d 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
@@ -8,6 +8,7 @@
import com.ruoyi.system.service.ISysUserService;
import javax.websocket.Session;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,18 +29,25 @@
//app浣嶇疆涓婁紶
public static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(20);
public static final Map<Session, ScheduledFuture<?>> taskMap = new HashMap<>();
- public static final Map<Session, Map> defaultDataMap = new HashMap<>();//榛樿浼氳瘽鍙戦�佹暟鎹甿ap
+ public static final Map<Session, Map<String, ArdAppPosition>> defaultDataMap = new HashMap<>();//榛樿浼氳瘽鍙戦�佹暟鎹甿ap
// 鍒濆瀹氭椂浠诲姟锛屾牴鎹敤鎴疯缃殑棰戠巼瀹氭湡鎺ㄩ�佸疄鏃朵綅缃俊鎭�
public static void initPushTask(Session session, int pushFrequency) {
// 鍚姩鏂扮殑瀹氭椂浠诲姟
if (pushFrequency > 0) {
scheduler.scheduleAtFixedRate(() -> {
- Map map = defaultDataMap.get(session);
- WebSocketUtils.sendMessage(session, map);
+ Map<String, ArdAppPosition> map = defaultDataMap.get(session);
+ Map newMap = new HashMap<>();
+ List<ArdAppPosition> positionList = new ArrayList<>();
+ for (String key : map.keySet()) {
+ positionList.add(map.get(key));
+ }
+ newMap.put("50000", positionList);
+ WebSocketUtils.sendMessage(session, newMap);
}, 0, pushFrequency, TimeUnit.MILLISECONDS);
}
}
+
// 鏂扮殑瀹氭椂浠诲姟锛屾牴鎹敤鎴疯缃殑棰戠巼瀹氭湡鎺ㄩ�佸疄鏃朵綅缃俊鎭�
public static void startLocationPushTask(String userId, Session session, int pushFrequency) {
// 鍙栨秷涔嬪墠璁剧疆鐨勫畾鏃朵换鍔�
@@ -51,14 +59,22 @@
taskMap.put(session, task); // 瀛樺偍鏂扮殑瀹氭椂浠诲姟
}
}
+
public static ScheduledFuture<?> ScheduledFutureTask(Session session, String userId, Integer pushFrequency) {
return scheduler.scheduleAtFixedRate(() -> {
ArdAppPosition ardAppPosition = getAppPositionList().get(userId);
Map<String, ArdAppPosition> DataMap = new HashMap<>();
- DataMap.put(userId,ardAppPosition);
- WebSocketUtils.sendMessage(session, DataMap);
+ DataMap.put(userId, ardAppPosition);
+ Map newMap = new HashMap<>();
+ List<ArdAppPosition> positionList = new ArrayList<>();
+ for (String key : DataMap.keySet()) {
+ positionList.add(DataMap.get(key));
+ }
+ newMap.put("50000", positionList);
+ WebSocketUtils.sendMessage(session, newMap);
}, 0, pushFrequency, TimeUnit.MILLISECONDS);
}
+
//鍙栨秷瀹氭椂浠诲姟
public static void stopLocationPushTask(Session session) {
ScheduledFuture<?> scheduledTask = taskMap.get(session);
@@ -66,18 +82,17 @@
scheduledTask.cancel(false);
}
}
+
//鏌ヨ鎵�鏈塧pp鐢ㄦ埛鐨勪綅缃俊鎭�
- public static Map<String,ArdAppPosition> getAppPositionList()
- {
- Map<String,ArdAppPosition> userMap=new HashMap<>();
+ public static Map<String, ArdAppPosition> getAppPositionList() {
+ Map<String, ArdAppPosition> userMap = new HashMap<>();
ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
//鑾峰彇鎵�鏈塧pp鐢ㄦ埛
- List<SysUser> list = sysUserService.selectAppUserListNoDataScope(new SysUser());
- for(SysUser sysUser:list)
- {
+ List<SysUser> list = sysUserService.selectAllocatedList(new SysUser());
+ for (SysUser sysUser : list) {
IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
- userMap.put(sysUser.getUserId(),ardAppPosition);
+ userMap.put(sysUser.getUserId(), ardAppPosition);
}
return userMap;
--
Gitblit v1.9.3