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/utils/websocket/service/ChatServerEndpoint.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java b/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
index 31aaffd..f4186b2 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
@@ -2,17 +2,27 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.app.position.domain.ArdAppPosition;
+import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.app.position.service.impl.AppPositionPush;
+import com.ruoyi.app.position.service.impl.ArdAppPositionServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import javax.websocket.*;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* @ClassName ChatServerEndpoint
@@ -34,9 +44,8 @@
log.info("鐢ㄦ埛鐧诲綍锛�" + message);
WebSocketUtils.sendMessage(session, message);
//姣忎釜鐢ㄦ埛杩炴帴鏃讹紝鍚姩鍒濆鎵�鏈塧pp鐢ㄦ埛浣嶇疆鍙戦��
- Map<String, ArdAppPosition> appPositionMap = AppPositionPush.getAppPositionList();
- AppPositionPush.defaultDataMap.put(session,appPositionMap);
- AppPositionPush.initPushTask(session,3000);
+ AppPositionPush.initDataMap.put(userId,AppPositionPush.getAppPositionList());
+ AppPositionPush.initPushTask(userId,session,3000);
}
@OnMessage
@@ -50,20 +59,22 @@
if(map.size()>0) {
Integer frequency = (Integer)map.get("frequency");
String uId = (String) map.get("userId");
- Map allMap = AppPositionPush.defaultDataMap.get(session);//鑾峰彇褰撳墠session鐨勯粯璁ゅ彂閫佺殑鏁版嵁map
+ Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
+ List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁ゅ彂閫佺殑鏁版嵁map
if(frequency>0)
{
- //鎺ユ敹鍒伴鐜囧ぇ浜�0锛屽睘浜庣敵璇峰紩瀵硷紝灏哸pp浠庨粯璁ap涓Щ闄�
- allMap.remove(uId);
- AppPositionPush.defaultDataMap.putAll(allMap);
+ //鎺ユ敹鍒伴鐜囧ぇ浜�0锛屽睘浜庣敵璇峰紩瀵硷紝鑾峰彇闄ゅ紩瀵煎鐨勫叾浠朼pp鐢ㄦ埛鐨勪綅缃甃ist
+ List<ArdAppPosition> appPositionList = positionList.stream()
+ .filter(obj -> !obj.getUserId().equals(uId))
+ .collect(Collectors.toList());
+ dataMap.put(userId,appPositionList);
}
else {
- //鎺ユ敹鍒伴鐜囩瓑浜�0锛屽睘浜庨噴鏀惧紩瀵硷紝灏哸pp鎭㈠鍒板垵濮媘ap
- Map<String, ArdAppPosition> appPositionList = AppPositionPush.getAppPositionList();
- allMap.put(uId,appPositionList.get(uId));
- AppPositionPush.defaultDataMap.putAll(allMap);
+ //鎺ユ敹鍒伴鐜囩瓑浜�0锛屽睘浜庨噴鏀惧紩瀵硷紝鑾峰彇鍒板叏閮╝pp鐢ㄦ埛鐨勪綅缃甃ist
+ dataMap.put(userId,AppPositionPush.getAppPositionList());
}
- AppPositionPush.startLocationPushTask(uId, session, frequency);
+ AppPositionPush.initDataMap.putAll(dataMap);//鏇存柊鍒濆浼氳瘽榛樿鏁版嵁map
+ AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//寮�鍚柊浠诲姟
}
}
--
Gitblit v1.9.3