Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
9959e259
Commit
9959e259
authored
Mar 26, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户管理
parent
fdcf0567
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
81 additions
and
49 deletions
+81
-49
TBoxOperationMapper.java
...wisenergy/chnmuseum/party/mapper/TBoxOperationMapper.java
+2
-1
TUserMapper.java
...java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java
+1
-2
TUser.java
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
+2
-2
TUserService.java
...va/cn/wisenergy/chnmuseum/party/service/TUserService.java
+1
-1
MenuServiceImpl.java
...senergy/chnmuseum/party/service/impl/MenuServiceImpl.java
+2
-4
TBoxOperationServiceImpl.java
...hnmuseum/party/service/impl/TBoxOperationServiceImpl.java
+1
-1
TUserServiceImpl.java
...energy/chnmuseum/party/service/impl/TUserServiceImpl.java
+8
-8
LoginController.java
...nergy/chnmuseum/party/web/controller/LoginController.java
+4
-2
TUserController.java
...nergy/chnmuseum/party/web/controller/TUserController.java
+31
-9
TUserMapper.xml
src/main/resources/mapper/TUserMapper.xml
+29
-19
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TBoxOperationMapper.java
View file @
9959e259
...
...
@@ -3,6 +3,7 @@ package cn.wisenergy.chnmuseum.party.mapper;
import
cn.wisenergy.chnmuseum.party.model.TUser
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.wisenergy.chnmuseum.party.model.TBoxOperation
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -19,5 +20,5 @@ public interface TBoxOperationMapper extends BaseMapper<TBoxOperation> {
List
<
TBoxOperation
>
getList
();
List
<
TBoxOperation
>
selectBoxPage
(
@Param
(
"user"
)
TUser
user
);
List
<
TBoxOperation
>
selectBoxPage
(
Page
<
TBoxOperation
>
page
,
@Param
(
"user"
)
TUser
user
);
}
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java
View file @
9959e259
...
...
@@ -19,9 +19,8 @@ public interface TUserMapper extends BaseMapper<TUser> {
TUser
selectByUsername
(
String
userName
);
List
<
TUser
>
getList
(
String
userName
);
List
<
TUser
>
getList
(
Page
<
TUser
>
page
,
@Param
(
"user"
)
TUser
user
);
TUser
getById
(
String
id
);
List
<
TUser
>
selectBoxPage
(
TUser
user
);
}
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @
9959e259
...
...
@@ -138,9 +138,9 @@ public class TUser implements Serializable {
@TableField
(
exist
=
false
)
private
String
orgCode
;
@ApiModelProperty
(
"角色集合"
)
@ApiModelProperty
(
"角色
id
集合"
)
@TableField
(
exist
=
false
)
private
List
<
Role
>
roleList
;
private
List
<
String
>
roleList
;
@ApiModelProperty
(
"密码"
)
@TableField
(
"password"
)
...
...
src/main/java/cn/wisenergy/chnmuseum/party/service/TUserService.java
View file @
9959e259
...
...
@@ -18,7 +18,7 @@ public interface TUserService extends IService<TUser> {
TUser
selectByUsername
(
String
userName
);
Page
<
TUser
>
getList
(
Page
<
TUser
>
page
,
String
userName
);
Page
<
TUser
>
getList
(
Page
<
TUser
>
page
,
TUser
user
);
TUser
selectById
(
String
id
);
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/MenuServiceImpl.java
View file @
9959e259
...
...
@@ -27,10 +27,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
@Resource
private
MenuMapper
menuMapper
;
public
List
<
Menu
>
getUserMenuPerms
(
List
<
Role
>
list
)
{
List
<
String
>
list1
=
new
ArrayList
<>();
list
.
stream
().
forEach
(
r
->
list1
.
add
(
r
.
getId
()));
List
<
Menu
>
menuList
=
menuMapper
.
getUserMenuPerms
(
list1
);
public
List
<
Menu
>
getUserMenuPerms
(
List
<
String
>
list
)
{
List
<
Menu
>
menuList
=
menuMapper
.
getUserMenuPerms
(
list
);
HashMap
<
String
,
Menu
>
map
=
new
HashMap
<>();
menuList
.
forEach
(
m
->
map
.
put
(
m
.
getId
(),
m
));
for
(
Menu
menu
:
menuList
)
{
...
...
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoxOperationServiceImpl.java
View file @
9959e259
...
...
@@ -36,6 +36,6 @@ public class TBoxOperationServiceImpl extends ServiceImpl<TBoxOperationMapper, T
@Override
public
Page
<
TBoxOperation
>
selectBoxPage
(
Page
<
TBoxOperation
>
page
,
TUser
user
)
{
return
page
.
setRecords
(
tBoxOperationMapper
.
selectBoxPage
(
user
));
return
page
.
setRecords
(
tBoxOperationMapper
.
selectBoxPage
(
page
,
user
));
}
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java
View file @
9959e259
...
...
@@ -40,17 +40,17 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
}
@Override
public
Page
<
TUser
>
getList
(
Page
<
TUser
>
page
,
String
userName
)
{
List
<
TUser
>
list
=
tUserMapper
.
getList
(
userName
);
for
(
TUser
u
ser
:
list
)
{
if
(
"2"
.
equals
(
u
ser
.
getAuditStatus
())||
"4"
.
equals
(
user
.
getAuditStatus
())){
if
(
"1"
.
equals
(
u
ser
.
getStatus
())){
u
ser
.
setStatusName
(
"活跃"
);
public
Page
<
TUser
>
getList
(
Page
<
TUser
>
page
,
TUser
user
)
{
List
<
TUser
>
list
=
tUserMapper
.
getList
(
page
,
user
);
for
(
TUser
u
:
list
)
{
if
(
"2"
.
equals
(
u
.
getAuditStatus
())||
"4"
.
equals
(
u
.
getAuditStatus
())){
if
(
"1"
.
equals
(
u
.
getStatus
())){
u
.
setStatusName
(
"活跃"
);
}
else
{
u
ser
.
setStatusName
(
"禁用"
);
u
.
setStatusName
(
"禁用"
);
}
}
else
{
u
ser
.
setStatusName
(
"待审核"
);
u
.
setStatusName
(
"待审核"
);
}
}
return
page
.
setRecords
(
list
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java
View file @
9959e259
...
...
@@ -164,11 +164,13 @@ public class LoginController {
throw
new
IncorrectCredentialsException
(
"用户名或密码不正确!"
);
}
List
<
Role
>
roles
=
roleService
.
selectRoleByUserId
(
user
.
getId
());
user
.
setRoleList
(
roles
);
List
<
String
>
list1
=
new
ArrayList
<>();
roles
.
stream
().
forEach
(
r
->
list1
.
add
(
r
.
getId
()));
user
.
setRoleList
(
list1
);
//获取当前用户角色拥有菜单
List
<
Menu
>
userMenuPerms
=
new
ArrayList
<>();
if
(
roles
.
size
()
>
0
)
{
userMenuPerms
=
this
.
menuService
.
getUserMenuPerms
(
roles
);
userMenuPerms
=
this
.
menuService
.
getUserMenuPerms
(
list1
);
}
//登录时插入系统日志
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @
9959e259
...
...
@@ -87,9 +87,29 @@ public class TUserController extends BaseController {
@RequestMapping
(
value
=
"/getPageList"
,
method
=
RequestMethod
.
GET
)
@RequiresPermissions
(
"/user/getPageList"
)
// @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
public
Map
<
String
,
Object
>
getUserList
(
String
userName
)
{
public
Map
<
String
,
Object
>
getPageList
(
String
userName
,
String
status
,
String
type
,
String
orgId
,
String
areaId
)
{
TUser
user
=
new
TUser
();
if
(
StringUtils
.
isNotBlank
(
userName
))
{
user
.
setUserName
(
userName
);
}
if
(
StringUtils
.
isNotBlank
(
type
))
{
user
.
setType
(
type
);
}
if
(
StringUtils
.
isNotBlank
(
orgId
))
{
user
.
setOrgId
(
orgId
);
}
if
(
StringUtils
.
isNotBlank
(
areaId
))
{
user
.
setAreaId
(
areaId
);
}
if
(
StringUtils
.
isNotBlank
(
status
))
{
if
(
"1"
.
equals
(
status
)||
"2"
.
equals
(
status
))
{
user
.
setStatus
(
status
);
}
else
{
user
.
setAuditStatus
(
status
);
}
}
try
{
Page
<
TUser
>
list
=
userService
.
getList
(
getPage
(),
user
Name
);
Page
<
TUser
>
list
=
userService
.
getList
(
getPage
(),
user
);
return
getResult
(
list
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"查询成员列表出错!"
,
e
);
...
...
@@ -137,7 +157,9 @@ public class TUserController extends BaseController {
public
Map
<
String
,
Object
>
getById
(
String
id
)
{
TUser
tUser
=
userService
.
selectById
(
id
);
List
<
Role
>
list
=
roleService
.
selectRoleByUserId
(
id
);
tUser
.
setRoleList
(
list
);
List
<
String
>
list1
=
new
ArrayList
<>();
list
.
stream
().
forEach
(
r
->
list1
.
add
(
r
.
getId
()));
tUser
.
setRoleList
(
list1
);
return
getResult
(
tUser
);
}
...
...
@@ -200,12 +222,12 @@ public class TUserController extends BaseController {
boolean
ret
=
this
.
userService
.
save
(
user
);
List
<
Role
>
list
=
user
.
getRoleList
();
List
<
String
>
list
=
user
.
getRoleList
();
List
<
TUserRole
>
list1
=
new
ArrayList
<>();
for
(
Role
role
:
list
)
{
for
(
String
s
:
list
)
{
TUserRole
entity
=
new
TUserRole
();
entity
.
setUserId
(
user
.
getId
());
entity
.
setRoleId
(
role
.
getId
()
);
entity
.
setRoleId
(
s
);
entity
.
setIsDeleted
(
false
);
list1
.
add
(
entity
);
}
...
...
@@ -259,13 +281,13 @@ public class TUserController extends BaseController {
boolean
remove
=
tUserRoleService
.
remove
(
userRoleWrapper
);
List
<
Role
>
list
=
user
.
getRoleList
();
List
<
String
>
list
=
user
.
getRoleList
();
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
ArrayList
<
TUserRole
>
list1
=
new
ArrayList
<>();
for
(
Role
r
:
list
)
{
for
(
String
r
:
list
)
{
TUserRole
userRole
=
new
TUserRole
();
userRole
.
setUserId
(
user
.
getId
());
userRole
.
setRoleId
(
r
.
getId
()
);
userRole
.
setRoleId
(
r
);
userRole
.
setIsDeleted
(
false
);
list1
.
add
(
userRole
);
}
...
...
src/main/resources/mapper/TUserMapper.xml
View file @
9959e259
...
...
@@ -28,23 +28,16 @@
<result
column=
"org_name"
property=
"orgName"
/>
<result
column=
"area_name"
property=
"areaName"
/>
<result
column=
"org_code"
property=
"orgCode"
/>
<collection
fetchType=
"eager"
property=
"roleList"
ofType=
"cn.wisenergy.chnmuseum.party.model.Role"
select=
"selectRoles"
column=
"user_name"
/>
<collection
fetchType=
"eager"
property=
"roleList"
ofType=
"java.lang.String"
select=
"selectRoles"
column=
"user_name"
>
<result
column=
"rid"
/>
</collection>
</resultMap>
<resultMap
id=
"roleMap"
type=
"cn.wisenergy.chnmuseum.party.model.Role"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"name"
property=
"name"
/>
<result
column=
"alias"
property=
"alias"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"is_allow_login"
property=
"allowLogin"
/>
<result
column=
"instruction"
property=
"instruction"
/>
<result
column=
"is_deleted"
property=
"isDeleted"
/>
<result
column=
"sortorder"
property=
"sortorder"
/>
</resultMap>
<!-- <resultMap id="roleMap" type="java.lang.String">-->
<!-- <result column="id"/>-->
<!-- </resultMap>-->
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
...
...
@@ -72,21 +65,38 @@
from t_user u
left join t_organ o on o.id = u.org_id
left join t_area a on u.area_id = a.id
<if
test=
" userName != null and userName != '' "
>
where u.user_name LIKE concat('%', #{userName}, '%')
where 1 = 1
<if
test=
" user.userName != null and user.userName != '' "
>
and u.user_name LIKE concat('%', #{user.userName}, '%')
</if>
<if
test=
" user.status != null and user.status != '' "
>
and u.status = #{user.status}
</if>
<if
test=
" user.auditStatus != null and user.auditStatus != '' "
>
and (u.audit_status = "1" or u.audit_status = "3")
</if>
<if
test=
" user.type != null and user.type != '' "
>
and u.type = #{user.type}
</if>
<if
test=
" user.orgId != null and user.orgId != '' "
>
and u.org_id = #{user.orgId}
</if>
<if
test=
" user.areaId != null and user.areaId != '' "
>
and u.area_id = #{user.areaId}
</if>
and u.is_deleted = false
order by u.create_time desc
</select>
<select
id=
"selectRoles"
result
Map=
"roleMap
"
>
select r.
*
<select
id=
"selectRoles"
result
Type=
"java.lang.String
"
>
select r.
id rid
from t_user u
left join t_organ o on o.id = u.org_id
left join t_user_role_link l on l.user_id = u.id
left join t_role r on l.role_id = r.id
where 1=1
<if
test=
" userName != null and userName != '' "
>
where
u.user_name =#{userName}
and
u.user_name =#{userName}
</if>
</select>
...
...
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