From c3ec70d2bd1ebd2421d2fa3e85c1ac43e2322ea6 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 22 七月 2024 14:44:52 +0800
Subject: [PATCH] 电子围栏加入类型提交
---
ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java | 102 ++++++++++++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 46 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 92c5fc3..373664a 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,29 @@
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.common.core.domain.entity.SysUser;
-import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.app.position.service.impl.AppPositionPushService;
+import com.ruoyi.call.dto.CallMessage;
+import com.ruoyi.common.exception.ServiceException;
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.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.Set;
+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
@@ -34,61 +33,73 @@
@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鐢ㄦ埛浣嶇疆鍙戦��
-
- List<ArdAppPosition> positionList = AppPositionPush.defaultDataMap.get(userId);
- AppPositionPush.defaultDataMap.put(userId,positionList);
- AppPositionPush.initPushTask(userId,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<String, List<ArdAppPosition>> dataMap = new HashMap<>();
- List<ArdAppPosition> positionList = AppPositionPush.defaultDataMap.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);
+ log.debug("鏀跺埌娑堟伅锛�" + message);
+ Map<String, Object> messageMap = JSONObject.parseObject(message, Map.class);
+ if (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)) {
+ WebSocketUtils.sendMessagePrefix(callMessage.getTargetId(), message);
}
- else {
- //鎺ユ敹鍒伴鐜囩瓑浜�0锛屽睘浜庨噴鏀惧紩瀵硷紝鑾峰彇鍒板叏閮╝pp鐢ㄦ埛鐨勪綅缃甃ist
- dataMap.put(userId,AppPositionPush.getAppPositionList());
+ //缇よ亰
+ if (callMessage != null && callMessage.getType().equals(1)) {
+ String step = callMessage.getStep();
+ switch (step) {
+ case "joinRoom":
+ Set<String> userSet = WebSocketUtils.ROOM_USER_SET.getOrDefault(callMessage.getRoomId(), new HashSet<>());
+ userSet.add(callMessage.getUserId());
+ WebSocketUtils.ROOM_USER_SET.put(callMessage.getRoomId(), userSet);
+ WebSocketUtils.sendRoomMessage(callMessage.getRoomId(), message);
+ break;
+ case "inviteRoom":
+ List<String> targetIds = callMessage.getTargetIds();
+ targetIds.stream().forEach(targetId -> {
+ WebSocketUtils.sendMessagePrefix(targetId, message);
+ });
+ break;
+ case "leaveRoom":
+ userSet = WebSocketUtils.ROOM_USER_SET.getOrDefault(callMessage.getRoomId(), new HashSet<>());
+ if (userSet.size() > 0) {
+ userSet.remove(callMessage.getUserId());
+ WebSocketUtils.ROOM_USER_SET.put(callMessage.getRoomId(), userSet);
+ WebSocketUtils.sendRoomMessage(callMessage.getRoomId(), message);
+ }
+ break;
+ default:
+ WebSocketUtils.sendMessagePrefix(callMessage.getTargetId(), message);
+ break;
+ }
+
+
}
- AppPositionPush.defaultDataMap.putAll(dataMap);//鏇存柊鍒濆浼氳瘽榛樿鏁版嵁map
- AppPositionPush.startLocationPushTask(userId,session,uId, 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 + "] 鏂紑杩炴帴锛�";
+ log.info("娑堟伅锛�" + message);
+ //浠庢埧闂翠腑绉婚櫎鐢ㄦ埛
+ WebSocketUtils.ROOM_USER_SET.values().stream().forEach(userSet -> userSet.remove(userId));
try {
session.close();
- AppPositionPush.stopLocationPushTask(session);
+ AppPositionPushService.stopHandler(userId);
} catch (IOException e) {
log.error("onClose error", e);
}
@@ -103,5 +114,4 @@
}
log.info("Throwable msg " + throwable.getMessage());
}
-
}
\ No newline at end of file
--
Gitblit v1.9.3