From 7e864f157e98e468de60aea1658c66a2d8d5d53f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 17:26:53 +0800
Subject: [PATCH] 单兵端-新任务轮询接口-获取最新任务接口

---
 ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 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..943df41 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
@@ -3,6 +3,7 @@
 import com.ruoyi.app.position.domain.ArdAppPosition;
 import com.ruoyi.app.position.service.IArdAppPositionService;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.utils.websocket.util.WebSocketUtils;
 import com.ruoyi.system.service.ISysUserService;
@@ -37,14 +38,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 +62,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 +92,12 @@
         //鑾峰彇鎵�鏈塧pp鐢ㄦ埛
         List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
         for (SysUser sysUser : list) {
+            if (StringUtils.isNull(sysUser.getAppOnlineState())) {
+                continue;
+            }
+            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