ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复online占用sql连接的问题，修复逻辑删除没有默认值的问题

Browse Source
This commit is contained in:
dftre 2024-09-04 15:02:39 +08:00
parent 4e3093b801
commit 59208c9c48
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java
View File

@ -72,7 +72,7 @@ public class OnLineController extends BaseController {
return object; return object;
} }
public Boolean checkPermission(String permissionType,String permissionValue) { public Boolean checkPermission(String permissionType, String permissionValue) {
if (permissionType == null) if (permissionType == null)
return true; return true;
return switch (permissionType) { return switch (permissionType) {
@ -89,18 +89,22 @@ public class OnLineController extends BaseController {
public Object processingMapper(String sqlContext, String actuatot, Map<String, Object> params) { public Object processingMapper(String sqlContext, String actuatot, Map<String, Object> params) {
String sql = "<script>\n" + sqlContext + "\n</script>"; String sql = "<script>\n" + sqlContext + "\n</script>";
SqlSession sqlSession = sqlSessionFactory.openSession(); SqlSession sqlSession = sqlSessionFactory.openSession();
SqlMapper sqlMapper = new SqlMapper(sqlSession); try {
Object res = null; SqlMapper sqlMapper = new SqlMapper(sqlSession);
res = switch (actuatot) { Object res = null;
case "selectList" -> getDataTable(sqlMapper.selectList(sql, params)); res = switch (actuatot) {
case "insert" -> toAjax(sqlMapper.insert(sql, params)); case "selectList" -> getDataTable(sqlMapper.selectList(sql, params));
case "selectOne" -> success(sqlMapper.selectOne(sql, params)); case "insert" -> toAjax(sqlMapper.insert(sql, params));
case "update" -> toAjax(sqlMapper.update(sql, params)); case "selectOne" -> success(sqlMapper.selectOne(sql, params));
case "delete" -> toAjax(sqlMapper.delete(sql, params)); case "update" -> toAjax(sqlMapper.update(sql, params));
default -> AjaxResult.error(500, "系统错误，执行器错误"); case "delete" -> toAjax(sqlMapper.delete(sql, params));
}; default -> AjaxResult.error(500, "系统错误，执行器错误");
sqlSession.close(); };
return res; return res;
} finally {
sqlSession.close();
}
} }
@RequestMapping("/api/**") @RequestMapping("/api/**")
@ -120,7 +124,7 @@ public class OnLineController extends BaseController {
return AjaxResult.error(500, "系统错误，在线接口重复"); return AjaxResult.error(500, "系统错误，在线接口重复");
} else { } else {
OnlineMb onlineMb = selectOnlineMbList.get(0); OnlineMb onlineMb = selectOnlineMbList.get(0);
if (!checkPermission(onlineMb.getPermissionType(),onlineMb.getPermissionValue())) if (!checkPermission(onlineMb.getPermissionType(), onlineMb.getPermissionValue()))
return AjaxResult.error(403, "没有权限，请联系管理员授权"); return AjaxResult.error(403, "没有权限，请联系管理员授权");
if (onlineMb.getDeptId() != null && onlineMb.getDeptId().equals("1")) { if (onlineMb.getDeptId() != null && onlineMb.getDeptId().equals("1")) {

2
sql/online.sql
View File

@ -15,7 +15,7 @@ CREATE TABLE online_mb (
dept_id char(1) NULL COMMENT '是否需要deptId', dept_id char(1) NULL COMMENT '是否需要deptId',
permission_type varchar(255) NULL COMMENT '许可类型', permission_type varchar(255) NULL COMMENT '许可类型',
permission_value varchar(255) NULL COMMENT '许可值', permission_value varchar(255) NULL COMMENT '许可值',
del_flag varchar(10) NOT NULL COMMENT '删除标志（0代表存在 1代表删除）', del_flag varchar(10) NOT NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
PRIMARY KEY (mb_id) PRIMARY KEY (mb_id)
) ENGINE = InnoDB COMMENT = '在线接口'; ) ENGINE = InnoDB COMMENT = '在线接口';