Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RuoYi-Vue-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
融通安全管理系统
RuoYi-Vue-master
Commits
dfa89ab2
You need to sign in or sign up before continuing.
Commit
dfa89ab2
authored
Jul 05, 2023
by
周昊
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
d83e0987
407b13da
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
375 additions
and
322 deletions
+375
-322
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/SysMenuAppController.java
...va/com/ruoyi/web/controller/app/SysMenuAppController.java
+70
-0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+7
-0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
...c/main/java/com/ruoyi/system/service/ISysMenuService.java
+27
-20
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
...ava/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+98
-150
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
...system/src/main/resources/mapper/system/SysMenuMapper.xml
+173
-152
No files found.
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/SysMenuAppController.java
0 → 100644
View file @
dfa89ab2
package
com
.
ruoyi
.
web
.
controller
.
app
;
import
com.censoft.censoftrongtong.domain.*
;
import
com.censoft.censoftrongtong.domain.dto.*
;
import
com.censoft.censoftrongtong.enums.RiskPlanStatusType
;
import
com.censoft.censoftrongtong.service.*
;
import
com.ruoyi.common.config.RuoYiConfig
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.common.core.domain.entity.SysDictData
;
import
com.ruoyi.common.core.domain.entity.SysMenu
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.system.service.ISysDictDataService
;
import
com.ruoyi.system.service.ISysMenuService
;
import
com.ruoyi.system.service.ISysUploadFileService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 菜单app端接口
*
* @author censoft
* @date 2023-06-27
* @module 融通项目
*/
@RestController
@RequestMapping
(
"/app-api/menu"
)
public
class
SysMenuAppController
extends
BaseController
{
@Autowired
private
ISysMenuService
menuService
;
/**
* 菜单栏
*
* @param httpServletRequest
* @return
*/
@GetMapping
(
"/getMenu"
)
@ResponseBody
public
AjaxResult
menu
(
HttpServletRequest
httpServletRequest
)
{
SysMenu
menu
=
new
SysMenu
();
menu
.
setParentId
(
2055L
);
menu
.
getParams
().
put
(
"userId"
,
getUserId
());
Map
menus
=
new
HashMap
<>();
if
(
SysUser
.
isAdmin
(
getUserId
()))
{
menu
.
getParams
().
put
(
"isAdmin"
,
true
);
}
List
<
SysMenu
>
title
=
menuService
.
selectMenusApp
(
menu
);
for
(
int
i
=
0
;
i
<
title
.
size
();
i
++)
{
menu
.
setParentId
(
title
.
get
(
i
).
getMenuId
());
List
<
SysMenu
>
menus1
=
menuService
.
selectMenusApp
(
menu
);
menus
.
put
(
title
.
get
(
i
).
getMenuName
(),
menus1
);
}
return
AjaxResult
.
success
(
menus
);
}
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View file @
dfa89ab2
...
...
@@ -19,6 +19,13 @@ public interface SysMenuMapper
*/
public
List
<
SysMenu
>
selectMenuList
(
SysMenu
menu
);
/**
* 查询移动端菜单
* @param menu
* @return
*/
public
List
<
SysMenu
>
selectMenusApp
(
SysMenu
menu
);
/**
* 根据用户所有权限
*
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View file @
dfa89ab2
...
...
@@ -2,29 +2,36 @@ package com.ruoyi.system.service;
import
java.util.List
;
import
java.util.Set
;
import
com.ruoyi.common.core.domain.TreeSelect
;
import
com.ruoyi.common.core.domain.entity.SysMenu
;
import
com.ruoyi.system.domain.vo.RouterVo
;
/**
* 菜单 业务层
*
*
* @author ruoyi
*/
public
interface
ISysMenuService
{
public
interface
ISysMenuService
{
/**
* 根据用户查询系统菜单列表
*
*
* @param userId 用户ID
* @return 菜单列表
*/
public
List
<
SysMenu
>
selectMenuList
(
Long
userId
);
/**
* 根据用户查询移动端菜单列表
*
* @return 菜单列表
*/
public
List
<
SysMenu
>
selectMenusApp
(
SysMenu
menu
);
/**
* 根据用户查询系统菜单列表
*
* @param menu 菜单信息
*
* @param menu
菜单信息
* @param userId 用户ID
* @return 菜单列表
*/
...
...
@@ -32,7 +39,7 @@ public interface ISysMenuService
/**
* 根据用户ID查询权限
*
*
* @param userId 用户ID
* @return 权限列表
*/
...
...
@@ -40,7 +47,7 @@ public interface ISysMenuService
/**
* 根据角色ID查询权限
*
*
* @param roleId 角色ID
* @return 权限列表
*/
...
...
@@ -48,7 +55,7 @@ public interface ISysMenuService
/**
* 根据用户ID查询菜单树信息
*
*
* @param userId 用户ID
* @return 菜单列表
*/
...
...
@@ -56,7 +63,7 @@ public interface ISysMenuService
/**
* 根据角色ID查询菜单树信息
*
*
* @param roleId 角色ID
* @return 选中菜单列表
*/
...
...
@@ -64,7 +71,7 @@ public interface ISysMenuService
/**
* 构建前端路由所需要的菜单
*
*
* @param menus 菜单列表
* @return 路由列表
*/
...
...
@@ -72,7 +79,7 @@ public interface ISysMenuService
/**
* 构建前端所需要树结构
*
*
* @param menus 菜单列表
* @return 树结构列表
*/
...
...
@@ -80,7 +87,7 @@ public interface ISysMenuService
/**
* 构建前端所需要下拉树结构
*
*
* @param menus 菜单列表
* @return 下拉树结构列表
*/
...
...
@@ -88,7 +95,7 @@ public interface ISysMenuService
/**
* 根据菜单ID查询信息
*
*
* @param menuId 菜单ID
* @return 菜单信息
*/
...
...
@@ -96,7 +103,7 @@ public interface ISysMenuService
/**
* 是否存在菜单子节点
*
*
* @param menuId 菜单ID
* @return 结果 true 存在 false 不存在
*/
...
...
@@ -104,7 +111,7 @@ public interface ISysMenuService
/**
* 查询菜单是否存在角色
*
*
* @param menuId 菜单ID
* @return 结果 true 存在 false 不存在
*/
...
...
@@ -112,7 +119,7 @@ public interface ISysMenuService
/**
* 新增保存菜单信息
*
*
* @param menu 菜单信息
* @return 结果
*/
...
...
@@ -120,7 +127,7 @@ public interface ISysMenuService
/**
* 修改保存菜单信息
*
*
* @param menu 菜单信息
* @return 结果
*/
...
...
@@ -128,7 +135,7 @@ public interface ISysMenuService
/**
* 删除菜单管理信息
*
*
* @param menuId 菜单ID
* @return 结果
*/
...
...
@@ -136,7 +143,7 @@ public interface ISysMenuService
/**
* 校验菜单名称是否唯一
*
*
* @param menu 菜单信息
* @return 结果
*/
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View file @
dfa89ab2
This diff is collapsed.
Click to expand it.
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View file @
dfa89ab2
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment