Skip to content

Commit

Permalink
style: 优化部分字段名称
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles7c committed Jan 6, 2024
1 parent 16ee2b4 commit e3e958b
Show file tree
Hide file tree
Showing 30 changed files with 175 additions and 175 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class DeptDO extends BaseDO {
private static final long serialVersionUID = 1L;

/**
* 部门名称
* 名称
*/
private String name;

Expand All @@ -59,7 +59,7 @@ public class DeptDO extends BaseDO {
private String description;

/**
* 部门排序
* 排序
*/
private Integer sort;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ public class DictDO extends BaseDO {
private static final long serialVersionUID = 1L;

/**
* 字典名称
* 名称
*/
private String name;

/**
* 字典编码
* 编码
*/
private String code;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ public class DictItemDO extends BaseDO {
private static final long serialVersionUID = 1L;

/**
* 字典标签
* 标签
*/
private String label;

/**
* 字典值
*
*/
private String value;

/**
* 背景颜色
* 标签颜色
*/
private String color;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class MenuDO extends BaseDO {
private static final long serialVersionUID = 1L;

/**
* 菜单标题
* 标题
*/
private String title;

Expand All @@ -50,7 +50,7 @@ public class MenuDO extends BaseDO {
private Long parentId;

/**
* 菜单类型
* 类型
*/
private MenuTypeEnum type;

Expand All @@ -70,7 +70,7 @@ public class MenuDO extends BaseDO {
private String component;

/**
* 菜单图标
* 图标
*/
private String icon;

Expand All @@ -95,7 +95,7 @@ public class MenuDO extends BaseDO {
private String permission;

/**
* 菜单排序
* 排序
*/
private Integer sort;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ public class OptionDO implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 参数名称
* 名称
*/
private String name;

/**
* 参数键
*
*/
@TableId
private String code;

/**
* 参数值
*
*/
private String value;

/**
* 参数默认值
* 默认值
*/
private String defaultValue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ public class RoleDO extends BaseDO {
private static final long serialVersionUID = 1L;

/**
* 角色名称
* 名称
*/
private String name;

/**
* 角色编码
* 编码
*/
private String code;

Expand All @@ -60,7 +60,7 @@ public class RoleDO extends BaseDO {
private String description;

/**
* 角色排序
* 排序
*/
private Integer sort;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public class DeptQuery implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 部门名称
* 名称
*/
@Schema(description = "部门名称", example = "测试部")
@Schema(description = "名称", example = "测试部")
@Query(type = QueryType.INNER_LIKE)
private String name;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public class DictQuery implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 字典名称
* 名称
*/
@Schema(description = "字典名称")
@Schema(description = "名称")
@Query(blurry = {"code", "name", "description"})
private String name;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public class MenuQuery implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 菜单标题
* 标题
*/
@Schema(description = "菜单标题", example = "用户管理")
@Schema(description = "标题", example = "用户管理")
@Query(type = QueryType.INNER_LIKE)
private String title;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ public class OptionQuery implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 参数键列表
* 键列表
*/
@Schema(description = "参数键列表", example = "site_title,site_copyright")
@NotEmpty(message = "参数键不能为空")
@Schema(description = "键列表", example = "site_title,site_copyright")
@NotEmpty(message = "键不能为空")
@Query(type = QueryType.IN)
private List<String> code;
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public class RoleQuery implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 角色名称
* 名称
*/
@Schema(description = "角色名称", example = "测试人员")
@Schema(description = "名称", example = "测试人员")
@Query(blurry = {"name", "code"})
private String name;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ public class DeptReq extends BaseReq {
private Long parentId;

/**
* 部门名称
* 名称
*/
@Schema(description = "部门名称", example = "测试部")
@NotBlank(message = "部门名称不能为空")
@Pattern(regexp = RegexConstants.GENERAL_NAME, message = "部门名称长度为 2 到 30 位,可以包含中文、字母、数字、下划线,短横线")
@Schema(description = "名称", example = "测试部")
@NotBlank(message = "名称不能为空")
@Pattern(regexp = RegexConstants.GENERAL_NAME, message = "名称长度为 2 到 30 位,可以包含中文、字母、数字、下划线,短横线")
private String name;

/**
* 部门排序
* 排序
*/
@Schema(description = "部门排序", example = "1")
@Min(value = 1, message = "部门排序最小值为 {value}")
@Schema(description = "排序", example = "1")
@Min(value = 1, message = "排序最小值为 {value}")
private Integer sort;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,26 @@ public class DictItemReq extends BaseReq {
private static final long serialVersionUID = 1L;

/**
* 字典标签
* 标签
*/
@Schema(description = "字典标签", example = "通知")
@NotBlank(message = "字典标签不能为空")
@Length(max = 30, message = "字典标签长度不能超过 {max} 个字符")
@Schema(description = "标签", example = "通知")
@NotBlank(message = "标签不能为空")
@Length(max = 30, message = "标签长度不能超过 {max} 个字符")
private String label;

/**
* 字典值
*
*/
@Schema(description = "字典值", example = "1")
@NotBlank(message = "字典值不能为空")
@Length(max = 30, message = "字典值长度不能超过 {max} 个字符")
@Schema(description = "", example = "1")
@NotBlank(message = "值不能为空")
@Length(max = 30, message = "值长度不能超过 {max} 个字符")
private String value;

/**
* 背景颜色
* 标签颜色
*/
@Schema(description = "背景颜色", example = "blue")
@Length(max = 30, message = "背景颜色长度不能超过 {max} 个字符")
@Schema(description = "标签颜色", example = "blue")
@Length(max = 30, message = "标签颜色长度不能超过 {max} 个字符")
private String color;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ public class DictReq extends BaseReq {
private static final long serialVersionUID = 1L;

/**
* 字典名称
* 名称
*/
@Schema(description = "字典名称", example = "公告类型")
@NotBlank(message = "字典名称不能为空")
@Pattern(regexp = RegexConstants.GENERAL_NAME, message = "字典名称长度为 2 到 30 位,可以包含中文、字母、数字、下划线,短横线")
@Schema(description = "名称", example = "公告类型")
@NotBlank(message = "名称不能为空")
@Pattern(regexp = RegexConstants.GENERAL_NAME, message = "名称长度为 2 到 30 位,可以包含中文、字母、数字、下划线,短横线")
private String name;

/**
* 字典编码
* 编码
*/
@Schema(description = "字典编码", example = "announcement_type")
@NotBlank(message = "字典编码不能为空")
@Pattern(regexp = RegexConstants.GENERAL_CODE, message = "字典编码长度为 2 到 30 位,可以包含字母、数字,下划线,以字母开头")
@Schema(description = "编码", example = "announcement_type")
@NotBlank(message = "编码不能为空")
@Pattern(regexp = RegexConstants.GENERAL_CODE, message = "编码长度为 2 到 30 位,可以包含字母、数字,下划线,以字母开头")
private String code;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,33 +46,33 @@ public class MenuReq extends BaseReq {
private static final long serialVersionUID = 1L;

/**
* 菜单类型
* 类型
*/
@Schema(description = "菜单类型(1:目录;2:菜单;3:按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2")
@NotNull(message = "菜单类型非法")
@Schema(description = "类型(1:目录;2:菜单;3:按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2")
@NotNull(message = "类型非法")
private MenuTypeEnum type;

/**
* 菜单图标
* 图标
*/
@Schema(description = "菜单图标", example = "user")
@Length(max = 50, message = "菜单图标长度不能超过 {max} 个字符")
@Schema(description = "图标", example = "user")
@Length(max = 50, message = "图标长度不能超过 {max} 个字符")
private String icon;

/**
* 菜单标题
* 标题
*/
@Schema(description = "菜单标题", example = "用户管理")
@NotBlank(message = "菜单标题不能为空")
@Length(max = 30, message = "菜单标题长度不能超过 {max} 个字符")
@Schema(description = "标题", example = "用户管理")
@NotBlank(message = "标题不能为空")
@Length(max = 30, message = "标题长度不能超过 {max} 个字符")
private String title;

/**
* 菜单排序
* 排序
*/
@Schema(description = "菜单排序", example = "1")
@NotNull(message = "菜单排序不能为空")
@Min(value = 1, message = "菜单排序最小值为 {value}")
@Schema(description = "排序", example = "1")
@NotNull(message = "排序不能为空")
@Min(value = 1, message = "排序最小值为 {value}")
private Integer sort;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ public class OptionReq extends BaseReq {
private static final long serialVersionUID = 1L;

/**
* 参数键
*
*/
@Schema(description = "参数键", example = "site_title")
@NotBlank(message = "参数键不能为空")
@Length(max = 100, message = "参数键长度不能超过 {max} 个字符")
@Schema(description = "", example = "site_title")
@NotBlank(message = "键不能为空")
@Length(max = 100, message = "键长度不能超过 {max} 个字符")
private String code;

/**
* 参数值
*
*/
@Schema(description = "参数值", example = "ContiNew Admin")
@NotBlank(message = "参数值不能为空")
@Schema(description = "", example = "ContiNew Admin")
@NotBlank(message = "值不能为空")
private String value;
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public class OptionResetValueReq implements Serializable {
private static final long serialVersionUID = 1L;

/**
* 参数键列表
* 键列表
*/
@Schema(description = "参数键列表", example = "site_title,site_copyright")
@NotEmpty(message = "参数键不能为空")
@Schema(description = "键列表", example = "site_title,site_copyright")
@NotEmpty(message = "键不能为空")
private List<String> code;
}
Loading

0 comments on commit e3e958b

Please sign in to comment.