manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 添加描述字段.

Browse Source
This commit is contained in:
lijiahang
2025-01-16 10:00:12 +08:00
parent 25359f0f66
commit f804dc0338
19 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java
View File

@@ -58,4 +58,7 @@ public class SystemRoleDTO implements Serializable {
@Schema(description = "状态 0停用 1启用")
private Integer status;
@Schema(description = "描述")
private String description;
}

3
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java
View File

@@ -71,4 +71,7 @@ public class SystemUserDTO implements Serializable {
@Schema(description = "最后登录时间")
private Date lastLoginTime;
@Schema(description = "描述")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java
View File

@@ -64,4 +64,8 @@ public class SystemRoleDO extends BaseDO {
@TableField("status")
private Integer status;
@Schema(description = "描述")
@TableField("description")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java
View File

@@ -94,4 +94,8 @@ public class SystemUserDO extends BaseDO {
@TableField("last_login_time")
private Date lastLoginTime;
@Schema(description = "描述")
@TableField("description")
private String description;
}

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java
View File

@@ -63,7 +63,7 @@ public class DictKeyCreateRequest implements Serializable {
private String extraSchema;
@NotBlank
@Size(max = 64)
@Size(max = 255)
@Schema(description = "配置描述")
private String description;

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java
View File

@@ -53,7 +53,7 @@ public class DictKeyQueryRequest extends PageRequest {
@Schema(description = "配置项")
private String keyName;
@Size(max = 64)
@Size(max = 255)
@Schema(description = "配置描述")
private String description;

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java
View File

@@ -68,7 +68,7 @@ public class DictKeyUpdateRequest implements Serializable {
private String extraSchema;
@NotBlank
@Size(max = 64)
@Size(max = 255)
@Schema(description = "配置描述")
private String description;

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java
View File

@@ -56,4 +56,8 @@ public class SystemRoleCreateRequest implements Serializable {
@Schema(description = "角色编码")
private String code;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java
View File

@@ -57,4 +57,8 @@ public class SystemRoleQueryRequest extends PageRequest {
@Schema(description = "状态 0停用 1启用")
private Integer status;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java
View File

@@ -56,4 +56,8 @@ public class SystemRoleUpdateRequest implements Serializable {
@Schema(description = "角色名称")
private String name;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java
View File

@@ -72,4 +72,8 @@ public class SystemUserCreateRequest implements Serializable {
@Schema(description = "邮箱")
private String email;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java
View File

@@ -65,4 +65,8 @@ public class SystemUserQueryRequest extends PageRequest {
@Schema(description = "用户状态 0停用 1启用")
private Integer status;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java
View File

@@ -62,4 +62,8 @@ public class SystemUserUpdateRequest implements Serializable {
@Schema(description = "邮箱")
private String email;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

3
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java
View File

@@ -59,6 +59,9 @@ public class SystemRoleVO implements Serializable {
@Schema(description = "状态 0停用 1启用")
private Integer status;
@Schema(description = "描述")
private String description;
@Schema(description = "创建时间")
private Date createTime;

3
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java
View File

@@ -84,6 +84,9 @@ public class SystemUserVO implements Serializable {
@Schema(description = "修改人")
private String updater;
@Schema(description = "描述")
private String description;
@Schema(description = "用户角色")
private List<SystemRoleVO> roles;

5
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java
View File

@@ -171,9 +171,10 @@ public class SystemRoleServiceImpl implements SystemRoleService {
// 构造条件
LambdaQueryWrapper<SystemRoleDO> wrapper = systemRoleDAO.wrapper()
.eq(SystemRoleDO::getId, request.getId())
.like(SystemRoleDO::getName, request.getName())
.eq(SystemRoleDO::getCode, request.getCode())
.eq(SystemRoleDO::getStatus, request.getStatus());
.eq(SystemRoleDO::getStatus, request.getStatus())
.like(SystemRoleDO::getName, request.getName())
.like(SystemRoleDO::getDescription, request.getDescription());
// 查询
return systemRoleDAO.of(wrapper)
.page(request)

3
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java
View File

@@ -395,11 +395,12 @@ public class SystemUserServiceImpl implements SystemUserService {
public LambdaQueryWrapper<SystemUserDO> buildQueryWrapper(SystemUserQueryRequest request) {
return systemUserDAO.wrapper()
.eq(SystemUserDO::getId, request.getId())
.eq(SystemUserDO::getStatus, request.getStatus())
.like(SystemUserDO::getUsername, request.getUsername())
.like(SystemUserDO::getNickname, request.getNickname())
.like(SystemUserDO::getMobile, request.getMobile())
.like(SystemUserDO::getEmail, request.getEmail())
.eq(SystemUserDO::getStatus, request.getStatus());
.like(SystemUserDO::getDescription, request.getDescription());
}
}

9
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml
View File

@@ -5,19 +5,20 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.dromara.visor.module.infra.entity.domain.SystemRoleDO">
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="code" property="code"/>
<result column="status" property="status"/>
<result column="description" property="description"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
<result column="updater" property="updater"/>
<result column="deleted" property="deleted"/>
<result column="name" property="name"/>
<result column="code" property="code"/>
<result column="status" property="status"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, code, status, create_time, update_time, creator, updater, deleted
id, name, code, status, description, create_time, update_time, creator, updater, deleted
</sql>
<select id="getRoleIdByUserIdAndRoleCode" resultType="java.lang.Long">

13
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml
View File

@@ -5,11 +5,6 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.dromara.visor.module.infra.entity.domain.SystemUserDO">
<id column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
<result column="updater" property="updater"/>
<result column="deleted" property="deleted"/>
<result column="username" property="username"/>
<result column="password" property="password"/>
<result column="nickname" property="nickname"/>
@@ -20,11 +15,17 @@
<result column="update_password_status" property="updatePasswordStatus"/>
<result column="update_password_reason" property="updatePasswordReason"/>
<result column="last_login_time" property="lastLoginTime"/>
<result column="description" property="description"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
<result column="updater" property="updater"/>
<result column="deleted" property="deleted"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, username, password, nickname, avatar, mobile, email, status, update_password_status, update_password_reason, last_login_time, create_time, update_time, creator, updater, deleted
id, username, password, nickname, avatar, mobile, email, status, update_password_status, update_password_reason, last_login_time, description, create_time, update_time, creator, updater, deleted
</sql>
</mapper>