b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 用户与角色分页查询条件

Browse Source 
🎨 添加用户类型枚举
This commit is contained in:
b2baccline
2020-04-14 21:33:42 +08:00
parent cb2eba18f0
commit a3a7c7107f
5 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java
View File

@@ -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;
}
}

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java
View File

@@ -20,4 +20,10 @@ public class SysRoleQO {
@ApiModelProperty(value = "角色标识")
private String code;
@ApiModelProperty(value = "开始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
}

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java
View File

@@ -44,4 +44,10 @@ public class SysUserQO {
@ApiModelProperty(value="状态(1-正常,2-冻结)")
private Integer status;
@ApiModelProperty(value="开始时间")
private String startTime;
@ApiModelProperty(value="结束时间")
private String endTime;
}

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java
View File

@@ -40,10 +40,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
*/
@Override
public IPage<SysRole> page(IPage<SysRole> page, SysRoleQO qo) {
LambdaQueryWrapper<SysRole> wrapper = Wrappers.<SysRole>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<SysRole> wrapper = Wrappers.<SysRole>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);
}
/**

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java
View File

@@ -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<SysUserMapper, SysUser> 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);