Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
732545ba
Commit
732545ba
authored
Jun 08, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
83b80f04
a43dbc42
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
104 additions
and
22 deletions
+104
-22
ErrorCodes.java
....cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
+19
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+3
-0
SysRole.java
...com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysRole.java
+4
-1
SysUser.java
...com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysUser.java
+3
-0
UserVO.java
...java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/UserVO.java
+5
-0
DictController.java
...u.cloud.plus.v1/yifu/admin/controller/DictController.java
+2
-4
RoleController.java
...u.cloud.plus.v1/yifu/admin/controller/RoleController.java
+3
-2
SysDictItemService.java
....cloud.plus.v1/yifu/admin/service/SysDictItemService.java
+2
-2
SysRoleService.java
...yifu.cloud.plus.v1/yifu/admin/service/SysRoleService.java
+7
-0
SysDictItemServiceImpl.java
...us.v1/yifu/admin/service/impl/SysDictItemServiceImpl.java
+4
-4
SysRoleMenuServiceImpl.java
...us.v1/yifu/admin/service/impl/SysRoleMenuServiceImpl.java
+12
-0
SysRoleServiceImpl.java
...d.plus.v1/yifu/admin/service/impl/SysRoleServiceImpl.java
+17
-0
SysUserServiceImpl.java
...d.plus.v1/yifu/admin/service/impl/SysUserServiceImpl.java
+15
-9
SysRoleMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysRoleMapper.xml
+2
-0
SysUserMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+6
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
View file @
732545ba
...
...
@@ -98,4 +98,23 @@ public interface ErrorCodes {
*/
String
SYS_DICT_DELETE_EXISTING
=
"sys.dict.delete.existing"
;
/**
* 系统内置角色不允许删除
*/
String
SYS_ROLE_DELETE_SYSTEM
=
"sys.role.delete.system"
;
/**
* 系统内置角色不能修改
*/
String
SYS_ROLE_UPDATE_SYSTEM
=
"sys.role.update.system"
;
/**
* 系统内置用户不允许删除
*/
String
SYS_USER_DELETE_SYSTEM
=
"sys.user.delete.system"
;
/**
* 系统内置用户不允许修改
*/
String
SYS_USER_UPDATE_SYSTEM
=
"sys.user.update.system"
;
}
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
732545ba
...
...
@@ -24,3 +24,6 @@ sys.dict.delete.system=\u7CFB\u7EDF\u5185\u7F6E\u5B57\u5178\u9879\u76EE\u4E0D\u8
sys.dict.update.system
=
\u
7CFB
\u
7EDF
\u5185\u
7F6E
\u
5B57
\u5178\u9879\u
76EE
\u
4E0D
\u
80FD
\u
4FEE
\u6539
sys.dict.delete.existing
=
\u
5B57
\u5178\u
5B58
\u5728\u
4E0B
\u
7EA7
\u8282\u
70B9
\u
4E0D
\u
80FD
\u5931\u
8D25
sys.role.delete.system
=
\u
7CFB
\u
7EDF
\u5185\u
7F6E
\u
89D2
\u8272\u
4E0D
\u
80FD
\u5220\u9664
sys.role.update.system
=
\u
7CFB
\u
7EDF
\u5185\u
7F6E
\u
89D2
\u8272\u
4E0D
\u
80FD
\u
4FEE
\u6539
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysRole.java
View file @
732545ba
...
...
@@ -57,9 +57,12 @@ public class SysRole extends BaseEntity {
private
String
roleDesc
;
/**
*
删除标识(0-正常,1-删除)
*
是否是系统内置(0是,1否)
*/
@TableLogic
private
String
delFlag
;
@Schema
(
description
=
"是否是系统内置"
)
private
String
systemFlag
;
}
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysUser.java
View file @
732545ba
...
...
@@ -117,6 +117,9 @@ public class SysUser extends BaseEntity {
@Schema
(
description
=
"邮箱"
)
private
String
email
;
@Schema
(
description
=
"是否是系统内置"
)
private
String
systemFlag
;
/**
* 0-正常,1-删除
*/
...
...
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/UserVO.java
View file @
732545ba
...
...
@@ -122,4 +122,9 @@ public class UserVO implements Serializable {
* 邮箱
*/
private
String
email
;
/**
* 是否是系统内置
*/
private
String
systemFlag
;
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java
View file @
732545ba
...
...
@@ -167,8 +167,7 @@ public class DictController {
@SysLog
(
"修改字典项"
)
@PutMapping
(
"/item"
)
public
R
updateById
(
@RequestBody
SysDictItem
sysDictItem
)
{
sysDictItemService
.
updateDictItem
(
sysDictItem
);
return
R
.
ok
();
return
R
.
ok
(
sysDictItemService
.
updateDictItem
(
sysDictItem
));
}
/**
...
...
@@ -179,8 +178,7 @@ public class DictController {
@SysLog
(
"删除字典项"
)
@DeleteMapping
(
"/item/{id:\\d+}"
)
public
R
removeDictItemById
(
@PathVariable
Long
id
)
{
sysDictItemService
.
removeDictItem
(
id
);
return
R
.
ok
();
return
R
.
ok
(
sysDictItemService
.
removeDictItem
(
id
));
}
@SysLog
(
"清除字典缓存"
)
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/RoleController.java
View file @
732545ba
...
...
@@ -83,8 +83,9 @@ public class RoleController {
@SysLog
(
"修改角色"
)
@PutMapping
@PreAuthorize
(
"@pms.hasPermission('sys_role_edit')"
)
public
R
<
Boolean
>
update
(
@Valid
@RequestBody
SysRole
sysRole
)
{
return
R
.
ok
(
sysRoleService
.
updateById
(
sysRole
));
public
R
update
(
@Valid
@RequestBody
SysRole
sysRole
)
{
sysRoleService
.
updateRoleById
(
sysRole
);
return
R
.
ok
();
}
/**
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/SysDictItemService.java
View file @
732545ba
...
...
@@ -34,14 +34,14 @@ public interface SysDictItemService extends IService<SysDictItem> {
* @param id 字典项ID
* @return
*/
void
removeDictItem
(
Long
id
);
Boolean
removeDictItem
(
Long
id
);
/**
* 更新字典项
* @param item 字典项
* @return
*/
void
updateDictItem
(
SysDictItem
item
);
Boolean
updateDictItem
(
SysDictItem
item
);
/**
* 构建树
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/SysRoleService.java
View file @
732545ba
...
...
@@ -57,4 +57,11 @@ public interface SysRoleService extends IService<SysRole> {
List
<
RoleExcelVO
>
listRole
();
Page
<
SysRole
>
getSysRoleByPage
(
Page
page
,
SysRole
sysRole
);
/**
* 更新角色信息
* @param sysRole
* @return
*/
void
updateRoleById
(
SysRole
sysRole
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysDictItemServiceImpl.java
View file @
732545ba
...
...
@@ -62,7 +62,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
*/
@Override
@CacheEvict
(
value
=
CacheConstants
.
DICT_DETAILS
,
allEntries
=
true
)
public
void
removeDictItem
(
Long
id
)
{
public
Boolean
removeDictItem
(
Long
id
)
{
// 查询父节点为当前节点的节点
List
<
SysDictItem
>
dictList
=
this
.
list
(
Wrappers
.<
SysDictItem
>
query
().
lambda
().
eq
(
SysDictItem:
:
getParentId
,
id
));
Assert
.
isTrue
(
CollUtil
.
isEmpty
(
dictList
),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_MENU_DELETE_EXISTING
));
...
...
@@ -72,7 +72,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
// 系统内置
Assert
.
state
(!
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_DICT_DELETE_SYSTEM
));
this
.
removeById
(
id
);
return
this
.
removeById
(
id
);
}
/**
...
...
@@ -82,13 +82,13 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
*/
@Override
@CacheEvict
(
value
=
CacheConstants
.
DICT_DETAILS
,
key
=
"#item.type"
)
public
void
updateDictItem
(
SysDictItem
item
)
{
public
Boolean
updateDictItem
(
SysDictItem
item
)
{
// 查询字典
SysDict
dict
=
dictService
.
getById
(
item
.
getDictId
());
// 系统内置
Assert
.
state
(!
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_DICT_UPDATE_SYSTEM
));
this
.
updateById
(
item
);
return
this
.
updateById
(
item
);
}
/**
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysRoleMenuServiceImpl.java
View file @
732545ba
...
...
@@ -19,14 +19,19 @@ package com.yifu.cloud.plus.v1.yifu.admin.service.impl;
import
cn.hutool.core.util.StrUtil
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRoleMenu
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMenuMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysRoleMenuService
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysRoleService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -47,6 +52,8 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
private
final
CacheManager
cacheManager
;
private
final
SysRoleService
sysRoleService
;
/**
* @param roleId 角色
* @param menuIds 菜单ID拼成的字符串,每个id之间根据逗号分隔
...
...
@@ -55,6 +62,11 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
Boolean
saveRoleMenus
(
Long
roleId
,
String
menuIds
)
{
SysRole
sysRole
=
sysRoleService
.
getById
(
roleId
);
String
roleType
=
"0"
;
// 系统内置
Assert
.
state
(!
roleType
.
equals
(
sysRole
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_ROLE_UPDATE_SYSTEM
));
this
.
remove
(
Wrappers
.<
SysRoleMenu
>
query
().
lambda
().
eq
(
SysRoleMenu:
:
getRoleId
,
roleId
));
if
(
StrUtil
.
isBlank
(
menuIds
))
{
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysRoleServiceImpl.java
View file @
732545ba
...
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDict
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRoleMenu
;
...
...
@@ -31,13 +32,16 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMapper;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMenuMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysRoleService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.enums.DictTypeEnum
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.cache.annotation.CacheEvict
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
org.springframework.validation.BindingResult
;
import
java.util.HashSet
;
...
...
@@ -68,6 +72,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Transactional
(
rollbackFor
=
Exception
.
class
)
@CacheEvict
(
value
=
CacheConstants
.
MENU_DETAILS
,
allEntries
=
true
)
public
Boolean
removeRoleById
(
Long
id
)
{
SysRole
sysRole
=
this
.
getById
(
id
);
String
type
=
"0"
;
//系统内置
Assert
.
state
(!
type
.
equals
(
sysRole
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_ROLE_DELETE_SYSTEM
));
sysRoleMenuMapper
.
delete
(
Wrappers
.<
SysRoleMenu
>
update
().
lambda
().
eq
(
SysRoleMenu:
:
getRoleId
,
id
));
return
this
.
removeById
(
id
);
}
...
...
@@ -157,4 +165,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
this
.
save
(
sysRole
);
}
@Override
public
void
updateRoleById
(
SysRole
sysRole
)
{
String
type
=
"0"
;
// 系统内置
Assert
.
state
(!
type
.
equals
(
sysRole
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_ROLE_UPDATE_SYSTEM
));
this
.
updateById
(
sysRole
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
732545ba
...
...
@@ -96,15 +96,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
userRole
.
setRoleId
(
roleId
);
return
userRole
;
}).
forEach
(
sysUserRoleMapper:
:
insert
);
// 保存用户岗位信息
// Optional.ofNullable(userDto.getPost()).ifPresent(posts -> {
// posts.stream().map(postId -> {
// SysUserPost userPost = new SysUserPost();
// userPost.setUserId(sysUser.getUserId());
// userPost.setPostId(postId);
// return userPost;
// }).forEach(sysUserPostMapper::insert);
// });
return
Boolean
.
TRUE
;
}
...
...
@@ -171,6 +162,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if
(
null
==
user
){
return
Boolean
.
FALSE
;
}
String
type
=
"0"
;
// 系统内置
Assert
.
state
(!
type
.
equals
(
sysUser
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_DELETE_SYSTEM
));
sysUserRoleMapper
.
deleteByUserId
(
sysUser
.
getUserId
());
this
.
removeById
(
sysUser
.
getUserId
());
return
Boolean
.
TRUE
;
...
...
@@ -181,6 +176,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public
Boolean
updateUserInfo
(
UserDTO
userDto
)
{
UserVO
userVO
=
baseMapper
.
getUserVoByUsername
(
userDto
.
getUsername
());
String
type
=
"0"
;
// 系统内置
Assert
.
state
(!
type
.
equals
(
userDto
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_UPDATE_SYSTEM
));
Assert
.
isTrue
(
ENCODER
.
matches
(
userDto
.
getPassword
(),
userVO
.
getPassword
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_UPDATE_PASSWORDERROR
));
...
...
@@ -198,6 +198,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Transactional
(
rollbackFor
=
Exception
.
class
)
@CacheEvict
(
value
=
CacheConstants
.
USER_DETAILS
,
key
=
"#userDto.username"
)
public
Boolean
updateUser
(
UserDTO
userDto
)
{
String
userType
=
"0"
;
// 系统内置
Assert
.
state
(!
userType
.
equals
(
userDto
.
getSystemFlag
()),
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_UPDATE_SYSTEM
));
SysUser
sysUser
=
new
SysUser
();
BeanUtils
.
copyProperties
(
userDto
,
sysUser
);
sysUser
.
setUpdateTime
(
LocalDateTime
.
now
());
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysRoleMapper.xml
View file @
732545ba
...
...
@@ -23,6 +23,7 @@
<result
column=
"role_name"
property=
"roleName"
/>
<result
column=
"role_code"
property=
"roleCode"
/>
<result
column=
"role_desc"
property=
"roleDesc"
/>
<result
column=
"system_flag"
property=
"systemFlag"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"del_flag"
property=
"delFlag"
/>
...
...
@@ -38,6 +39,7 @@
r.role_name,
r.role_code,
r.role_desc,
r.system_flag,
r.del_flag,
r.create_time,
r.update_time,
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
View file @
732545ba
...
...
@@ -35,6 +35,7 @@
<result
column=
"user_group"
property=
"userGroup"
/>
<result
column=
"post"
property=
"post"
/>
<result
column=
"email"
property=
"email"
/>
<result
column=
"system_flag"
property=
"systemFlag"
/>
<collection
property=
"roleList"
ofType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole"
select=
"com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMapper.listRolesByUserId"
column=
"user_id"
>
</collection>
...
...
@@ -58,6 +59,7 @@
<result
column=
"user_group"
property=
"userGroup"
/>
<result
column=
"post"
property=
"post"
/>
<result
column=
"email"
property=
"email"
/>
<result
column=
"system_flag"
property=
"systemFlag"
/>
<collection
property=
"roleList"
ofType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole"
>
<id
column=
"role_id"
property=
"roleId"
/>
<result
column=
"role_name"
property=
"roleName"
/>
...
...
@@ -85,6 +87,7 @@
sys_user.user_group AS userGroup,
sys_user.post,
sys_user.email,
sys_user.system_flag AS systemFlag,
r.role_id,
r.role_name,
r.role_code,
...
...
@@ -108,6 +111,7 @@
sys_user.user_group AS userGroup,
sys_user.post,
sys_user.email,
sys_user.system_flag AS systemFlag,
r.role_id,
r.role_name,
r.role_code,
...
...
@@ -153,6 +157,7 @@
sys_user.user_group AS userGroup,
sys_user.post,
sys_user.email,
sys_user.system_flag AS systemFlag,
sys_dept.name AS deptName
FROM sys_user
LEFT JOIN sys_dept ON sys_dept.dept_id = sys_user.dept_id
...
...
@@ -182,6 +187,7 @@
u.group,
u.user_group userGroup,
u.email,
u.system_flag systemFlag,
d.name AS deptName
FROM sys_user u
LEFT JOIN sys_dept d ON d.dept_id = u.dept_id
...
...
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