Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
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
base_platform_enterprise
gic-platform-auth
Commits
0fbfdbfb
Commit
0fbfdbfb
authored
Jan 14, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限菜单查询方式调整:一开始只查询第一层
parent
afd61885
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
60 additions
and
9 deletions
+60
-9
MenuListQO.java
...rm-auth-api/src/main/java/com/gic/auth/qo/MenuListQO.java
+13
-0
MenuApiService.java
...pi/src/main/java/com/gic/auth/service/MenuApiService.java
+2
-0
TabSysMenuMapper.java
...c/main/java/com/gic/auth/dao/mapper/TabSysMenuMapper.java
+4
-1
MenuService.java
...rvice/src/main/java/com/gic/auth/service/MenuService.java
+5
-4
MenuServiceImpl.java
.../main/java/com/gic/auth/service/impl/MenuServiceImpl.java
+9
-1
MenuApiServiceImpl.java
...a/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java
+11
-3
TabSysMenuMapper.xml
...th-service/src/main/resources/mapper/TabSysMenuMapper.xml
+16
-0
No files found.
gic-platform-auth-api/src/main/java/com/gic/auth/qo/MenuListQO.java
View file @
0fbfdbfb
...
...
@@ -39,6 +39,11 @@ public class MenuListQO extends PageQO{
*/
private
String
versionCode
;
/**
* 逐级展开的方式,所以需要传ID,如果不传,默认查询第一层级,即level = 1
*/
private
Integer
menuId
;
public
String
getSearch
()
{
return
search
;
}
...
...
@@ -94,4 +99,12 @@ public class MenuListQO extends PageQO{
public
void
setVersionCode
(
String
versionCode
)
{
this
.
versionCode
=
versionCode
;
}
public
Integer
getMenuId
()
{
return
menuId
;
}
public
void
setMenuId
(
Integer
menuId
)
{
this
.
menuId
=
menuId
;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java
View file @
0fbfdbfb
...
...
@@ -28,6 +28,8 @@ public interface MenuApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
*/
ServiceResponse
<
List
<
MenuDTO
>>
listByMenuIdList
(
List
<
Integer
>
menuIdList
);
ServiceResponse
<
List
<
MenuDTO
>>
listByParentMenuIdList
(
List
<
Integer
>
parentMenuIdList
);
/**
* 查询用户拥有的所有菜单路由权限
* @Title: listUserMenu
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuMapper.java
View file @
0fbfdbfb
...
...
@@ -120,6 +120,8 @@ public interface TabSysMenuMapper {
*/
List
<
TabSysMenu
>
selectByIds
(
@Param
(
"menuIdList"
)
List
<
Integer
>
menuIdList
);
List
<
TabSysMenu
>
listByParentMenuIdList
(
@Param
(
"parentMenuIdList"
)
List
<
Integer
>
parentMenuIdList
);
List
<
TabSysMenu
>
selectByIdsAndOrderBy
(
@Param
(
"menuIdList"
)
List
<
Integer
>
menuIdList
,
@Param
(
"orderByStr"
)
String
orderByStr
);
/**
...
...
@@ -194,7 +196,7 @@ public interface TabSysMenuMapper {
* @author guojuxing
* @return java.util.List<com.gic.auth.entity.TabSysUser>
*/
List
<
TabSys
User
>
listAdminOnlyOperationItem
();
List
<
TabSys
Menu
>
listAdminOnlyOperationItem
();
void
deleteByMenuIdList
(
@Param
(
"list"
)
List
<
Integer
>
menuIdList
);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/service/MenuService.java
View file @
0fbfdbfb
package
com
.
gic
.
auth
.
service
;
import
java.util.List
;
import
com.gic.auth.dto.AuthItemListDTO
;
import
com.gic.auth.dto.MenuDTO
;
import
com.gic.auth.entity.TabSysMenu
;
import
com.gic.auth.entity.TabSysUser
;
import
com.gic.auth.qo.MenuListQO
;
import
com.gic.auth.qo.MenuOperationItemListQO
;
import
com.github.pagehelper.Page
;
import
java.util.List
;
public
interface
MenuService
{
List
<
TabSysMenu
>
listMenu
(
MenuListQO
params
);
...
...
@@ -176,7 +175,9 @@ public interface MenuService {
* @author guojuxing
* @return java.util.List<com.gic.auth.entity.TabSysUser>
*/
List
<
TabSys
User
>
listAdminOnlyOperationItem
();
List
<
TabSys
Menu
>
listAdminOnlyOperationItem
();
void
deleteByMenuIdList
(
List
<
Integer
>
menuIdList
);
List
<
TabSysMenu
>
listByParentMenuIdList
(
List
<
Integer
>
parentMenuIdList
);
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/MenuServiceImpl.java
View file @
0fbfdbfb
...
...
@@ -162,7 +162,7 @@ public class MenuServiceImpl implements MenuService {
}
@Override
public
List
<
TabSys
User
>
listAdminOnlyOperationItem
()
{
public
List
<
TabSys
Menu
>
listAdminOnlyOperationItem
()
{
return
tabSysMenuMapper
.
listAdminOnlyOperationItem
();
}
...
...
@@ -173,6 +173,14 @@ public class MenuServiceImpl implements MenuService {
}
}
@Override
public
List
<
TabSysMenu
>
listByParentMenuIdList
(
List
<
Integer
>
parentMenuIdList
)
{
if
(
CollectionUtils
.
isEmpty
(
parentMenuIdList
))
{
return
new
ArrayList
<>();
}
return
tabSysMenuMapper
.
listByParentMenuIdList
(
parentMenuIdList
);
}
private
void
updateSort
(
Integer
sort
,
Integer
id
)
{
TabSysMenu
record
=
new
TabSysMenu
();
record
.
setMenuId
(
id
);
...
...
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java
View file @
0fbfdbfb
...
...
@@ -63,6 +63,12 @@ public class MenuApiServiceImpl implements MenuApiService {
}
@Override
public
ServiceResponse
<
List
<
MenuDTO
>>
listByParentMenuIdList
(
List
<
Integer
>
parentMenuIdList
)
{
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListNew
(
MenuDTO
.
class
,
menuService
.
listByParentMenuIdList
(
parentMenuIdList
)));
}
@Override
public
ServiceResponse
<
List
<
MenuDTO
>>
listUserMenu
(
Integer
userId
,
String
versionCode
)
{
TabSysUser
tabSysUser
=
userService
.
getUserById
(
userId
);
if
(
tabSysUser
==
null
)
{
...
...
@@ -86,7 +92,8 @@ public class MenuApiServiceImpl implements MenuApiService {
}
else
{
List
<
TabSysMenu
>
menuList
=
getUserMenuList
(
userId
);
result
=
EntityUtil
.
changeEntityListNew
(
MenuDTO
.
class
,
menuList
);
ServiceResponse
<
List
<
MenuDTO
>>
tempResult
=
getNoAuthOperationItem
(
userId
,
MenuProjectConstants
.
ALL_CODE
,
versionCode
);
ServiceResponse
<
List
<
MenuDTO
>>
tempResult
=
getNoAuthOperationItem
(
userId
,
MenuProjectConstants
.
ALL_CODE
,
versionCode
);
result
.
addAll
(
tempResult
.
getResult
());
}
...
...
@@ -685,7 +692,8 @@ public class MenuApiServiceImpl implements MenuApiService {
* @param serviceList
* @param menuDTO
*/
private
static
void
setMenuVersion
(
List
<
ServePropDTO
>
serviceList
,
List
<
ServeExpanDTO
>
serveExpandList
,
MenuDTO
menuDTO
)
{
private
static
void
setMenuVersion
(
List
<
ServePropDTO
>
serviceList
,
List
<
ServeExpanDTO
>
serveExpandList
,
MenuDTO
menuDTO
)
{
if
(
CollectionUtils
.
isEmpty
(
serviceList
))
{
return
;
}
...
...
@@ -964,7 +972,7 @@ public class MenuApiServiceImpl implements MenuApiService {
}
//仅超管可用
if
(
tabSysUser
.
getSuperAdmin
().
intValue
()
!=
1
)
{
List
<
TabSys
User
>
adminOnlyOperationItemList
=
menuService
.
listAdminOnlyOperationItem
();
List
<
TabSys
Menu
>
adminOnlyOperationItemList
=
menuService
.
listAdminOnlyOperationItem
();
if
(
CollectionUtils
.
isNotEmpty
(
adminOnlyOperationItemList
))
{
resultList
.
addAll
(
EntityUtil
.
changeEntityListNew
(
MenuDTO
.
class
,
adminOnlyOperationItemList
));
}
...
...
gic-platform-auth-service/src/main/resources/mapper/TabSysMenuMapper.xml
View file @
0fbfdbfb
...
...
@@ -306,6 +306,9 @@
<if
test=
"project != null"
>
and project = #{project}
</if>
<if
test=
"menuId != null"
>
and parent_id = #{menuId}
</if>
<if
test=
"versionCode != null and versionCode != '' "
>
and menu_version like concat('%_', #{versionCode}, '_%' )
</if>
...
...
@@ -376,6 +379,19 @@
</if>
</select>
<select
id=
"listByParentMenuIdList"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_sys_menu
where status=1
<if
test=
"null != parentMenuIdList and parentMenuIdList.size() > 0"
>
and parent_id in
<foreach
close=
")"
collection=
"parentMenuIdList"
index=
"index"
item=
"item"
open=
"("
separator=
","
>
#{item}
</foreach>
</if>
</select>
<select
id=
"selectByIdsAndOrderBy"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
...
...
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