From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init

---
 ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java |   42 +++++++++++++-----------------------------
 1 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java
index 00d1980..a993ad1 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java
@@ -88,12 +88,12 @@
             IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
             ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
             if (StringUtils.isNotNull(ardAppPosition)) {
-                Map<String, Object> params=new HashMap<>();
-                params.put("longitude",ardAppPosition.getLongitude());
-                params.put("latitude",ardAppPosition.getLatitude());
-                params.put("speed",ardAppPosition.getSpeed());
-                params.put("bearing",ardAppPosition.getBearing());
-                params.put("name",sysUser.getUserName());
+                Map<String, Object> params = new HashMap<>();
+                params.put("longitude", ardAppPosition.getLongitude());
+                params.put("latitude", ardAppPosition.getLatitude());
+                params.put("speed", ardAppPosition.getSpeed());
+                params.put("bearing", ardAppPosition.getBearing());
+                params.put("name", sysUser.getUserName());
                 ardAppPosition.setParams(params);
                 ArdAppPositions.add(ardAppPosition);
             }
@@ -108,8 +108,8 @@
             for (ArdAppPosition ardAppPosition : data) {
                 ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
                 SysUser sysUser = sysUserService.selectUserById(ardAppPosition.getUserId());
-                if(StringUtils.isNotNull(sysUser)) {
-                    if(StringUtils.isNotNull(sysUser.getAppOnlineState())) {
+                if (StringUtils.isNotNull(sysUser)) {
+                    if (StringUtils.isNotNull(sysUser.getAppOnlineState())) {
                         if (sysUser.getAppOnlineState().equals("1")) {
                             onlineList.add(ardAppPosition);
                         }
@@ -126,6 +126,9 @@
             Map<String, Object> map = JSONObject.parseObject(message, Map.class);
             if (map.size() > 0) {
                 Boolean enabled = (Boolean) map.get("enabled");
+                if (enabled == null) {
+                    return;
+                }
                 if (enabled) {
                     //鍚姩鍏ㄥ眬鎺ㄩ��
                     List<ArdAppPosition> newList = new ArrayList<>(AppPositionPushService.getAppPositionList());
@@ -172,29 +175,10 @@
                     AppPositionPushService.tempUserTimerMap.remove(userId);
                     AppPositionPushService.tempDataMap.remove(userId);
                 }
-                //region 鏃ф柟娉�
-//            Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
-//            List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁ゅ彂閫佺殑鏁版嵁map
-//            if(frequency>0)
-//            {
-//                //鎺ユ敹鍒伴鐜囧ぇ浜�0锛屽睘浜庣敵璇峰紩瀵硷紝鑾峰彇闄ゅ紩瀵煎鐨勫叾浠朼pp鐢ㄦ埛鐨勪綅缃甃ist
-//                List<ArdAppPosition> appPositionList = positionList.stream()
-//                        .filter(obj -> !obj.getUserId().equals(uId))
-//                        .collect(Collectors.toList());
-//                dataMap.put(userId,appPositionList);
-//            }
-//           else {
-//                //鎺ユ敹鍒伴鐜囩瓑浜�0锛屽睘浜庨噴鏀惧紩瀵硷紝鑾峰彇鍒板叏閮╝pp鐢ㄦ埛鐨勪綅缃甃ist
-//                dataMap.put(userId,AppPositionPush.getAppPositionList());
-//            }
-//            AppPositionPush.initDataMap.putAll(dataMap);//鏇存柊鍒濆浼氳瘽榛樿鏁版嵁map
-//            AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//寮�鍚柊浠诲姟
-                //endregion
             }
-        }
-        catch (Exception ex)
-        {
+        } catch (Exception ex) {
             log.error(ex.getMessage());
+            WebSocketUtils.sendMessage(userId, "app浣嶇疆鎺ㄩ�佽В鏋愭秷鎭��" + message + "銆戝紓甯�:" + ex.getMessage());
         }
     }
 

--
Gitblit v1.9.3