ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-27 06:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: 优化部分字段名称

Browse Source
This commit is contained in:
Charles7c
2024-01-06 18:45:56 +08:00
parent 16ee2b4b6f
commit e3e958b419
30 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java
View File

@@ -39,7 +39,7 @@ public class DeptDO extends BaseDO {
private static final long serialVersionUID = 1L;
/**
* 部门名称
* 名称
*/
private String name;
@@ -59,7 +59,7 @@ public class DeptDO extends BaseDO {
private String description;
/**
* 部门排序
* 排序
*/
private Integer sort;

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java
View File

@@ -38,12 +38,12 @@ public class DictDO extends BaseDO {
private static final long serialVersionUID = 1L;
/**
* 字典名称
* 名称
*/
private String name;
/**
* 字典编码
* 编码
*/
private String code;

6
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java
View File

@@ -38,17 +38,17 @@ public class DictItemDO extends BaseDO {
private static final long serialVersionUID = 1L;
/**
* 字典标签
* 标签
*/
private String label;
/**
* 字典值
* 值
*/
private String value;
/**
* 背景颜色
* 标签颜色
*/
private String color;

8
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java
View File

@@ -40,7 +40,7 @@ public class MenuDO extends BaseDO {
private static final long serialVersionUID = 1L;
/**
* 菜单标题
* 标题
*/
private String title;
@@ -50,7 +50,7 @@ public class MenuDO extends BaseDO {
private Long parentId;
/**
* 菜单类型
* 类型
*/
private MenuTypeEnum type;
@@ -70,7 +70,7 @@ public class MenuDO extends BaseDO {
private String component;
/**
* 菜单图标
* 图标
*/
private String icon;
@@ -95,7 +95,7 @@ public class MenuDO extends BaseDO {
private String permission;
/**
* 菜单排序
* 排序
*/
private Integer sort;

8
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java
View File

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

6
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java
View File

@@ -40,12 +40,12 @@ public class RoleDO extends BaseDO {
private static final long serialVersionUID = 1L;
/**
* 角色名称
* 名称
*/
private String name;
/**
* 角色编码
* 编码
*/
private String code;
@@ -60,7 +60,7 @@ public class RoleDO extends BaseDO {
private String description;
/**
* 角色排序
* 排序
*/
private Integer sort;

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java
View File

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

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java
View File

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

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
View File

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

6
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java
View File

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

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java
View File

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

14
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java
View File

@@ -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;
/**

22
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java
View File

@@ -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;
/**

16
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java
View File

@@ -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;
/**

28
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java
View File

@@ -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;
/**

14
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java
View File

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

6
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java
View File

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

22
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java
View File

@@ -49,26 +49,26 @@ public class RoleReq 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 = "test")
@NotBlank(message = "角色编码不能为空")
@Pattern(regexp = RegexConstants.GENERAL_CODE, message = "角色编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头")
@Schema(description = "编码", example = "test")
@NotBlank(message = "编码不能为空")
@Pattern(regexp = RegexConstants.GENERAL_CODE, message = "编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头")
private String code;
/**
* 角色排序
* 排序
*/
@Schema(description = "角色排序", example = "1")
@Min(value = 1, message = "角色排序最小值为 {value}")
@Schema(description = "排序", example = "1")
@Min(value = 1, message = "排序最小值为 {value}")
private Integer sort;
/**

10
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java
View File

@@ -45,10 +45,10 @@ public class DeptDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;
/**
* 部门名称
* 名称
*/
@Schema(description = "部门名称", example = "测试部")
@ExcelProperty(value = "部门名称")
@Schema(description = "名称", example = "测试部")
@ExcelProperty(value = "名称")
private String name;
/**
@@ -66,9 +66,9 @@ public class DeptDetailResp extends BaseDetailResp {
private String parentName;
/**
* 部门排序
* 排序
*/
@Schema(description = "部门排序", example = "1")
@Schema(description = "排序", example = "1")
private Integer sort;
/**

8
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java
View File

@@ -41,9 +41,9 @@ public class DeptResp extends BaseResp {
private static final long serialVersionUID = 1L;
/**
* 部门名称
* 名称
*/
@Schema(description = "部门名称", example = "测试部")
@Schema(description = "名称", example = "测试部")
private String name;
/**
@@ -53,9 +53,9 @@ public class DeptResp extends BaseResp {
private Long parentId;
/**
* 部门排序
* 排序
*/
@Schema(description = "部门排序", example = "3")
@Schema(description = "排序", example = "3")
private Integer sort;
/**

8
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictDetailResp.java
View File

@@ -38,15 +38,15 @@ public class DictDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;
/**
* 字典名称
* 名称
*/
@Schema(description = "字典名称", example = "公告类型")
@Schema(description = "名称", example = "公告类型")
private String name;
/**
* 字典编码
* 编码
*/
@Schema(description = "字典编码", example = "announcement_type")
@Schema(description = "编码", example = "announcement_type")
private String code;
/**

18
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemDetailResp.java
View File

@@ -42,24 +42,24 @@ public class DictItemDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;
/**
* 字典标签
* 标签
*/
@Schema(description = "字典标签", example = "通知")
@ExcelProperty(value = "字典标签", order = 2)
@Schema(description = "标签", example = "通知")
@ExcelProperty(value = "标签", order = 2)
private String label;
/**
* 字典值
* 值
*/
@Schema(description = "字典值", example = "1")
@ExcelProperty(value = "字典值", order = 3)
@Schema(description = "值", example = "1")
@ExcelProperty(value = "值", order = 3)
private String value;
/**
* 背景颜色
* 标签颜色
*/
@Schema(description = "背景颜色", example = "blue")
@ExcelProperty(value = "背景颜色", order = 4)
@Schema(description = "标签颜色", example = "blue")
@ExcelProperty(value = "标签颜色", order = 4)
private String color;
/**

12
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java
View File

@@ -38,21 +38,21 @@ public class DictItemResp extends BaseResp {
private static final long serialVersionUID = 1L;
/**
* 字典标签
* 标签
*/
@Schema(description = "字典标签", example = "通知")
@Schema(description = "标签", example = "通知")
private String label;
/**
* 字典值
* 值
*/
@Schema(description = "字典值", example = "1")
@Schema(description = "值", example = "1")
private String value;
/**
* 背景颜色
* 标签颜色
*/
@Schema(description = "背景颜色", example = "blue")
@Schema(description = "标签颜色", example = "blue")
private String color;
/**

8
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java
View File

@@ -38,15 +38,15 @@ public class DictResp extends BaseResp {
private static final long serialVersionUID = 1L;
/**
* 字典名称
* 名称
*/
@Schema(description = "字典名称", example = "公告类型")
@Schema(description = "名称", example = "公告类型")
private String name;
/**
* 字典编码
* 编码
*/
@Schema(description = "字典编码", example = "announcement_type")
@Schema(description = "编码", example = "announcement_type")
private String code;
/**

24
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java
View File

@@ -47,24 +47,24 @@ public class MenuResp extends BaseResp {
private static final long serialVersionUID = 1L;
/**
* 菜单标题
* 标题
*/
@Schema(description = "菜单标题", example = "用户管理")
@ExcelProperty(value = "菜单标题")
@Schema(description = "标题", example = "用户管理")
@ExcelProperty(value = "标题")
private String title;
/**
* 菜单图标
* 图标
*/
@Schema(description = "菜单图标", example = "user")
@ExcelProperty(value = "菜单图标")
@Schema(description = "图标", example = "user")
@ExcelProperty(value = "图标")
private String icon;
/**
* 菜单排序
* 排序
*/
@Schema(description = "菜单排序", example = "1")
@ExcelProperty(value = "菜单排序")
@Schema(description = "排序", example = "1")
@ExcelProperty(value = "排序")
private Integer sort;
/**
@@ -124,10 +124,10 @@ public class MenuResp extends BaseResp {
private String name;
/**
* 菜单类型
* 类型
*/
@Schema(description = "菜单类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2")
@ExcelProperty(value = "菜单类型", converter = ExcelBaseEnumConverter.class)
@Schema(description = "类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2")
@ExcelProperty(value = "类型", converter = ExcelBaseEnumConverter.class)
private MenuTypeEnum type;
/**

14
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java
View File

@@ -41,25 +41,25 @@ public class OptionResp implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 参数名称
* 名称
*/
@Schema(description = "参数名称", example = "系统标题")
@Schema(description = "名称", example = "系统标题")
private String name;
/**
* 参数键
* 键
*/
@Schema(description = "参数键", example = "site_title")
@Schema(description = "键", example = "site_title")
private String code;
/**
* 参数值
* 值
*/
@Schema(description = "参数值", example = "ContiNew Admin")
@Schema(description = "值", example = "ContiNew Admin")
private String value;
/**
* 参数默认值
* 默认值
*/
@JsonIgnore
private String defaultValue;

18
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java
View File

@@ -46,17 +46,17 @@ public class RoleDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;
/**
* 角色名称
* 名称
*/
@Schema(description = "角色名称", example = "测试人员")
@ExcelProperty(value = "角色名称")
@Schema(description = "名称", example = "测试人员")
@ExcelProperty(value = "名称")
private String name;
/**
* 角色编码
* 编码
*/
@Schema(description = "角色编码", example = "test")
@ExcelProperty(value = "角色编码")
@Schema(description = "编码", example = "test")
@ExcelProperty(value = "编码")
private String code;
/**
@@ -68,10 +68,10 @@ public class RoleDetailResp extends BaseDetailResp {
private DataScopeEnum dataScope;
/**
* 角色排序
* 排序
*/
@Schema(description = "角色排序", example = "1")
@ExcelProperty(value = "角色排序")
@Schema(description = "排序", example = "1")
@ExcelProperty(value = "排序")
private Integer sort;
/**

12
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java
View File

@@ -40,15 +40,15 @@ public class RoleResp extends BaseResp {
private static final long serialVersionUID = 1L;
/**
* 角色名称
* 名称
*/
@Schema(description = "角色名称", example = "测试人员")
@Schema(description = "名称", example = "测试人员")
private String name;
/**
* 角色编码
* 编码
*/
@Schema(description = "角色编码", example = "test")
@Schema(description = "编码", example = "test")
private String code;
/**
@@ -59,9 +59,9 @@ public class RoleResp extends BaseResp {
private DataScopeEnum dataScope;
/**
* 角色排序
* 排序
*/
@Schema(description = "角色排序", example = "1")
@Schema(description = "排序", example = "1")
private Integer sort;
/**