Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Pig
提交
60a76b6c
P
Pig
项目概览
int
/
Pig
上一次同步 大约 1 年
通知
8
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Pig
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
60a76b6c
编写于
5月 14, 2020
作者:
superwei2012
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev' into dev
上级
1a0ee4ee
c0e7a623
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
39 addition
and
49 deletion
+39
-49
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java
...va/com/pig4cloud/pig/admin/controller/DictController.java
+4
-2
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java
...va/com/pig4cloud/pig/admin/controller/MenuController.java
+1
-1
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java
...va/com/pig4cloud/pig/admin/controller/UserController.java
+1
-1
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java
.../java/com/pig4cloud/pig/admin/service/SysDictService.java
+2
-3
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java
.../java/com/pig4cloud/pig/admin/service/SysMenuService.java
+2
-3
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java
.../java/com/pig4cloud/pig/admin/service/SysUserService.java
+1
-2
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java
...4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java
+3
-6
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java
.../pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java
+6
-12
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java
.../pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java
+10
-7
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java
.../pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java
+9
-12
未找到文件。
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java
浏览文件 @
60a76b6c
...
...
@@ -113,7 +113,8 @@ public class DictController {
@DeleteMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('sys_dict_del')"
)
public
R
removeById
(
@PathVariable
Integer
id
)
{
return
sysDictService
.
removeDict
(
id
);
sysDictService
.
removeDict
(
id
);
return
R
.
ok
();
}
/**
...
...
@@ -126,7 +127,8 @@ public class DictController {
@SysLog
(
"修改字典"
)
@PreAuthorize
(
"@pms.hasPermission('sys_dict_edit')"
)
public
R
updateById
(
@Valid
@RequestBody
SysDict
sysDict
)
{
return
sysDictService
.
updateDict
(
sysDict
);
sysDictService
.
updateDict
(
sysDict
);
return
R
.
ok
();
}
/**
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java
浏览文件 @
60a76b6c
...
...
@@ -122,7 +122,7 @@ public class MenuController {
@DeleteMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('sys_menu_del')"
)
public
R
removeById
(
@PathVariable
Integer
id
)
{
return
sysMenuService
.
removeMenuById
(
id
);
return
R
.
ok
(
sysMenuService
.
removeMenuById
(
id
)
);
}
/**
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java
浏览文件 @
60a76b6c
...
...
@@ -163,7 +163,7 @@ public class UserController {
@SysLog
(
"修改个人信息"
)
@PutMapping
(
"/edit"
)
public
R
updateUserInfo
(
@Valid
@RequestBody
UserDTO
userDto
)
{
return
userService
.
updateUserInfo
(
userDto
);
return
R
.
ok
(
userService
.
updateUserInfo
(
userDto
)
);
}
/**
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java
浏览文件 @
60a76b6c
...
...
@@ -19,7 +19,6 @@ package com.pig4cloud.pig.admin.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.pig4cloud.pig.admin.api.entity.SysDict
;
import
com.pig4cloud.pig.common.core.util.R
;
/**
* 字典表
...
...
@@ -35,7 +34,7 @@ public interface SysDictService extends IService<SysDict> {
* @param id
* @return
*/
R
removeDict
(
Integer
id
);
void
removeDict
(
Integer
id
);
/**
* 更新字典
...
...
@@ -43,5 +42,5 @@ public interface SysDictService extends IService<SysDict> {
* @param sysDict 字典
* @return
*/
R
updateDict
(
SysDict
sysDict
);
void
updateDict
(
SysDict
sysDict
);
}
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java
浏览文件 @
60a76b6c
...
...
@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.pig4cloud.pig.admin.api.dto.MenuTree
;
import
com.pig4cloud.pig.admin.api.entity.SysMenu
;
import
com.pig4cloud.pig.admin.api.vo.MenuVO
;
import
com.pig4cloud.pig.common.core.util.R
;
import
java.util.List
;
import
java.util.Set
;
...
...
@@ -49,9 +48,9 @@ public interface SysMenuService extends IService<SysMenu> {
* 级联删除菜单
*
* @param id 菜单ID
* @return
成功、
失败
* @return
true成功,false
失败
*/
R
removeMenuById
(
Integer
id
);
Boolean
removeMenuById
(
Integer
id
);
/**
* 更新菜单信息
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java
浏览文件 @
60a76b6c
...
...
@@ -25,7 +25,6 @@ import com.pig4cloud.pig.admin.api.dto.UserDTO;
import
com.pig4cloud.pig.admin.api.dto.UserInfo
;
import
com.pig4cloud.pig.admin.api.entity.SysUser
;
import
com.pig4cloud.pig.admin.api.vo.UserVO
;
import
com.pig4cloud.pig.common.core.util.R
;
import
java.util.List
;
...
...
@@ -65,7 +64,7 @@ public interface SysUserService extends IService<SysUser> {
* @param userDto 用户信息
* @return Boolean
*/
R
<
Boolean
>
updateUserInfo
(
UserDTO
userDto
);
Boolean
updateUserInfo
(
UserDTO
userDto
);
/**
* 更新指定用户信息
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java
浏览文件 @
60a76b6c
...
...
@@ -29,6 +29,7 @@ import com.pig4cloud.pig.common.core.util.R;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.cache.annotation.CacheEvict
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.Assert
;
/**
* 字典项
...
...
@@ -54,9 +55,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
SysDictItem
dictItem
=
this
.
getById
(
id
);
SysDict
dict
=
dictService
.
getById
(
dictItem
.
getDictId
());
// 系统内置
if
(
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystem
()))
{
return
R
.
failed
(
"系统内置字典项目不能删除"
);
}
Assert
.
state
(!
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystem
()),
"系统内置字典项目不能删除"
);
return
R
.
ok
(
this
.
removeById
(
id
));
}
...
...
@@ -72,9 +71,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
//查询字典
SysDict
dict
=
dictService
.
getById
(
item
.
getDictId
());
// 系统内置
if
(
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystem
()))
{
return
R
.
failed
(
"系统内置字典项目不能删除"
);
}
Assert
.
state
(!
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystem
()),
"系统内置字典项目不能修改"
);
return
R
.
ok
(
this
.
updateById
(
item
));
}
}
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java
浏览文件 @
60a76b6c
...
...
@@ -26,11 +26,11 @@ import com.pig4cloud.pig.admin.mapper.SysDictMapper;
import
com.pig4cloud.pig.admin.service.SysDictService
;
import
com.pig4cloud.pig.common.core.constant.CacheConstants
;
import
com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum
;
import
com.pig4cloud.pig.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
;
/**
* 字典表
...
...
@@ -52,17 +52,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override
@CacheEvict
(
value
=
CacheConstants
.
DICT_DETAILS
,
allEntries
=
true
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
R
removeDict
(
Integer
id
)
{
public
void
removeDict
(
Integer
id
)
{
SysDict
dict
=
this
.
getById
(
id
);
// 系统内置
if
(
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystem
()))
{
return
R
.
failed
(
"系统内置字典不能删除"
);
}
Assert
.
state
(!
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
dict
.
getSystem
()),
"系统内置字典项目不能删除"
);
baseMapper
.
deleteById
(
id
);
dictItemMapper
.
delete
(
Wrappers
.<
SysDictItem
>
lambdaQuery
()
.
eq
(
SysDictItem:
:
getDictId
,
id
));
return
R
.
ok
();
}
/**
...
...
@@ -72,12 +68,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
* @return
*/
@Override
public
R
updateDict
(
SysDict
dict
)
{
public
void
updateDict
(
SysDict
dict
)
{
SysDict
sysDict
=
this
.
getById
(
dict
.
getId
());
// 系统内置
if
(
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
sysDict
.
getSystem
()))
{
return
R
.
failed
(
"系统内置字典不能修改"
);
}
return
R
.
ok
(
this
.
updateById
(
dict
));
Assert
.
state
(!
DictTypeEnum
.
SYSTEM
.
getType
().
equals
(
sysDict
.
getSystem
()),
"系统内置字典项目不能修改"
);
this
.
updateById
(
dict
);
}
}
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java
浏览文件 @
60a76b6c
...
...
@@ -18,7 +18,6 @@
package
com.pig4cloud.pig.admin.service.impl
;
import
cn.hutool.core.collection.CollUtil
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.pig4cloud.pig.admin.api.dto.MenuTree
;
...
...
@@ -32,12 +31,12 @@ import com.pig4cloud.pig.admin.service.SysMenuService;
import
com.pig4cloud.pig.common.core.constant.CacheConstants
;
import
com.pig4cloud.pig.common.core.constant.CommonConstants
;
import
com.pig4cloud.pig.common.core.constant.enums.MenuTypeEnum
;
import
com.pig4cloud.pig.common.core.util.R
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.cache.annotation.CacheEvict
;
import
org.springframework.cache.annotation.Cacheable
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
java.util.Comparator
;
import
java.util.List
;
...
...
@@ -63,21 +62,25 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
return
baseMapper
.
listMenusByRoleId
(
roleId
);
}
/**
* 级联删除菜单
*
* @param id 菜单ID
* @return true成功,false失败
*/
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@CacheEvict
(
value
=
CacheConstants
.
MENU_DETAILS
,
allEntries
=
true
)
public
R
removeMenuById
(
Integer
id
)
{
public
Boolean
removeMenuById
(
Integer
id
)
{
// 查询父节点为当前节点的节点
List
<
SysMenu
>
menuList
=
this
.
list
(
Wrappers
.<
SysMenu
>
query
()
.
lambda
().
eq
(
SysMenu:
:
getParentId
,
id
));
if
(
CollUtil
.
isNotEmpty
(
menuList
))
{
return
R
.
failed
(
"菜单含有下级不能删除"
);
}
Assert
.
isNull
(
menuList
,
"菜单含有下级不能删除"
);
sysRoleMenuMapper
.
delete
(
Wrappers
.<
SysRoleMenu
>
query
()
.
lambda
().
eq
(
SysRoleMenu:
:
getMenuId
,
id
));
//删除当前菜单及其子菜单
return
R
.
ok
(
this
.
removeById
(
id
)
);
return
this
.
removeById
(
id
);
}
@Override
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java
浏览文件 @
60a76b6c
...
...
@@ -36,7 +36,6 @@ import com.pig4cloud.pig.admin.mapper.SysUserMapper;
import
com.pig4cloud.pig.admin.service.*
;
import
com.pig4cloud.pig.common.core.constant.CacheConstants
;
import
com.pig4cloud.pig.common.core.constant.CommonConstants
;
import
com.pig4cloud.pig.common.core.util.R
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
...
...
@@ -46,6 +45,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import
org.springframework.security.crypto.password.PasswordEncoder
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
java.time.LocalDateTime
;
import
java.util.HashSet
;
...
...
@@ -161,22 +161,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
@CacheEvict
(
value
=
CacheConstants
.
USER_DETAILS
,
key
=
"#userDto.username"
)
public
R
<
Boolean
>
updateUserInfo
(
UserDTO
userDto
)
{
public
Boolean
updateUserInfo
(
UserDTO
userDto
)
{
UserVO
userVO
=
baseMapper
.
getUserVoByUsername
(
userDto
.
getUsername
());
SysUser
sysUser
=
new
SysUser
();
if
(
StrUtil
.
isNotBlank
(
userDto
.
getPassword
())
&&
StrUtil
.
isNotBlank
(
userDto
.
getNewpassword1
()))
{
if
(
ENCODER
.
matches
(
userDto
.
getPassword
(),
userVO
.
getPassword
()))
{
Assert
.
notNull
(
userDto
.
getPassword
(),
"原密码不存在"
);
Assert
.
notNull
(
userDto
.
getNewpassword1
(),
"新密码不存在"
);
Assert
.
state
(
ENCODER
.
matches
(
userDto
.
getPassword
(),
userVO
.
getPassword
()),
"原密码错误,修改失败"
);
sysUser
.
setPassword
(
ENCODER
.
encode
(
userDto
.
getNewpassword1
()));
}
else
{
log
.
warn
(
"原密码错误,修改密码失败:{}"
,
userDto
.
getUsername
());
return
R
.
failed
(
"原密码错误,修改失败"
);
}
}
sysUser
.
setPhone
(
userDto
.
getPhone
());
sysUser
.
setUserId
(
userVO
.
getUserId
());
sysUser
.
setAvatar
(
userDto
.
getAvatar
());
return
R
.
ok
(
this
.
updateById
(
sysUser
)
);
return
this
.
updateById
(
sysUser
);
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录