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 | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 82af738..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,26 +1,21 @@
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
@@ -40,21 +35,32 @@
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);
+// 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));
+ }
+
+ }
// 鏍规嵁鐢ㄦ埛鏂扮殑棰戠巼閲嶆柊璋冩暣瀹氭椂浠诲姟
- AppPositionPushService.messageHandler(userId,message);
+ AppPositionPushService.messageHandler(userId, message);
}
@OnClose
--
Gitblit v1.9.3