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 |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 52ba743..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
@@ -37,14 +37,20 @@
 
     // 鍒濆瀹氭椂浠诲姟锛屾牴鎹敤鎴疯缃殑棰戠巼瀹氭湡鎺ㄩ�佸疄鏃朵綅缃俊鎭�
     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 = initDataMap.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);
         }
     }
@@ -55,10 +61,13 @@
         stopLocationPushTask(session);
         // 鍚姩鏂扮殑瀹氭椂浠诲姟
         if (pushFrequency > 0) {
+            List<ArdAppPosition> appPositionList = getAppPositionList().stream()
+                    .filter(obj -> obj.getUserId().equals(guideUserId))
+                    .collect(Collectors.toList());
+            if (appPositionList.size() == 0) {
+                return;
+            }
             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);
@@ -82,6 +91,9 @@
         //鑾峰彇鎵�鏈塧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