Browse Source

feat(user): 新增角色管理功能

- 添加角色查询、新增、编辑和删除功能
- 实现角色信息的分页查询和动态加载
- 优化用户界面,增加角色管理相关按钮和对话框
- 新增角色请求模型类
master
lizw-2015 6 months ago
parent
commit
1007f18efe
  1. 53
      servo/src/main/java/com/yvan/workbench/controller/UserPermissions.java
  2. 22
      servo/src/main/java/com/yvan/workbench/model/request/AddRoleReq.java
  3. 15
      servo/src/main/java/com/yvan/workbench/model/request/QueryRoleReq.java
  4. 25
      servo/src/main/java/com/yvan/workbench/model/request/UpdateRoleReq.java

53
servo/src/main/java/com/yvan/workbench/controller/UserPermissions.java

@ -1,22 +1,20 @@
package com.yvan.workbench.controller;
import com.querydsl.sql.SQLQuery;
import com.yvan.workbench.model.request.AddUserReq;
import com.yvan.workbench.model.request.QueryUserReq;
import com.yvan.workbench.model.request.UpdateUserReq;
import com.yvan.workbench.model.request.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.clever.core.Assert;
import org.clever.core.Conv;
import org.clever.core.id.SnowFlake;
import org.clever.core.mapper.BeanCopyUtils;
import org.clever.core.mapper.JacksonMapper;
import org.clever.core.model.request.QueryByPage;
import org.clever.core.model.response.R;
import org.clever.data.jdbc.DaoFactory;
import org.clever.data.jdbc.QueryDSL;
import org.clever.data.jdbc.querydsl.utils.QueryDslUtils;
import org.clever.security.SecurityContextHolder;
import org.clever.security.impl.model.entity.SysRole;
import org.clever.security.impl.model.entity.SysUser;
import org.clever.security.model.SecurityContext;
import org.clever.web.mvc.annotation.RequestBody;
@ -27,6 +25,7 @@ import org.clever.web.mvc.annotation.Validated;
import java.util.Map;
import java.util.Objects;
import static org.clever.security.impl.model.query.QSysRole.sysRole;
import static org.clever.security.impl.model.query.QSysUser.sysUser;
/**
@ -46,9 +45,7 @@ public class UserPermissions {
if (req.getIsEnable() != null) {
query.where(sysUser.isEnable.eq(req.getIsEnable()));
}
Object res = QueryDslUtils.queryByPage(query, queryByPage);
log.info("--> {}", JacksonMapper.getInstance().toJson(res));
return res;
return QueryDslUtils.queryByPage(query, queryByPage);
}
@Transactional
@ -84,4 +81,46 @@ public class UserPermissions {
QUERY_DSL.delete(sysUser).where(sysUser.id.eq(id)).execute();
return R.success();
}
public static Object queryRole(QueryRoleReq req) {
QueryByPage queryByPage = QueryByPage.getCurrent();
SQLQuery<SysRole> query = QUERY_DSL.selectFrom(sysRole);
if (StringUtils.isNotBlank(req.getRoleCode())) {
query.where(sysRole.roleCode.eq(req.getRoleCode().trim()));
}
if (req.getIsEnable() != null) {
query.where(sysRole.isEnable.eq(req.getIsEnable()));
}
return QueryDslUtils.queryByPage(query, queryByPage);
}
@Transactional
public static R<?> addRole(@RequestBody @Validated AddRoleReq req) {
SecurityContext securityContext = SecurityContextHolder.getContext();
long count = QUERY_DSL.selectFrom(sysRole).where(sysRole.roleCode.eq(req.getRoleCode())).fetchCount();
Assert.isTrue(count <= 0, "角色编号已经存在:" + req.getRoleCode());
SysRole role = BeanCopyUtils.mapper(SysRole.class, req);
role.setId(SnowFlake.SNOW_FLAKE.nextId());
role.setCreateBy(securityContext.getUserInfo().getUserId());
QUERY_DSL.insert(sysRole).populate(role).execute();
return R.success();
}
@Transactional
public static R<?> updateRole(@RequestBody @Validated UpdateRoleReq req) {
SecurityContext securityContext = SecurityContextHolder.getContext();
SysRole oldRole = QUERY_DSL.selectFrom(sysRole).where(sysRole.roleCode.eq(req.getRoleCode())).fetchOne();
Assert.notNull(oldRole, "角色不存在:" + req.getRoleCode());
SysRole role = BeanCopyUtils.mapper(SysRole.class, req);
role.setUpdateBy(securityContext.getUserInfo().getUserId());
QUERY_DSL.update(sysRole).populate(role).where(sysRole.id.eq(oldRole.getId())).execute();
return R.success();
}
@Transactional
public static R<?> delRole(@RequestParam Map<String, Object> req) {
long id = Conv.asLong(req.get("id"));
QUERY_DSL.delete(sysRole).where(sysRole.id.eq(id)).execute();
return R.success();
}
}

22
servo/src/main/java/com/yvan/workbench/model/request/AddRoleReq.java

@ -0,0 +1,22 @@
package com.yvan.workbench.model.request;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* 作者lizw <br/>
* 创建时间2025/06/30 13:52 <br/>
*/
@Data
public class AddRoleReq {
/** 角色编号 */
@NotBlank
private String roleCode;
/** 角色名称 */
@NotBlank
private String roleName;
/** 是否启用: 0:禁用,1:启用 */
@NotNull
private Integer isEnable;
}

15
servo/src/main/java/com/yvan/workbench/model/request/QueryRoleReq.java

@ -0,0 +1,15 @@
package com.yvan.workbench.model.request;
import lombok.Data;
/**
* 作者lizw <br/>
* 创建时间2025/06/27 17:59 <br/>
*/
@Data
public class QueryRoleReq {
/** 角色编号 */
private String roleCode;
/** 是否启用: 0:禁用,1:启用 */
private Integer isEnable;
}

25
servo/src/main/java/com/yvan/workbench/model/request/UpdateRoleReq.java

@ -0,0 +1,25 @@
package com.yvan.workbench.model.request;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
/**
* 作者lizw <br/>
* 创建时间2025/06/30 13:57 <br/>
*/
@Data
public class UpdateRoleReq {
/**
* 角色编号
*/
@NotBlank
private String roleCode;
/**
* 角色名称
*/
private String roleName;
/**
* 是否启用: 0:禁用1:启用
*/
private Integer isEnable;
}
Loading…
Cancel
Save