From c76d735cf906bde876ebd32a0ad8d1413a7ca902 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 16:37:05 +0800
Subject: [PATCH] 修复app推送在线状态错误
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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..7464684 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,42 +33,47 @@
//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<>();//榛樿浼氳瘽鍙戦�佹暟鎹甿ap
+ public static final Map<String, List<ArdAppPosition>> initDataMap = new HashMap<>();//姣忎釜浼氳瘽鍒濆鍙戦�佹暟鎹甿ap
// 鍒濆瀹氭椂浠诲姟锛屾牴鎹敤鎴疯缃殑棰戠巼瀹氭湡鎺ㄩ�佸疄鏃朵綅缃俊鎭�
- 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());
+ List<ArdAppPosition> appPositionList = initDataMap.get(userId);
+ if (appPositionList.size() == 0) {
+ return;
+ }
// 鍚姩鏂扮殑瀹氭椂浠诲姟
if (pushFrequency > 0) {
scheduler.scheduleAtFixedRate(() -> {
- List<ArdAppPosition> appPositionList = defaultDataMap.get(userId);
- Map newMap = new HashMap<>();
- newMap.put("50000", appPositionList);
- WebSocketUtils.sendMessage(session, newMap);
+ if (appPositionList.size() > 0) {
+ Map newMap = new HashMap<>();
+ newMap.put("50000", appPositionList);
+ WebSocketUtils.sendMessage(session, newMap);
+ }
}, 0, pushFrequency, TimeUnit.MILLISECONDS);
}
}
// 鏂扮殑瀹氭椂浠诲姟锛屾牴鎹敤鎴疯缃殑棰戠巼瀹氭湡鎺ㄩ�佸疄鏃朵綅缃俊鎭�
- 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);
- 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);
+ if (appPositionList.size() == 0) {
+ return;
+ }
+ ScheduledFuture<?> task = scheduler.scheduleAtFixedRate(() -> {
+ Map newMap = new HashMap<>();
+ newMap.put("50000", appPositionList);
+ WebSocketUtils.sendMessage(session, newMap);
+ }, 0, pushFrequency, TimeUnit.MILLISECONDS);
+ taskMap.put(session, task); // 瀛樺偍鏂扮殑瀹氭椂浠诲姟
+ }
}
//鍙栨秷瀹氭椂浠诲姟
@@ -81,11 +86,14 @@
//鏌ヨ鎵�鏈塧pp鐢ㄦ埛鐨勪綅缃俊鎭�
public static List<ArdAppPosition> getAppPositionList() {
- List<ArdAppPosition>ArdAppPositions = new ArrayList<>();
+ List<ArdAppPosition> ArdAppPositions = new ArrayList<>();
ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
//鑾峰彇鎵�鏈塧pp鐢ㄦ埛
List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
for (SysUser sysUser : list) {
+ if (sysUser.getAppOnlineState().equals("0")) {
+ continue;
+ }
IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
ArdAppPositions.add(ardAppPosition);
--
Gitblit v1.9.3