From a3a7c7107f5fcf9e08494e0f86ce72d19b2f32b8 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Tue, 14 Apr 2020 21:33:42 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E7=94=A8=E6=88=B7=E4=B8=8E=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=20:art:=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat/admin/constants/SysUserConst.java | 19 +++++++++++++++++++ .../admin/modules/sys/model/qo/SysRoleQO.java | 6 ++++++ .../admin/modules/sys/model/qo/SysUserQO.java | 6 ++++++ .../sys/service/impl/SysRoleServiceImpl.java | 10 ++++++---- .../sys/service/impl/SysUserServiceImpl.java | 4 +++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java index 3c876b07..37596e48 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java @@ -27,4 +27,23 @@ public final class SysUserConst { private Integer value; } + /** + * 用户类型，1系统用户，2平台用户 + */ + @Getter + @AllArgsConstructor + public enum Type { + + /** + * 系统用户 + */ + SYSTEM(1), + /** + * 平台用户 + */ + CUSTOMER(2); + + private Integer value; + } + } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java index e2c25fd2..1d30c927 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java @@ -20,4 +20,10 @@ public class SysRoleQO { @ApiModelProperty(value = "角色标识") private String code; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java index 25234f83..d1b51701 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java @@ -44,4 +44,10 @@ public class SysUserQO { @ApiModelProperty(value="状态(1-正常,2-冻结)") private Integer status; + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java index 18ae43d5..68e2c4ec 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java @@ -40,10 +40,12 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override public IPage page(IPage page, SysRoleQO qo) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(qo.getName()), SysRole::getName, qo.getName()) - .eq(StrUtil.isNotBlank(qo.getCode()), SysRole::getCode, qo.getCode()); - return baseMapper.selectPage(page, wrapper); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(qo.getName()), SysRole::getName, qo.getName()) + .eq(StrUtil.isNotBlank(qo.getCode()), SysRole::getCode, qo.getCode()) + .between(StrUtil.isNotBlank(qo.getStartTime()) && StrUtil.isNotBlank(qo.getEndTime()), + SysRole::getCreateTime, qo.getStartTime(), qo.getEndTime()); + return baseMapper.selectPage(page, wrapper); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java index 6526db2c..11138f29 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.hccake.ballcat.admin.constants.SysUserConst; import com.hccake.ballcat.admin.modules.sys.mapper.SysUserMapper; import com.hccake.ballcat.admin.modules.sys.model.converter.SysUserConverter; import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO; @@ -132,7 +133,8 @@ public class SysUserServiceImpl extends ServiceImpl impl public boolean addSysUser(SysUserDTO sysUserDto) { SysUser sysUser = SysUserConverter.INSTANCE.dtoToPo(sysUserDto); sysUser.setDelFlag(0); - sysUser.setStatus(1); + sysUser.setStatus(SysUserConst.Status.NORMAL.getValue()); + sysUser.setType(SysUserConst.Type.SYSTEM.getValue()); String password = PasswordUtil.decodeAesAndEncodeBCrypt(sysUserDto.getPass(), secretKey); sysUser.setPassword(password);