From a99354841669e8d4c4ef76428348b1a5ef1db065 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 22 Mar 2023 16:06:19 +0800
Subject: [PATCH] 模块不绑定设备，设备绑定模块。
---
src/main/java/org/springblade/modules/equipment/entity/EquipmentEntity.java | 6 ++++++
src/main/java/org/springblade/modules/modules/service/impl/ModulesServiceImpl.java | 7 +++++++
src/main/java/org/springblade/modules/modules/service/IModulesService.java | 3 +++
src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.xml | 11 +++++++++--
src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml | 2 +-
src/main/java/org/springblade/modules/modules/controller/FunctionController.java | 1 +
src/main/java/org/springblade/modules/modules/entity/ModulesEntity.java | 5 -----
src/main/java/org/springblade/modules/modules/controller/ModulesController.java | 2 +-
src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.java | 2 ++
src/main/java/org/springblade/common/handler/SocketIOService.java | 3 ++-
10 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/common/handler/SocketIOService.java b/src/main/java/org/springblade/common/handler/SocketIOService.java
index 70b88ba..d7f8d81 100644
--- a/src/main/java/org/springblade/common/handler/SocketIOService.java
+++ b/src/main/java/org/springblade/common/handler/SocketIOService.java
@@ -81,7 +81,7 @@
if (clientMap.containsKey(socketEntity.getCurrent())){
client.sendEvent("connectError",R.fail("连接已存在"));
- log.info("设备{}连接失败",socketEntity.getCurrent());
+ log.info("设备{}连接已存在",socketEntity.getCurrent());
}else {
clientMap.put(socketEntity.getCurrent(),client);
client.sendEvent("connectOk",R.success("连接成功"));
@@ -137,6 +137,7 @@
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);
diff --git a/src/main/java/org/springblade/modules/equipment/entity/EquipmentEntity.java b/src/main/java/org/springblade/modules/equipment/entity/EquipmentEntity.java
index ebeeb7a..7133b13 100644
--- a/src/main/java/org/springblade/modules/equipment/entity/EquipmentEntity.java
+++ b/src/main/java/org/springblade/modules/equipment/entity/EquipmentEntity.java
@@ -64,4 +64,10 @@
*/
@ApiModelProperty(value = "设备类型")
private String type;
+
+ /**
+ * 模块id
+ */
+ @ApiModelProperty(value = "模块id")
+ private String modulesId;
}
diff --git a/src/main/java/org/springblade/modules/modules/controller/FunctionController.java b/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
index dfd175a..586359b 100644
--- a/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
+++ b/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
@@ -168,6 +168,7 @@
list.add(map);
one.setFileUrl(list);
}
+ modulesFunctionService.updateById(one);
return R.data(bladeFile);
}
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 c3579fb..ff9d89a 100644
--- a/src/main/java/org/springblade/modules/modules/controller/ModulesController.java
+++ b/src/main/java/org/springblade/modules/modules/controller/ModulesController.java
@@ -90,7 +90,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入modules")
public R getAll(ModulesVO modules) {
- List<ModulesEntity> list =modulesService.list(Condition.getQueryWrapper(modules));
+ List<ModulesVO> list =modulesService.getAll(modules);
return R.data(list);
}
diff --git a/src/main/java/org/springblade/modules/modules/entity/ModulesEntity.java b/src/main/java/org/springblade/modules/modules/entity/ModulesEntity.java
index 6231baf..d5fbe62 100644
--- a/src/main/java/org/springblade/modules/modules/entity/ModulesEntity.java
+++ b/src/main/java/org/springblade/modules/modules/entity/ModulesEntity.java
@@ -40,11 +40,6 @@
public class ModulesEntity extends TenantEntity {
/**
- * 设备id
- */
- @ApiModelProperty(value = "设备id")
- private String equipmentId;
- /**
* 模块名称
*/
@ApiModelProperty(value = "模块名称")
diff --git a/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml b/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml
index aa66319..82a8ead 100644
--- a/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml
+++ b/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml
@@ -31,7 +31,7 @@
select func.*,equipment.code
from sys_modules_function func
LEFT JOIN sys_modules modules ON modules.id = func.modules_id AND modules.is_deleted = 0
- LEFT JOIN sys_equipment equipment ON equipment.id = modules.equipment_id
+ LEFT JOIN sys_equipment equipment ON equipment.modules_id = modules.id
where func.is_deleted = 0
<if test="function.modulesId !=null and function.modulesId !=''">
AND modules_id = #{function.modulesId}
diff --git a/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.java b/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.java
index 670b14a..2830249 100644
--- a/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.java
+++ b/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.modules.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.modules.entity.ModulesEntity;
import org.springblade.modules.modules.vo.ModulesVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,4 +41,5 @@
List<ModulesVO> selectModulesPage(IPage page, ModulesVO modules);
+ List<ModulesVO> getAll(@Param("modules") ModulesVO modules);
}
diff --git a/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.xml b/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.xml
index 47c23e8..941b7b0 100644
--- a/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.xml
+++ b/src/main/java/org/springblade/modules/modules/mapper/ModulesMapper.xml
@@ -3,12 +3,12 @@
<mapper namespace="org.springblade.modules.modules.mapper.ModulesMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="modulesResultMap" type="org.springblade.modules.modules.entity.ModulesEntity">
+ <resultMap id="modulesResultMap" type="org.springblade.modules.modules.vo.ModulesVO">
<result column="id" property="id"/>
<result column="name" property="name"/>
<result column="height" property="height"/>
<result column="width" property="width"/>
- <result column="background" property="background"/>
+ <result column="background" property="background" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -24,5 +24,12 @@
select * from sys_modules where is_deleted = 0
</select>
+ <select id="getAll" resultMap="modulesResultMap">
+ select * from sys_modules where is_deleted = 0
+ <if test="modules.name !=null and modules.name !=''">
+ AND name = #{modules.name}
+ </if>
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/modules/service/IModulesService.java b/src/main/java/org/springblade/modules/modules/service/IModulesService.java
index f244659..ec37ae2 100644
--- a/src/main/java/org/springblade/modules/modules/service/IModulesService.java
+++ b/src/main/java/org/springblade/modules/modules/service/IModulesService.java
@@ -21,6 +21,8 @@
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 模块表 服务类
*
@@ -39,4 +41,5 @@
IPage<ModulesVO> selectModulesPage(IPage<ModulesVO> page, ModulesVO modules);
+ List<ModulesVO> getAll(ModulesVO modules);
}
diff --git a/src/main/java/org/springblade/modules/modules/service/impl/ModulesServiceImpl.java b/src/main/java/org/springblade/modules/modules/service/impl/ModulesServiceImpl.java
index bfd1180..69a8db3 100644
--- a/src/main/java/org/springblade/modules/modules/service/impl/ModulesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/modules/service/impl/ModulesServiceImpl.java
@@ -24,6 +24,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 模块表 服务实现类
*
@@ -38,5 +40,10 @@
return page.setRecords(baseMapper.selectModulesPage(page, modules));
}
+ @Override
+ public List<ModulesVO> getAll(ModulesVO modules) {
+ return baseMapper.getAll(modules);
+ }
+
}
--
Gitblit v1.9.3