From eb70b82c29aa08cd3e94b1f6c0ced5f1cd7135dd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 20 Mar 2023 11:41:13 +0800
Subject: [PATCH] sockeio连接调整,连接与获取菜单数据进行分离
---
src/main/java/org/springblade/common/handler/SocketIOService.java | 131 +++++++++++++++----------------------------
1 files changed, 47 insertions(+), 84 deletions(-)
diff --git a/src/main/java/org/springblade/common/handler/SocketIOService.java b/src/main/java/org/springblade/common/handler/SocketIOService.java
index b2b86d2..70b88ba 100644
--- a/src/main/java/org/springblade/common/handler/SocketIOService.java
+++ b/src/main/java/org/springblade/common/handler/SocketIOService.java
@@ -7,9 +7,13 @@
import com.corundumstudio.socketio.annotation.OnDisconnect;
import com.corundumstudio.socketio.annotation.OnEvent;
import com.corundumstudio.socketio.protocol.Packet;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.modules.entity.FunctionEntity;
+import org.springblade.modules.modules.entity.ModulesEntity;
import org.springblade.modules.modules.service.IFunctionService;
+import org.springblade.modules.modules.service.IModulesService;
import org.springblade.modules.modules.vo.FunctionVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
@@ -25,6 +29,7 @@
import javax.annotation.PreDestroy;
import java.net.ServerSocket;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -40,25 +45,13 @@
private final Logger log = LoggerFactory.getLogger(this.getClass());
- // 用来存已连接的客户端
private static Map<String, SocketIOClient> clientMap = new ConcurrentHashMap<>();
-
- // 用来存已连接的视图客户端
- private List<Map<String, SocketIOClient>> view = new ArrayList<>();
-
- // 用来存已连接的控制客户端
- private List<Map<String, SocketIOClient>> controller = new ArrayList<>();
@Autowired
private SocketIOServer socketIOServer;
- @Autowired
- private IFunctionService functionService;
-
/**
* Spring IoC容器创建之后，在加载SocketIOConfiguration Bean之后启动
- *
- * @throws Exception
*/
@PostConstruct
private void autoStartup() throws Exception {
@@ -67,8 +60,6 @@
/**
* Spring IoC容器在销毁SocketIOConfiguration Bean之前关闭,避免重启项目服务端口占用问题
- *
- * @throws Exception
*/
@PreDestroy
private void autoStop() throws Exception {
@@ -82,106 +73,76 @@
/**
* 连接时
- * @param client
*/
@OnConnect
- public void onConnect(SocketIOClient client){
- FunctionVO functionEntity = getFuncVo(client);
+ public void onConnect(SocketIOClient client) {
+ String connectInfo = client.getHandshakeData().getSingleUrlParam("connectInfo");
+ SocketEntity socketEntity = parseMsg(connectInfo);
- //判断页面和控制器是否已经连接过了
- if (functionEntity.getIsView()){
- for (int i = 0; i < view.size(); i++) {
- if (view.get(i).containsKey(functionEntity.getModulesId())){
- client.sendEvent("connectError",R.fail("已连接"));
- return;
- }
- }
+ if (clientMap.containsKey(socketEntity.getCurrent())){
+ client.sendEvent("connectError",R.fail("连接已存在"));
+ log.info("设备{}连接失败",socketEntity.getCurrent());
}else {
- for (int i = 0; i < controller.size(); i++) {
- if (controller.get(i).containsKey(functionEntity.getModulesId())){
- client.sendEvent("connectError",R.fail("已连接"));
- return;
- }
- }
- }
-
- List<FunctionEntity> all = functionService.getAll(functionEntity);
- log.info(client.getSessionId().toString());
- if (all.size()>0){
- clientMap.put(functionEntity.getModulesId(),client);
- if (functionEntity.getIsView()){
- view.add(clientMap);
- }else {
- controller.add(clientMap);
- }
- client.sendEvent("connectOk", R.data(all));
- }else {
- client.sendEvent("connectError",R.fail("连接失败"));
+ clientMap.put(socketEntity.getCurrent(),client);
+ client.sendEvent("connectOk",R.success("连接成功"));
+ log.info("设备{}连接成功",socketEntity.getCurrent());
}
}
/**
* 监听前端订阅相同事件发送过来的信息
+ *
* @param client
* @param ackRequest
* @param data
*/
@OnEvent(value = "msg")
- public void OnEvent(SocketIOClient client, AckRequest ackRequest, String data){
+ public void OnEvent(SocketIOClient client, AckRequest ackRequest, String data) {
log.info("发来消息：" + data);
}
/**
- * 监听前端订阅相同事件发送过来的信息
- * @param client
- * @param ackRequest
- * @param data
+ * 图册上下页控制
*/
@OnEvent(value = "changeImgPage")
- public void OnEventImgChange(SocketIOClient client, AckRequest ackRequest, String data){
+ public void OnEventImgChange(SocketIOClient client, AckRequest ackRequest, String data) {
log.info("图册变更：" + data);
- FunctionVO funcVo = getFuncVo(client);
- view.forEach(e->{
- if (data.equals("previous")){
- e.get(funcVo.getModulesId()).sendEvent("previousPage","previous");
- }else if (data.equals("next")){
- e.get(funcVo.getModulesId()).sendEvent("nextPage","next");
- }
- });
+ SocketEntity socketEntity = parseMsg(data);
+ if (socketEntity.getMsg().equals("previous")) {
+ //上一页
+ clientMap.get(socketEntity.getTarget()).sendEvent("previousPage", "previous");
+ } else {
+ //下一页
+ clientMap.get(socketEntity.getTarget()).sendEvent("nextPage", "next");
+ }
}
+ /**
+ * 菜单控制
+ */
@OnEvent(value = "menuChange")
- public void OnEventMenuChange(SocketIOClient client, AckRequest ackRequest, String data){
+ public void OnEventMenuChange(SocketIOClient client, AckRequest ackRequest, String data) {
log.info("菜单变更：" + data);
- FunctionVO funcVo = getFuncVo(client);
- view.forEach(e->{
- e.get(funcVo.getModulesId()).sendEvent("menuChange",data);
- });
+ SocketEntity socketEntity = parseMsg(data);
+ log.info("控制的设备是：{}", parseMsg(client.getHandshakeData().getSingleUrlParam("connectInfo")).getTarget());
+ clientMap.get(socketEntity.getTarget()).sendEvent("menuChange", socketEntity.getMsg());
}
/**
* 断开连接时
+ *
* @param client
*/
@OnDisconnect()
- public void OnEvent(SocketIOClient client){
-
-
- FunctionVO funcVo = getFuncVo(client);
- if (funcVo.getIsView()){
- for (int i = 0; i <=view.size() ; i++) {
- if (view.get(i).containsKey(funcVo.getModulesId())) {
- view.remove(i);
- }
+ public void OnEvent(SocketIOClient client) {
+ String connectInfo = client.getHandshakeData().getSingleUrlParam("connectInfo");
+ SocketEntity socketEntity = parseMsg(connectInfo);
+ clientMap.forEach((key,value)->{
+ if (value.getSessionId().equals(client.getSessionId())){
+ clientMap.remove(key);
}
- }else {
- for (int i = 0; i <=controller.size() ; i++) {
- if (controller.get(i).containsKey(funcVo.getModulesId())) {
- controller.remove(i);
- }
- }
- }
- log.info("{}断开连接",client.getSessionId());
+ });
+ log.info("设备{}断开连接",socketEntity.getCurrent());
}
public void stop() {
@@ -219,9 +180,11 @@
return sa.substring(1, sa.indexOf(":"));
}
- private FunctionVO getFuncVo(SocketIOClient client){
- String connectInfo = client.getHandshakeData().getSingleUrlParam("connectInfo");
- return JSON.parseObject(connectInfo, FunctionVO.class);
+ /**
+ * 解析参数，转化为实体类
+ */
+ private SocketEntity parseMsg(String msg) {
+ return JSON.parseObject(msg, SocketEntity.class);
}
--
Gitblit v1.9.3