From 779c235959bd1979381b07ffe561242c9cdd9ce2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 19 二月 2024 15:32:35 +0800
Subject: [PATCH] 指挥端查看权限下全部单兵端提交
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 90 ++------------------------------------------
1 files changed, 5 insertions(+), 85 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 b2f003f..82af738 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
@@ -24,7 +24,7 @@
/**
* @ClassName ChatServerEndpoint
- * @Description:
+ * @Description: websocket鎿嶄綔绫�
* @Author 鍒樿嫃涔�
* @Date 2023/1/27 7:42
* @Version 1.0
@@ -54,100 +54,20 @@
WebSocketUtils.sendMessage(session, message);
// sendMessageAll("鐢ㄦ埛[" + userid + "] : " + message);
// 鏍规嵁鐢ㄦ埛鏂扮殑棰戠巼閲嶆柊璋冩暣瀹氭椂浠诲姟
- Map<String, Object> map = JSONObject.parseObject(message, Map.class);
- if (map.size() > 0) {
- Boolean enabled = (Boolean) map.get("enabled");
- if (enabled) {
- //鍚姩鍏ㄥ眬鎺ㄩ��
- List<ArdAppPosition> newList = new ArrayList<>(AppPositionPushService.getAppPositionList());
- AppPositionPushService.dataMap.put(userId, newList);
- if (!AppPositionPushService.userTimerMap.containsKey(userId)) {
- Timer timer = AppPositionPushService.startTimerTask(userId, 3000);
- AppPositionPushService.userTimerMap.put(userId, timer);//灏嗗畾鏃跺櫒鍏宠仈鐢ㄦ埛
- }
- } else {
- //鍋滄鍏ㄥ眬鎺ㄩ��
- if (AppPositionPushService.userTimerMap.containsKey(userId)) {
- Timer timer = AppPositionPushService.userTimerMap.get(userId);
- AppPositionPushService.stopTimerTask(timer);
- AppPositionPushService.userTimerMap.remove(userId);
- }
- if (AppPositionPushService.tempUserTimerMap.containsKey(userId)) {
- Timer temptimer = AppPositionPushService.tempUserTimerMap.get(userId);
- AppPositionPushService.stopTimerTask(temptimer);
- AppPositionPushService.tempUserTimerMap.remove(userId);
- }
- AppPositionPushService.dataMap.remove(userId);
- AppPositionPushService.tempDataMap.remove(userId);
- }
-
- Integer frequency = (Integer) map.get("frequency");
- String uId = (String) map.get("userId");
- if (frequency > 0) {
- List<ArdAppPosition> List = AppPositionPushService.getAppPositionList().stream()
- .filter(obj -> !obj.getUserId().equals(uId))
- .collect(Collectors.toList());//鍘婚櫎寮曞鍚庣殑list
- AppPositionPushService.dataMap.put(userId,List);
-
- List<ArdAppPosition> tempList = AppPositionPushService.getAppPositionList().stream()
- .filter(obj -> obj.getUserId().equals(uId))
- .collect(Collectors.toList());//鑾峰彇寮曞鐨刲ist
- AppPositionPushService.tempDataMap.put(userId, tempList);
- Timer timer = AppPositionPushService.startTempTimerTask(userId, frequency);
- AppPositionPushService.tempUserTimerMap.put(userId, timer);
- } else {
- List<ArdAppPosition> newList = new ArrayList<>(AppPositionPushService.getAppPositionList());
- AppPositionPushService.dataMap.put(userId, newList);
- Timer timer = AppPositionPushService.tempUserTimerMap.get(userId);
- AppPositionPushService.stopTimerTask(timer);
- 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
- }
+ AppPositionPushService.messageHandler(userId,message);
}
@OnClose
public void onClose(@PathParam("userId") String userId, Session session) {
//褰撳墠鐨凷ession 绉婚櫎
WebSocketUtils.ONLINE_USER_SESSIONS.remove(userId);
-// //骞朵笖閫氱煡鍏朵粬浜哄綋鍓嶇敤鎴峰凡缁忕寮�鑱婂ぉ瀹や簡
+ //骞朵笖閫氱煡鍏朵粬浜哄綋鍓嶇敤鎴峰凡缁忕寮�鑱婂ぉ瀹や簡
String message = "鐢ㄦ埛[" + userId + "] 鏂紑杩炴帴锛�";
-// sendMessage(session,message);
+ //sendMessage(session,message);
log.info("娑堟伅锛�" + message);
try {
session.close();
- //鍋滄鍏ㄥ眬鎺ㄩ��
- if (AppPositionPushService.userTimerMap.containsKey(userId)) {
- Timer timer = AppPositionPushService.userTimerMap.get(userId);
- AppPositionPushService.stopTimerTask(timer);
- AppPositionPushService.userTimerMap.remove(userId);
- }
- if (AppPositionPushService.tempUserTimerMap.containsKey(userId)) {
- Timer temptimer = AppPositionPushService.tempUserTimerMap.get(userId);
- AppPositionPushService.stopTimerTask(temptimer);
- AppPositionPushService.tempUserTimerMap.remove(userId);
- }
- AppPositionPushService.dataMap.remove(userId);
- AppPositionPushService.tempDataMap.remove(userId);
- // AppPositionPush.stopLocationPushTask(session);//鏃ф柟娉�
+ AppPositionPushService.stopHandler(userId);
} catch (IOException e) {
log.error("onClose error", e);
}
--
Gitblit v1.9.3