From cbbea55a92b178b75f58e7c468f7e8d8ae417c9d Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 七月 2024 13:18:38 +0800
Subject: [PATCH] 电磁锁手动操控提交
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 66 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 35 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..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,8 +1,8 @@
package com.ruoyi.utils.websocket.service;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.app.position.domain.ArdAppPosition;
-import com.ruoyi.app.position.service.impl.AppPositionPush;
+import com.ruoyi.app.position.service.impl.AppPositionPushService;
+import com.ruoyi.call.dto.CallMessage;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -11,12 +11,15 @@
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.util.HashMap;
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
@@ -26,58 +29,51 @@
@Slf4j(topic = "websocket")
@ServerEndpoint("/websocket/{userId}")
public class ChatServerEndpoint {
-
@OnOpen
public void openSession(@PathParam("userId") String userId, Session session) {
WebSocketUtils.ONLINE_USER_SESSIONS.put(userId, session);
String message = "鐢ㄦ埛[" + userId + "] 鎴愬姛杩炴帴锛�";
log.info("鐢ㄦ埛鐧诲綍锛�" + message);
WebSocketUtils.sendMessage(session, message);
- //姣忎釜鐢ㄦ埛杩炴帴鏃讹紝鍚姩鍒濆鎵�鏈塧pp鐢ㄦ埛浣嶇疆鍙戦��
- Map<String, ArdAppPosition> appPositionMap = AppPositionPush.getAppPositionList();
- AppPositionPush.defaultDataMap.put(session,appPositionMap);
- AppPositionPush.initPushTask(session,3000);
}
@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) {
- Integer frequency = (Integer)map.get("frequency");
- String uId = (String) map.get("userId");
- Map allMap = AppPositionPush.defaultDataMap.get(session);//鑾峰彇褰撳墠session鐨勯粯璁ゅ彂閫佺殑鏁版嵁map
- if(frequency>0)
- {
- //鎺ユ敹鍒伴鐜囧ぇ浜�0锛屽睘浜庣敵璇峰紩瀵硷紝灏哸pp浠庨粯璁ap涓Щ闄�
- allMap.remove(uId);
- AppPositionPush.defaultDataMap.putAll(allMap);
+// 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));
}
- else {
- //鎺ユ敹鍒伴鐜囩瓑浜�0锛屽睘浜庨噴鏀惧紩瀵硷紝灏哸pp鎭㈠鍒板垵濮媘ap
- Map<String, ArdAppPosition> appPositionList = AppPositionPush.getAppPositionList();
- allMap.put(uId,appPositionList.get(uId));
- AppPositionPush.defaultDataMap.putAll(allMap);
- }
- AppPositionPush.startLocationPushTask(uId, session, frequency);
+
}
+ // 鏍规嵁鐢ㄦ埛鏂扮殑棰戠巼閲嶆柊璋冩暣瀹氭椂浠诲姟
+ 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);
- log.info("娑堟伅锛�"+message);
+ //骞朵笖閫氱煡鍏朵粬浜哄綋鍓嶇敤鎴峰凡缁忕寮�鑱婂ぉ瀹や簡
+ String message = "鐢ㄦ埛[" + userId + "] 鏂紑杩炴帴锛�";
+ //sendMessage(session,message);
+ log.info("娑堟伅锛�" + message);
try {
session.close();
- AppPositionPush.stopLocationPushTask(session);
+ AppPositionPushService.stopHandler(userId);
} catch (IOException e) {
log.error("onClose error", e);
}
--
Gitblit v1.9.3