Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
有来技术
youlai-mall
提交
dddd23a3
Y
youlai-mall
项目概览
有来技术
/
youlai-mall
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
youlai-mall
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
dddd23a3
编写于
7月 03, 2022
作者:
郝
郝先瑞
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 时间字段名变更实体类同步更新gmt_create→create_time,gmt_modified→update_time
上级
c6d1dad2
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
58 addition
and
57 deletion
+58
-57
youlai-admin/admin-boot/src/main/java/com/youlai/admin/cache/InitPermissionRolesCache.java
...java/com/youlai/admin/cache/InitPermissionRolesCache.java
+2
-0
youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/ClientConverter.java
...main/java/com/youlai/admin/converter/ClientConverter.java
+3
-3
youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictItemConverter.java
...in/java/com/youlai/admin/converter/DictItemConverter.java
+2
-2
youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictTypeConverter.java
...in/java/com/youlai/admin/converter/DictTypeConverter.java
+2
-4
youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/RoleConverter.java
...c/main/java/com/youlai/admin/converter/RoleConverter.java
+4
-4
youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/UserConverter.java
...c/main/java/com/youlai/admin/converter/UserConverter.java
+3
-3
youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/excel/UserImportListener.java
...a/com/youlai/admin/listener/excel/UserImportListener.java
+2
-1
youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java
...n-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java
+1
-1
youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java
...main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java
+1
-1
youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java
...t/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java
+1
-1
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictItemServiceImpl.java
...com/youlai/admin/service/impl/SysDictItemServiceImpl.java
+6
-6
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java
...youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java
+6
-6
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysOauthClientServiceImpl.java
.../youlai/admin/service/impl/SysOauthClientServiceImpl.java
+3
-3
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRoleServiceImpl.java
...ava/com/youlai/admin/service/impl/SysRoleServiceImpl.java
+5
-5
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java
...ava/com/youlai/admin/service/impl/SysUserServiceImpl.java
+7
-7
youlai-admin/admin-boot/src/main/resources/mapper/SysDictItemMapper.xml
...dmin-boot/src/main/resources/mapper/SysDictItemMapper.xml
+4
-4
youlai-admin/admin-boot/src/main/resources/mapper/SysMenuMapper.xml
...in/admin-boot/src/main/resources/mapper/SysMenuMapper.xml
+2
-2
youlai-admin/admin-boot/src/main/resources/mapper/SysPermissionMapper.xml
...in-boot/src/main/resources/mapper/SysPermissionMapper.xml
+2
-2
youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml
...in/admin-boot/src/main/resources/mapper/SysUserMapper.xml
+2
-2
未找到文件。
youlai-admin/admin-boot/src/main/java/com/youlai/admin/cache/InitPermissionRolesCache.java
浏览文件 @
dddd23a3
...
...
@@ -7,7 +7,9 @@ import org.springframework.stereotype.Component;
/**
* 容器启动完成时加载角色权限规则至Redis缓存
*
* @author haoxr
* @date 2021/5/1
*/
@Component
@AllArgsConstructor
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
/ClientConvert
.java
→
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
er/ClientConverter
.java
浏览文件 @
dddd23a3
package
com.youlai.admin.convert
;
package
com.youlai.admin.convert
er
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.youlai.admin.pojo.entity.SysOauthClient
;
...
...
@@ -6,13 +6,13 @@ import com.youlai.admin.pojo.vo.client.ClientPageVO;
import
org.mapstruct.Mapper
;
/**
* 客户端
实体
转换器
* 客户端
对象
转换器
*
* @author haoxr
* @date 2022/6/11
*/
@Mapper
(
componentModel
=
"spring"
)
public
interface
ClientConvert
{
public
interface
ClientConvert
er
{
ClientPageVO
entity2PageVO
(
SysOauthClient
entity
);
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
/DictItemConvert
.java
→
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
er/DictItemConverter
.java
浏览文件 @
dddd23a3
package
com.youlai.admin.convert
;
package
com.youlai.admin.convert
er
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.youlai.admin.pojo.entity.SysDictItem
;
...
...
@@ -14,7 +14,7 @@ import org.mapstruct.Mapper;
* @date 2022/6/8
*/
@Mapper
(
componentModel
=
"spring"
)
public
interface
DictItemConvert
{
public
interface
DictItemConvert
er
{
Page
<
DictItemPageVO
>
entity2Page
(
Page
<
SysDictItem
>
page
);
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
/DictTypeConvert
.java
→
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
er/DictTypeConverter
.java
浏览文件 @
dddd23a3
package
com.youlai.admin.convert
;
package
com.youlai.admin.convert
er
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.youlai.admin.pojo.entity.SysDictType
;
import
com.youlai.admin.pojo.form.DictTypeForm
;
import
com.youlai.admin.pojo.vo.dict.DictTypePageVO
;
import
org.mapstruct.InheritInverseConfiguration
;
import
org.mapstruct.Mapper
;
/**
...
...
@@ -14,12 +13,11 @@ import org.mapstruct.Mapper;
* @date 2022/6/8
*/
@Mapper
(
componentModel
=
"spring"
)
public
interface
DictTypeConvert
{
public
interface
DictTypeConvert
er
{
Page
<
DictTypePageVO
>
entity2Page
(
Page
<
SysDictType
>
page
);
DictTypeForm
entity2Form
(
SysDictType
entity
);
@InheritInverseConfiguration
(
name
=
"entity2Form"
)
SysDictType
form2Entity
(
DictTypeForm
entity
);
}
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
/RoleConvert
.java
→
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
er/RoleConverter
.java
浏览文件 @
dddd23a3
package
com.youlai.admin.convert
;
package
com.youlai.admin.convert
er
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.youlai.admin.pojo.entity.SysRole
;
...
...
@@ -12,13 +12,13 @@ import org.mapstruct.Mappings;
import
java.util.List
;
/**
* 角色
实体
转换器
* 角色
对象
转换器
*
* @author haoxr
* @date 2022/5/29
*/
@Mapper
(
componentModel
=
"spring"
)
public
interface
RoleConvert
{
public
interface
RoleConvert
er
{
Page
<
RolePageVO
>
entity2Page
(
Page
<
SysRole
>
page
);
...
...
@@ -29,7 +29,7 @@ public interface RoleConvert {
Option
role2Option
(
SysRole
role
);
List
<
Option
>
roles2Options
(
List
<
SysRole
>
role
List
);
List
<
Option
>
roles2Options
(
List
<
SysRole
>
role
s
);
SysRole
form2Entity
(
RoleForm
roleForm
);
}
\ No newline at end of file
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
/UserConvert
.java
→
youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert
er/UserConverter
.java
浏览文件 @
dddd23a3
package
com.youlai.admin.convert
;
package
com.youlai.admin.convert
er
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.youlai.admin.pojo.entity.SysUser
;
...
...
@@ -13,13 +13,13 @@ import org.mapstruct.Mapping;
import
org.mapstruct.Mappings
;
/**
* 用户
实体
转换器
* 用户
对象
转换器
*
* @author haoxr
* @date 2022/6/8
*/
@Mapper
(
componentModel
=
"spring"
)
public
interface
UserConvert
{
public
interface
UserConvert
er
{
@Mappings
({
@Mapping
(
target
=
"genderLabel"
,
expression
=
"java(com.youlai.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.common.enums.GenderEnum.class))"
)
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/excel/UserImportListener.java
浏览文件 @
dddd23a3
...
...
@@ -7,6 +7,8 @@ import org.springframework.context.annotation.Scope;
import
org.springframework.stereotype.Component
;
/**
*
*
*
* @author haoxr
* @date 2022/4/10 20:49
...
...
@@ -15,7 +17,6 @@ import org.springframework.stereotype.Component;
@Scope
(
"prototype"
)
public
class
UserImportListener
extends
AnalysisEventListener
<
UserImportDTO
.
UserItem
>
{
@Override
public
void
invoke
(
UserImportDTO
.
UserItem
userItem
,
AnalysisContext
analysisContext
)
{
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java
浏览文件 @
dddd23a3
...
...
@@ -68,5 +68,5 @@ public class UserPO {
* 创建时间
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
gmtCreat
e
;
private
Date
createTim
e
;
}
youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java
浏览文件 @
dddd23a3
...
...
@@ -39,7 +39,7 @@ public class UserExportVO {
@ExcelProperty
(
value
=
"创建时间"
)
@DateTimeFormat
(
"yyyy/MM/dd HH:mm:ss"
)
private
LocalDateTime
gmtCreat
e
;
private
LocalDateTime
createTim
e
;
}
youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java
浏览文件 @
dddd23a3
...
...
@@ -49,6 +49,6 @@ public class UserVO {
@ApiModelProperty
(
"创建时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
gmtCreat
e
;
private
Date
createTim
e
;
}
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictItemServiceImpl.java
浏览文件 @
dddd23a3
...
...
@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.youlai.admin.convert
.DictItemConvert
;
import
com.youlai.admin.convert
er.DictItemConverter
;
import
com.youlai.admin.mapper.SysDictItemMapper
;
import
com.youlai.admin.pojo.entity.SysDictItem
;
import
com.youlai.admin.pojo.form.DictItemForm
;
...
...
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public
class
SysDictItemServiceImpl
extends
ServiceImpl
<
SysDictItemMapper
,
SysDictItem
>
implements
SysDictItemService
{
private
final
DictItemConvert
dictItemConvert
;
private
final
DictItemConvert
er
dictItemConverter
;
/**
* 字典数据项分页列表
...
...
@@ -56,7 +56,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
);
// 实体转换
Page
<
DictItemPageVO
>
pageResult
=
dictItemConvert
.
entity2Page
(
dictItemPage
);
Page
<
DictItemPageVO
>
pageResult
=
dictItemConvert
er
.
entity2Page
(
dictItemPage
);
return
pageResult
;
}
...
...
@@ -83,7 +83,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
Assert
.
isTrue
(
entity
!=
null
,
"字典数据项不存在"
);
// 实体转换
DictItemForm
dictItemForm
=
dictItemConvert
.
entity2Form
(
entity
);
DictItemForm
dictItemForm
=
dictItemConvert
er
.
entity2Form
(
entity
);
return
dictItemForm
;
}
...
...
@@ -96,7 +96,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
@Override
public
boolean
saveDictItem
(
DictItemForm
dictItemForm
)
{
// 实体对象转换 form->entity
SysDictItem
entity
=
dictItemConvert
.
form2Entity
(
dictItemForm
);
SysDictItem
entity
=
dictItemConvert
er
.
form2Entity
(
dictItemForm
);
// 持久化
boolean
result
=
this
.
save
(
entity
);
return
result
;
...
...
@@ -111,7 +111,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
*/
@Override
public
boolean
updateDictItem
(
Long
id
,
DictItemForm
dictItemForm
)
{
SysDictItem
entity
=
dictItemConvert
.
form2Entity
(
dictItemForm
);
SysDictItem
entity
=
dictItemConvert
er
.
form2Entity
(
dictItemForm
);
boolean
result
=
this
.
updateById
(
entity
);
return
result
;
}
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java
浏览文件 @
dddd23a3
...
...
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.youlai.admin.convert
.DictTypeConvert
;
import
com.youlai.admin.convert
er.DictTypeConverter
;
import
com.youlai.admin.mapper.SysDictTypeMapper
;
import
com.youlai.admin.pojo.entity.SysDictItem
;
import
com.youlai.admin.pojo.entity.SysDictType
;
...
...
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
public
class
SysDictTypeTypeServiceImpl
extends
ServiceImpl
<
SysDictTypeMapper
,
SysDictType
>
implements
SysDictTypeService
{
private
final
SysDictItemService
dictItemService
;
private
final
DictTypeConvert
dictTypeConvert
;
private
final
DictTypeConvert
er
dictTypeConverter
;
/**
* 字典分页列表
...
...
@@ -61,7 +61,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
);
// 实体转换
Page
<
DictTypePageVO
>
pageResult
=
dictTypeConvert
.
entity2Page
(
dictTypePage
);
Page
<
DictTypePageVO
>
pageResult
=
dictTypeConvert
er
.
entity2Page
(
dictTypePage
);
return
pageResult
;
}
...
...
@@ -86,7 +86,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
Assert
.
isTrue
(
entity
!=
null
,
"字典类型不存在"
);
// 实体转换
DictTypeForm
dictTypeForm
=
dictTypeConvert
.
entity2Form
(
entity
);
DictTypeForm
dictTypeForm
=
dictTypeConvert
er
.
entity2Form
(
entity
);
return
dictTypeForm
;
}
...
...
@@ -99,7 +99,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
@Override
public
boolean
saveDictType
(
DictTypeForm
dictTypeForm
)
{
// 实体对象转换 form->entity
SysDictType
entity
=
dictTypeConvert
.
form2Entity
(
dictTypeForm
);
SysDictType
entity
=
dictTypeConvert
er
.
form2Entity
(
dictTypeForm
);
// 持久化
boolean
result
=
this
.
save
(
entity
);
return
result
;
...
...
@@ -119,7 +119,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
SysDictType
sysDictType
=
this
.
getById
(
id
);
Assert
.
isTrue
(
sysDictType
!=
null
,
"字典类型不存在"
);
SysDictType
entity
=
dictTypeConvert
.
form2Entity
(
dictTypeForm
);
SysDictType
entity
=
dictTypeConvert
er
.
form2Entity
(
dictTypeForm
);
boolean
result
=
this
.
updateById
(
entity
);
if
(
result
)
{
// 字典类型code变化,同步修改字典项的类型code
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysOauthClientServiceImpl.java
浏览文件 @
dddd23a3
...
...
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.youlai.admin.convert
.ClientConvert
;
import
com.youlai.admin.convert
er.ClientConverter
;
import
com.youlai.admin.mapper.SysOauthClientMapper
;
import
com.youlai.admin.pojo.entity.SysOauthClient
;
import
com.youlai.admin.pojo.query.ClientPageQuery
;
...
...
@@ -29,7 +29,7 @@ import java.util.Set;
public
class
SysOauthClientServiceImpl
extends
ServiceImpl
<
SysOauthClientMapper
,
SysOauthClient
>
implements
SysOauthClientService
{
private
final
StringRedisTemplate
stringRedisTemplate
;
private
final
ClientConvert
clientConvert
;
private
final
ClientConvert
er
clientConverter
;
/**
* 客户端分页列表
...
...
@@ -54,7 +54,7 @@ public class SysOauthClientServiceImpl extends ServiceImpl<SysOauthClientMapper,
);
// 实体转换
Page
<
ClientPageVO
>
voPage
=
clientConvert
.
entity2PageVO
(
entityPage
);
Page
<
ClientPageVO
>
voPage
=
clientConvert
er
.
entity2PageVO
(
entityPage
);
return
voPage
;
}
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRoleServiceImpl.java
浏览文件 @
dddd23a3
...
...
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.youlai.admin.convert
.RoleConvert
;
import
com.youlai.admin.convert
er.RoleConverter
;
import
com.youlai.admin.mapper.SysRoleMapper
;
import
com.youlai.admin.pojo.entity.SysRole
;
import
com.youlai.admin.pojo.entity.SysRoleMenu
;
...
...
@@ -47,7 +47,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
private
final
SysUserRoleService
sysUserRoleService
;
private
final
SysRolePermissionService
sysRolePermissionService
;
private
final
SysPermissionService
sysPermissionService
;
private
final
RoleConvert
roleConvert
;
private
final
RoleConvert
er
roleConverter
;
/**
* 角色分页列表
...
...
@@ -74,7 +74,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
);
// 实体转换
Page
<
RolePageVO
>
pageResult
=
roleConvert
.
entity2Page
(
rolePage
);
Page
<
RolePageVO
>
pageResult
=
roleConvert
er
.
entity2Page
(
rolePage
);
return
pageResult
;
}
...
...
@@ -93,7 +93,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
);
// 实体转换
List
<
Option
>
list
=
roleConvert
.
roles2Options
(
roleList
);
List
<
Option
>
list
=
roleConvert
er
.
roles2Options
(
roleList
);
return
list
;
}
...
...
@@ -115,7 +115,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
Assert
.
isTrue
(
count
==
0
,
"角色名称或角色编码重复,请检查!"
);
// 实体转换
SysRole
role
=
roleConvert
.
form2Entity
(
roleForm
);
SysRole
role
=
roleConvert
er
.
form2Entity
(
roleForm
);
boolean
result
=
this
.
saveOrUpdate
(
role
);
// 刷新权限缓存
...
...
youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java
浏览文件 @
dddd23a3
...
...
@@ -17,7 +17,7 @@ import com.youlai.admin.pojo.vo.user.UserVO;
import
com.youlai.common.constant.SystemConstants
;
import
com.youlai.common.enums.GenderEnum
;
import
com.youlai.admin.listener.excel.UserImportListener
;
import
com.youlai.admin.convert
.UserConvert
;
import
com.youlai.admin.convert
er.UserConverter
;
import
com.youlai.admin.dto.UserAuthDTO
;
import
com.youlai.admin.mapper.SysUserMapper
;
import
com.youlai.admin.pojo.dto.UserImportDTO
;
...
...
@@ -61,7 +61,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private
final
SysUserRoleService
userRoleService
;
private
final
UserImportListener
userImportListener
;
private
final
SysPermissionService
permissionService
;
private
final
UserConvert
userConvert
;
private
final
UserConvert
er
userConverter
;
/**
* 获取用户分页列表
...
...
@@ -81,7 +81,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
Page
<
UserPO
>
userPoPage
=
this
.
baseMapper
.
listUserPages
(
page
,
queryParams
);
// 实体转换
Page
<
UserVO
>
userVoPage
=
userConvert
.
po2Vo
(
userPoPage
);
Page
<
UserVO
>
userVoPage
=
userConvert
er
.
po2Vo
(
userPoPage
);
return
userVoPage
;
}
...
...
@@ -96,7 +96,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public
UserForm
getUserFormData
(
Long
userId
)
{
UserFormPO
userFormPO
=
this
.
baseMapper
.
getUserFormData
(
userId
);
// 实体转换po->form
UserForm
userForm
=
userConvert
.
po2Form
(
userFormPO
);
UserForm
userForm
=
userConvert
er
.
po2Form
(
userFormPO
);
return
userForm
;
}
...
...
@@ -110,7 +110,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public
boolean
saveUser
(
UserForm
userForm
)
{
// 实体转换 form->entity
SysUser
entity
=
userConvert
.
form2Entity
(
userForm
);
SysUser
entity
=
userConvert
er
.
form2Entity
(
userForm
);
// 设置默认加密密码
String
defaultEncryptPwd
=
passwordEncoder
.
encode
(
SystemConstants
.
DEFAULT_USER_PASSWORD
);
...
...
@@ -172,7 +172,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// form -> entity
SysUser
entity
=
userConvert
.
form2Entity
(
userForm
);
SysUser
entity
=
userConvert
er
.
form2Entity
(
userForm
);
// 修改用户
boolean
result
=
this
.
updateById
(
entity
);
...
...
@@ -345,7 +345,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
)
);
// entity->VO
LoginUserVO
loginUserVO
=
userConvert
.
entity2LoginUser
(
user
);
LoginUserVO
loginUserVO
=
userConvert
er
.
entity2LoginUser
(
user
);
// 用户角色集合
List
<
String
>
roles
=
UserUtils
.
getRoles
();
...
...
youlai-admin/admin-boot/src/main/resources/mapper/SysDictItemMapper.xml
浏览文件 @
dddd23a3
...
...
@@ -13,15 +13,15 @@
<result
property=
"status"
column=
"status"
jdbcType=
"BOOLEAN"
/>
<result
property=
"defaulted"
column=
"defaulted"
jdbcType=
"BOOLEAN"
/>
<result
property=
"remark"
column=
"remark"
jdbcType=
"VARCHAR"
/>
<result
property=
"
gmtCreate"
column=
"gmt_creat
e"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
gmtModified"
column=
"gmt_modified
"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
createTime"
column=
"create_tim
e"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
updateTime"
column=
"update_time
"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
id,name,value,
dict_code,sort,status,
defaulted,remark,
gmt_creat
e,
gmt_modified
defaulted,remark,
create_tim
e,
update_time
</sql>
...
...
youlai-admin/admin-boot/src/main/resources/mapper/SysMenuMapper.xml
浏览文件 @
dddd23a3
...
...
@@ -14,8 +14,8 @@
<result
property=
"icon"
column=
"icon"
jdbcType=
"VARCHAR"
/>
<result
property=
"sort"
column=
"sort"
jdbcType=
"INTEGER"
/>
<result
property=
"visible"
column=
"visible"
jdbcType=
"BOOLEAN"
/>
<result
property=
"
gmtCreate"
column=
"gmt_creat
e"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
gmtModified"
column=
"gmt_modified
"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
createTime"
column=
"create_tim
e"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
updateTime"
column=
"update_time
"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"type"
column=
"type"
jdbcType=
"OTHER"
/>
<collection
property=
"roles"
ofType=
"string"
javaType=
"list"
>
<result
column=
"code"
/>
...
...
youlai-admin/admin-boot/src/main/resources/mapper/SysPermissionMapper.xml
浏览文件 @
dddd23a3
...
...
@@ -10,8 +10,8 @@
<result
property=
"menuId"
column=
"menu_id"
jdbcType=
"BIGINT"
/>
<result
property=
"urlPerm"
column=
"url_perm"
jdbcType=
"VARCHAR"
/>
<result
property=
"btnPerm"
column=
"btn_perm"
jdbcType=
"VARCHAR"
/>
<result
property=
"
gmtCreate"
column=
"gmt_creat
e"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
gmtModified"
column=
"gmt_modified
"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
createTime"
column=
"create_tim
e"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"
updateTime"
column=
"update_time
"
jdbcType=
"TIMESTAMP"
/>
<collection
property=
"roles"
ofType=
"String"
javaType=
"list"
>
<result
column=
"code"
/>
</collection>
...
...
youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml
浏览文件 @
dddd23a3
...
...
@@ -16,7 +16,7 @@
u.STATUS,
d.NAME AS dept_name,
GROUP_CONCAT( r.NAME ) AS roleNames,
u.
gmt_creat
e
u.
create_tim
e
FROM
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.id
...
...
@@ -116,7 +116,7 @@
ELSE '未知'
END gender,
d.NAME AS dept_name,
u.
gmt_creat
e
u.
create_tim
e
FROM
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.id
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录