From cd538c205628f28839323b49b7f77f33196a601f Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 七月 2024 15:50:42 +0800
Subject: [PATCH] 电磁锁操控加入判断速度为0提交
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 130 +++++++++----------------------------------
1 files changed, 28 insertions(+), 102 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 6050250..c988db1 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
@@ -1,30 +1,25 @@
package com.ruoyi.utils.websocket.service;
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.AppPositionPushService;
-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.call.dto.CallMessage;
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.*;
-import java.util.stream.Collectors;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* @ClassName ChatServerEndpoint
- * @Description:
+ * @Description: websocket鎿嶄綔绫�
* @Author 鍒樿嫃涔�
* @Date 2023/1/27 7:42
* @Version 1.0
@@ -40,114 +35,45 @@
String message = "鐢ㄦ埛[" + userId + "] 鎴愬姛杩炴帴锛�";
log.info("鐢ㄦ埛鐧诲綍锛�" + message);
WebSocketUtils.sendMessage(session, message);
- //region 鏃ф柟娉�
-// //姣忎釜鐢ㄦ埛杩炴帴鏃讹紝鍚姩鍒濆鎵�鏈塧pp鐢ㄦ埛浣嶇疆鍙戦��
-// AppPositionPush.initDataMap.put(userId,AppPositionPush.getAppPositionList());
-// AppPositionPush.initPushTask(userId,session,3000);
- //endregion
}
@OnMessage
public void onMessage(@PathParam("userId") String userId, String message) {
log.info("鏀跺埌娑堟伅锛�" + message);
- Session session = WebSocketUtils.ONLINE_USER_SESSIONS.get(userId);
- 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.initDataList);
- 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);
+// Session session = WebSocketUtils.ONLINE_USER_SESSIONS.get(userId);
+// WebSocketUtils.sendMessage(session, message);
+ Map<String, Object> messageMap = JSONObject.parseObject(message, Map.class);
+ if (((String) messageMap.get("type")).equals("callMessage")) {
+ String msg = (String) messageMap.get("message");
+ CallMessage callMessage = JSONObject.parseObject(msg, CallMessage.class);
+ if (callMessage != null && callMessage.getType().equals(0)) {
+ String regex = "^" + Pattern.quote(callMessage.getTargetId()) + "_\\d+$";
+ Pattern pattern = Pattern.compile(regex);
+ ONLINE_USER_SESSIONS.entrySet().stream()
+ .filter(entry -> {
+ Matcher matcher = pattern.matcher(entry.getKey());
+ return matcher.matches();
+ })
+ .map(Map.Entry::getValue)
+ .forEach(session -> WebSocketUtils.sendMessage(session, message));
}
- Integer frequency = (Integer) map.get("frequency");
- String uId = (String) map.get("userId");
- if (frequency > 0) {
- List<ArdAppPosition> List = AppPositionPushService.initDataList.stream()
- .filter(obj -> !obj.getUserId().equals(uId))
- .collect(Collectors.toList());//鍘婚櫎寮曞鍚庣殑list
- AppPositionPushService.dataMap.put(userId,List);
-
- List<ArdAppPosition> tempList = AppPositionPushService.initDataList.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.initDataList);
- 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