From ac53ebf1b33930f175cf59c26c2a92bbb25366db Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 18 Mar 2023 10:45:46 +0800
Subject: [PATCH] sockeio修改
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1
src/main/java/org/springblade/modules/modules/vo/FunctionVO.java | 2
src/main/java/org/springblade/modules/modules/controller/ModulesController.java | 13 ++++
src/main/java/org/springblade/common/handler/SocketIOService.java | 121 +++++++++++++++++++++++----------------
4 files changed, 87 insertions(+), 50 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index 80409de..e8deb1d 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -54,6 +54,7 @@
secureRegistry.excludePathPatterns("/multimedia/multimedia/all");
secureRegistry.excludePathPatterns("/equipment/equipment/all");
secureRegistry.excludePathPatterns("/function/function/**");
+ secureRegistry.excludePathPatterns("/modules/modules/all");
return secureRegistry;
}
diff --git a/src/main/java/org/springblade/common/handler/SocketIOService.java b/src/main/java/org/springblade/common/handler/SocketIOService.java
index b2b86d2..320d0ae 100644
--- a/src/main/java/org/springblade/common/handler/SocketIOService.java
+++ b/src/main/java/org/springblade/common/handler/SocketIOService.java
@@ -7,9 +7,12 @@
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.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;
@@ -41,19 +44,25 @@
private final Logger log = LoggerFactory.getLogger(this.getClass());
// 用来存已连接的客户端
- private static Map<String, SocketIOClient> clientMap = new ConcurrentHashMap<>();
+ private static Map<String, SocketIOClient> viewMap = new ConcurrentHashMap<>();
- // 用来存已连接的视图客户端
- private List<Map<String, SocketIOClient>> view = new ArrayList<>();
+ // 用来存已连接的客户端
+ private static Map<String, SocketIOClient> controllerMap = new ConcurrentHashMap<>();
- // 用来存已连接的控制客户端
- private List<Map<String, SocketIOClient>> controller = new ArrayList<>();
+// // 用来存已连接的视图客户端
+// private List<Map<String, SocketIOClient>> view = new ArrayList<>();
+//
+// // 用来存已连接的控制客户端
+// private List<Map<String, SocketIOClient>> controller = new ArrayList<>();
@Autowired
private SocketIOServer socketIOServer;
@Autowired
private IFunctionService functionService;
+
+ @Autowired
+ private IModulesService modulesService;
/**
* Spring IoC容器创建之后，在加载SocketIOConfiguration Bean之后启动
@@ -82,106 +91,118 @@
/**
* 连接时
+ *
* @param client
*/
@OnConnect
- public void onConnect(SocketIOClient client){
+ public void onConnect(SocketIOClient client) {
FunctionVO functionEntity = getFuncVo(client);
//判断页面和控制器是否已经连接过了
- if (functionEntity.getIsView()){
- for (int i = 0; i < view.size(); i++) {
- if (view.get(i).containsKey(functionEntity.getModulesId())){
- client.sendEvent("connectError",R.fail("已连接"));
+ if (functionEntity.getIsView()) {
+ for (int i = 0; i < viewMap.size(); i++) {
+ if (viewMap.containsKey(functionEntity.getModulesId())) {
+ client.sendEvent("connectError", R.fail("已连接"));
return;
}
}
- }else {
- for (int i = 0; i < controller.size(); i++) {
- if (controller.get(i).containsKey(functionEntity.getModulesId())){
- client.sendEvent("connectError",R.fail("已连接"));
+ } else {
+ for (int i = 0; i < controllerMap.size(); i++) {
+ if (controllerMap.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);
+ if (all.size() > 0) {
+ if (functionEntity.getIsView()) {
+ log.info("预览页{}", client.getSessionId().toString());
+ viewMap.put(functionEntity.getModulesId(), client);
+
+ } else {
+ log.info("控制页{}", client.getSessionId().toString());
+ controllerMap.put(functionEntity.getModulesId(), client);
}
client.sendEvent("connectOk", R.data(all));
- }else {
- client.sendEvent("connectError",R.fail("连接失败"));
+ } else {
+ client.sendEvent("connectError", R.fail("连接失败"));
}
}
/**
* 监听前端订阅相同事件发送过来的信息
+ *
* @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->{
+
+
+ viewMap.forEach((e,socketIO)->{
if (data.equals("previous")){
- e.get(funcVo.getModulesId()).sendEvent("previousPage","previous");
+ if (e.equals(funcVo.getModulesId())){
+ socketIO.sendEvent("previousPage","previous");
+ }
}else if (data.equals("next")){
- e.get(funcVo.getModulesId()).sendEvent("nextPage","next");
+ if (e.equals(funcVo.getModulesId())){
+ socketIO.sendEvent("previousPage","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);
+ viewMap.forEach((e,socketIOClient)->{
+ if (e.equals(funcVo.getModulesId())){
+ log.info("目标客户端：{}", socketIOClient.getSessionId().toString());
+ socketIOClient.sendEvent("menuChange", data);
+ }
});
}
/**
* 断开连接时
+ *
* @param client
*/
@OnDisconnect()
- public void OnEvent(SocketIOClient client){
-
-
+ 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);
+ if (funcVo.getIsView()) {
+ viewMap.forEach((e,socketIOClient)->{
+ if (e.equals(funcVo.getModulesId())){
+ viewMap.remove(e);
+ log.info("预览页：{}断开连接", socketIOClient.getSessionId());
}
- }
- }else {
- for (int i = 0; i <=controller.size() ; i++) {
- if (controller.get(i).containsKey(funcVo.getModulesId())) {
- controller.remove(i);
+ });
+ } else {
+ controllerMap.forEach((e,socketIOClient)->{
+ if (e.equals(funcVo.getModulesId())){
+ controllerMap.remove(e);
+ log.info("控制页：{}断开连接", socketIOClient.getSessionId());
}
- }
+ });
}
- log.info("{}断开连接",client.getSessionId());
}
public void stop() {
@@ -219,7 +240,7 @@
return sa.substring(1, sa.indexOf(":"));
}
- private FunctionVO getFuncVo(SocketIOClient client){
+ private FunctionVO getFuncVo(SocketIOClient client) {
String connectInfo = client.getHandshakeData().getSingleUrlParam("connectInfo");
return JSON.parseObject(connectInfo, FunctionVO.class);
}
diff --git a/src/main/java/org/springblade/modules/modules/controller/ModulesController.java b/src/main/java/org/springblade/modules/modules/controller/ModulesController.java
index 803730e..c3579fb 100644
--- a/src/main/java/org/springblade/modules/modules/controller/ModulesController.java
+++ b/src/main/java/org/springblade/modules/modules/controller/ModulesController.java
@@ -35,6 +35,8 @@
import org.springblade.modules.modules.service.IModulesService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+
/**
* 模块表 控制器
*
@@ -82,6 +84,17 @@
}
/**
+ * 模块表 自定义分页
+ */
+ @GetMapping("/all")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入modules")
+ public R getAll(ModulesVO modules) {
+ List<ModulesEntity> list =modulesService.list(Condition.getQueryWrapper(modules));
+ return R.data(list);
+ }
+
+ /**
* 模块表 新增
*/
@PostMapping("/save")
diff --git a/src/main/java/org/springblade/modules/modules/vo/FunctionVO.java b/src/main/java/org/springblade/modules/modules/vo/FunctionVO.java
index 474e951..b002adc 100644
--- a/src/main/java/org/springblade/modules/modules/vo/FunctionVO.java
+++ b/src/main/java/org/springblade/modules/modules/vo/FunctionVO.java
@@ -32,6 +32,8 @@
public class FunctionVO extends FunctionEntity {
private static final long serialVersionUID = 1L;
+ private String modulesName;
+
private Boolean isView;
private String controllerId;
--
Gitblit v1.9.3