Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
liyang
sts网站
Commits
a96d4bf2
Commit
a96d4bf2
authored
Jun 29, 2024
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
菜单管理新增路由名称
parent
8264b8fb
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
128 additions
and
96 deletions
+128
-96
SysMenu.java
...ain/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+17
-2
SysMenuServiceImpl.java
...ava/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+17
-5
SysMenuMapper.xml
...system/src/main/resources/mapper/system/SysMenuMapper.xml
+8
-4
ry_20240629.sql
sql/ry_20240629.sql
+86
-85
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View file @
a96d4bf2
...
@@ -42,6 +42,9 @@ public class SysMenu extends BaseEntity
...
@@ -42,6 +42,9 @@ public class SysMenu extends BaseEntity
/** 路由参数 */
/** 路由参数 */
private
String
query
;
private
String
query
;
/** 路由名称,默认和路由地址相同的驼峰格式(注意:因为vue3版本的router会删除名称相同路由,为避免名字的冲突,特殊情况可以自定义) */
private
String
routeName
;
/** 是否为外链(0是 1否) */
/** 是否为外链(0是 1否) */
private
String
isFrame
;
private
String
isFrame
;
...
@@ -151,6 +154,16 @@ public class SysMenu extends BaseEntity
...
@@ -151,6 +154,16 @@ public class SysMenu extends BaseEntity
this
.
query
=
query
;
this
.
query
=
query
;
}
}
public
String
getRouteName
()
{
return
routeName
;
}
public
void
setRouteName
(
String
routeName
)
{
this
.
routeName
=
routeName
;
}
public
String
getIsFrame
()
public
String
getIsFrame
()
{
{
return
isFrame
;
return
isFrame
;
...
@@ -242,6 +255,8 @@ public class SysMenu extends BaseEntity
...
@@ -242,6 +255,8 @@ public class SysMenu extends BaseEntity
.
append
(
"orderNum"
,
getOrderNum
())
.
append
(
"orderNum"
,
getOrderNum
())
.
append
(
"path"
,
getPath
())
.
append
(
"path"
,
getPath
())
.
append
(
"component"
,
getComponent
())
.
append
(
"component"
,
getComponent
())
.
append
(
"query"
,
getQuery
())
.
append
(
"routeName"
,
getRouteName
())
.
append
(
"isFrame"
,
getIsFrame
())
.
append
(
"isFrame"
,
getIsFrame
())
.
append
(
"IsCache"
,
getIsCache
())
.
append
(
"IsCache"
,
getIsCache
())
.
append
(
"menuType"
,
getMenuType
())
.
append
(
"menuType"
,
getMenuType
())
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View file @
a96d4bf2
...
@@ -188,7 +188,7 @@ public class SysMenuServiceImpl implements ISysMenuService
...
@@ -188,7 +188,7 @@ public class SysMenuServiceImpl implements ISysMenuService
RouterVo
children
=
new
RouterVo
();
RouterVo
children
=
new
RouterVo
();
children
.
setPath
(
menu
.
getPath
());
children
.
setPath
(
menu
.
getPath
());
children
.
setComponent
(
menu
.
getComponent
());
children
.
setComponent
(
menu
.
getComponent
());
children
.
setName
(
StringUtils
.
capitalize
(
menu
.
getPath
()));
children
.
setName
(
getRouteName
(
menu
.
getRouteName
(),
menu
.
getPath
()));
children
.
setMeta
(
new
MetaVo
(
menu
.
getMenuName
(),
menu
.
getIcon
(),
StringUtils
.
equals
(
"1"
,
menu
.
getIsCache
()),
menu
.
getPath
()));
children
.
setMeta
(
new
MetaVo
(
menu
.
getMenuName
(),
menu
.
getIcon
(),
StringUtils
.
equals
(
"1"
,
menu
.
getIsCache
()),
menu
.
getPath
()));
children
.
setQuery
(
menu
.
getQuery
());
children
.
setQuery
(
menu
.
getQuery
());
childrenList
.
add
(
children
);
childrenList
.
add
(
children
);
...
@@ -203,7 +203,7 @@ public class SysMenuServiceImpl implements ISysMenuService
...
@@ -203,7 +203,7 @@ public class SysMenuServiceImpl implements ISysMenuService
String
routerPath
=
innerLinkReplaceEach
(
menu
.
getPath
());
String
routerPath
=
innerLinkReplaceEach
(
menu
.
getPath
());
children
.
setPath
(
routerPath
);
children
.
setPath
(
routerPath
);
children
.
setComponent
(
UserConstants
.
INNER_LINK
);
children
.
setComponent
(
UserConstants
.
INNER_LINK
);
children
.
setName
(
StringUtils
.
capitalize
(
routerPath
));
children
.
setName
(
getRouteName
(
menu
.
getRouteName
(),
routerPath
));
children
.
setMeta
(
new
MetaVo
(
menu
.
getMenuName
(),
menu
.
getIcon
(),
menu
.
getPath
()));
children
.
setMeta
(
new
MetaVo
(
menu
.
getMenuName
(),
menu
.
getIcon
(),
menu
.
getPath
()));
childrenList
.
add
(
children
);
childrenList
.
add
(
children
);
router
.
setChildren
(
childrenList
);
router
.
setChildren
(
childrenList
);
...
@@ -354,13 +354,25 @@ public class SysMenuServiceImpl implements ISysMenuService
...
@@ -354,13 +354,25 @@ public class SysMenuServiceImpl implements ISysMenuService
*/
*/
public
String
getRouteName
(
SysMenu
menu
)
public
String
getRouteName
(
SysMenu
menu
)
{
{
String
routerName
=
StringUtils
.
capitalize
(
menu
.
getPath
());
// 非外链并且是一级目录(类型为目录)
// 非外链并且是一级目录(类型为目录)
if
(
isMenuFrame
(
menu
))
if
(
isMenuFrame
(
menu
))
{
{
r
outerName
=
StringUtils
.
EMPTY
;
r
eturn
StringUtils
.
EMPTY
;
}
}
return
routerName
;
return
getRouteName
(
menu
.
getRouteName
(),
menu
.
getPath
());
}
/**
* 获取路由名称,如没有配置路由名称则取路由地址
*
* @param routerName 路由名称
* @param path 路由地址
* @return 路由名称(驼峰格式)
*/
public
String
getRouteName
(
String
name
,
String
path
)
{
String
routerName
=
StringUtils
.
isNotEmpty
(
name
)
?
name
:
path
;
return
StringUtils
.
capitalize
(
routerName
);
}
}
/**
/**
...
...
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View file @
a96d4bf2
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
<result
property=
"path"
column=
"path"
/>
<result
property=
"path"
column=
"path"
/>
<result
property=
"component"
column=
"component"
/>
<result
property=
"component"
column=
"component"
/>
<result
property=
"query"
column=
"query"
/>
<result
property=
"query"
column=
"query"
/>
<result
property=
"routeName"
column=
"route_name"
/>
<result
property=
"isFrame"
column=
"is_frame"
/>
<result
property=
"isFrame"
column=
"is_frame"
/>
<result
property=
"isCache"
column=
"is_cache"
/>
<result
property=
"isCache"
column=
"is_cache"
/>
<result
property=
"menuType"
column=
"menu_type"
/>
<result
property=
"menuType"
column=
"menu_type"
/>
...
@@ -28,7 +29,7 @@
...
@@ -28,7 +29,7 @@
</resultMap>
</resultMap>
<sql
id=
"selectMenuVo"
>
<sql
id=
"selectMenuVo"
>
select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
select menu_id, menu_name, parent_id, order_num, path, component, `query`,
route_name,
is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
from sys_menu
from sys_menu
</sql>
</sql>
...
@@ -49,13 +50,13 @@
...
@@ -49,13 +50,13 @@
</select>
</select>
<select
id=
"selectMenuTreeAll"
resultMap=
"SysMenuResult"
>
<select
id=
"selectMenuTreeAll"
resultMap=
"SysMenuResult"
>
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.
route_name, m.
visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
order by m.parent_id, m.order_num
</select>
</select>
<select
id=
"selectMenuListByUserId"
parameterType=
"SysMenu"
resultMap=
"SysMenuResult"
>
<select
id=
"selectMenuListByUserId"
parameterType=
"SysMenu"
resultMap=
"SysMenuResult"
>
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.
route_name, m.
visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_user_role ur on rm.role_id = ur.role_id
...
@@ -74,7 +75,7 @@
...
@@ -74,7 +75,7 @@
</select>
</select>
<select
id=
"selectMenuTreeByUserId"
parameterType=
"Long"
resultMap=
"SysMenuResult"
>
<select
id=
"selectMenuTreeByUserId"
parameterType=
"Long"
resultMap=
"SysMenuResult"
>
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.
route_name, m.
visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_user_role ur on rm.role_id = ur.role_id
...
@@ -141,6 +142,7 @@
...
@@ -141,6 +142,7 @@
<if
test=
"path != null and path != ''"
>
path = #{path},
</if>
<if
test=
"path != null and path != ''"
>
path = #{path},
</if>
<if
test=
"component != null"
>
component = #{component},
</if>
<if
test=
"component != null"
>
component = #{component},
</if>
<if
test=
"query != null"
>
`query` = #{query},
</if>
<if
test=
"query != null"
>
`query` = #{query},
</if>
<if
test=
"routeName != null"
>
route_name = #{routeName},
</if>
<if
test=
"isFrame != null and isFrame != ''"
>
is_frame = #{isFrame},
</if>
<if
test=
"isFrame != null and isFrame != ''"
>
is_frame = #{isFrame},
</if>
<if
test=
"isCache != null and isCache != ''"
>
is_cache = #{isCache},
</if>
<if
test=
"isCache != null and isCache != ''"
>
is_cache = #{isCache},
</if>
<if
test=
"menuType != null and menuType != ''"
>
menu_type = #{menuType},
</if>
<if
test=
"menuType != null and menuType != ''"
>
menu_type = #{menuType},
</if>
...
@@ -164,6 +166,7 @@
...
@@ -164,6 +166,7 @@
<if
test=
"path != null and path != ''"
>
path,
</if>
<if
test=
"path != null and path != ''"
>
path,
</if>
<if
test=
"component != null and component != ''"
>
component,
</if>
<if
test=
"component != null and component != ''"
>
component,
</if>
<if
test=
"query != null and query != ''"
>
`query`,
</if>
<if
test=
"query != null and query != ''"
>
`query`,
</if>
<if
test=
"routeName != null"
>
route_name,
</if>
<if
test=
"isFrame != null and isFrame != ''"
>
is_frame,
</if>
<if
test=
"isFrame != null and isFrame != ''"
>
is_frame,
</if>
<if
test=
"isCache != null and isCache != ''"
>
is_cache,
</if>
<if
test=
"isCache != null and isCache != ''"
>
is_cache,
</if>
<if
test=
"menuType != null and menuType != ''"
>
menu_type,
</if>
<if
test=
"menuType != null and menuType != ''"
>
menu_type,
</if>
...
@@ -182,6 +185,7 @@
...
@@ -182,6 +185,7 @@
<if
test=
"path != null and path != ''"
>
#{path},
</if>
<if
test=
"path != null and path != ''"
>
#{path},
</if>
<if
test=
"component != null and component != ''"
>
#{component},
</if>
<if
test=
"component != null and component != ''"
>
#{component},
</if>
<if
test=
"query != null and query != ''"
>
#{query},
</if>
<if
test=
"query != null and query != ''"
>
#{query},
</if>
<if
test=
"routeName != null"
>
#{routeName},
</if>
<if
test=
"isFrame != null and isFrame != ''"
>
#{isFrame},
</if>
<if
test=
"isFrame != null and isFrame != ''"
>
#{isFrame},
</if>
<if
test=
"isCache != null and isCache != ''"
>
#{isCache},
</if>
<if
test=
"isCache != null and isCache != ''"
>
#{isCache},
</if>
<if
test=
"menuType != null and menuType != ''"
>
#{menuType},
</if>
<if
test=
"menuType != null and menuType != ''"
>
#{menuType},
</if>
...
...
sql/ry_20240
5
29.sql
→
sql/ry_20240
6
29.sql
View file @
a96d4bf2
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