From f1e1115bd10c15dec59f8770538ad1642fb3a2e8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 17:28:51 +0800
Subject: [PATCH] 提交

---
 ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 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..52ba743 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,15 +33,15 @@
     //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());
         // 鍚姩鏂扮殑瀹氭椂浠诲姟
         if (pushFrequency > 0) {
             scheduler.scheduleAtFixedRate(() -> {
-                List<ArdAppPosition> appPositionList = defaultDataMap.get(userId);
+                List<ArdAppPosition> appPositionList = initDataMap.get(userId);
                 Map newMap = new HashMap<>();
                 newMap.put("50000", appPositionList);
                 WebSocketUtils.sendMessage(session, newMap);
@@ -50,25 +50,21 @@
     }
 
     // 鏂扮殑瀹氭椂浠诲姟锛屾牴鎹敤鎴疯缃殑棰戠巼瀹氭湡鎺ㄩ�佸疄鏃朵綅缃俊鎭�
-    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);
+            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);
+            }, 0, pushFrequency, TimeUnit.MILLISECONDS);
             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);
     }
 
     //鍙栨秷瀹氭椂浠诲姟
@@ -81,7 +77,7 @@
 
     //鏌ヨ鎵�鏈塧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());

--
Gitblit v1.9.3