From f2268563f2466ef4981fde6f71e7e464c2a4cef6 Mon Sep 17 00:00:00 2001 From: xixiaowei Date: Tue, 15 Feb 2022 18:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E8=A1=A5=E5=85=85Chines?= =?UTF-8?q?eDescription=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/rule/pojo/dict/SimpleDict.java | 4 +++ .../kernel/rule/tree/ztree/ZTreeNode.java | 8 ++++++ .../config/api/pojo/ConfigInitItem.java | 5 ++++ .../config/api/pojo/ConfigInitRequest.java | 2 ++ .../config/modular/entity/SysConfig.java | 10 +++++++ .../config/modular/param/SysConfigParam.java | 9 +++++++ .../api/pojo/request/DatabaseInfoRequest.java | 10 +++++++ .../dsctn/modular/entity/DatabaseInfo.java | 11 ++++++++ .../api/pojo/request/SysFileInfoRequest.java | 12 +++++++++ .../response/SysFileInfoListResponse.java | 18 +++++++++++++ .../pojo/response/SysFileInfoResponse.java | 16 +++++++++++ .../file/modular/entity/SysFileInfo.java | 15 +++++++++++ .../api/pojo/request/TranslationRequest.java | 7 +++++ .../i18n/modular/entity/Translation.java | 6 +++++ kernel-d-i18n/i18n-sdk/pom.xml | 2 +- .../log/api/pojo/loginlog/SysLoginLogDto.java | 11 ++++++++ .../api/pojo/loginlog/SysLoginLogRequest.java | 12 ++++++++- .../api/pojo/manage/LogManagerRequest.java | 10 +++++++ .../log/api/pojo/record/LogRecordDTO.java | 17 ++++++++++++ .../modular/loginlog/entity/SysLoginLog.java | 8 ++++++ .../pojo/resource/ReportResourceParam.java | 3 +++ .../api/pojo/DragCaptchaImageDTO.java | 6 +++++ .../kernel/sms/modular/entity/SysSms.java | 9 +++++++ .../sms/modular/param/SysSmsInfoParam.java | 9 +++++++ .../sms/modular/param/SysSmsSendParam.java | 8 ++++++ .../sms/modular/param/SysSmsVerifyParam.java | 5 ++++ .../timer/modular/entity/SysTimers.java | 9 +++++++ .../timer/modular/param/SysTimersParam.java | 9 +++++++ .../system/SystemHardwareCalculator.java | 6 +++++ .../customer/api/pojo/CustomerInfo.java | 13 +++++++++ .../api/pojo/CustomerInfoRequest.java | 5 ++++ .../kernel/dict/modular/entity/SysDict.java | 16 +++++++++++ .../dict/modular/entity/SysDictType.java | 11 ++++++++ .../dict/modular/pojo/TreeDictInfo.java | 6 +++++ .../modular/pojo/request/DictRequest.java | 14 ++++++++++ .../modular/pojo/request/DictTypeRequest.java | 10 +++++++ .../api/pojo/request/MessageRequest.java | 13 +++++++++ .../api/pojo/request/MessageSendRequest.java | 10 +++++++ .../api/pojo/response/MessageResponse.java | 14 ++++++++++ .../api/pojo/MigrationAggregationPOJO.java | 3 +++ .../migration/web/pojo/MigrationRequest.java | 3 +++ .../system/api/pojo/theme/SysThemeDTO.java | 8 ++++++ .../pojo/theme/SysThemeTemplateDataDTO.java | 13 ++++++++- .../controller/SysStatisticsController.java | 27 ++++++++++--------- .../home/entity/SysStatisticsCount.java | 5 ++++ .../modular/theme/pojo/DefaultTheme.java | 9 +++++++ .../modular/user/entity/SysUserRole.java | 4 +++ 47 files changed, 426 insertions(+), 15 deletions(-) diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/dict/SimpleDict.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/dict/SimpleDict.java index 066c4d529..53552957f 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/dict/SimpleDict.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/dict/SimpleDict.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.rule.pojo.dict; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; /** @@ -44,16 +45,19 @@ public class SimpleDict { /** * id */ + @ChineseDescription("id") private Long id; /** * 名称 */ + @ChineseDescription("名称") private String name; /** * 编码 */ + @ChineseDescription("编码") private String code; } diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java index adc9397c0..9c066e64e 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/tree/ztree/ZTreeNode.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.rule.tree.ztree; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.EqualsAndHashCode; @@ -48,11 +49,13 @@ public class ZTreeNode implements AbstractTreeNode { */ @Getter @Setter + @ChineseDescription("节点id") private Long id; /** * 父节点id */ + @ChineseDescription("父节点id") private Long pId; /** @@ -60,6 +63,7 @@ public class ZTreeNode implements AbstractTreeNode { */ @Getter @Setter + @ChineseDescription("节点名称") private String name; /** @@ -67,6 +71,7 @@ public class ZTreeNode implements AbstractTreeNode { */ @Getter @Setter + @ChineseDescription("是否打开节点") private Boolean open; /** @@ -74,6 +79,7 @@ public class ZTreeNode implements AbstractTreeNode { */ @Getter @Setter + @ChineseDescription("是否被选中") private Boolean checked; /** @@ -81,6 +87,7 @@ public class ZTreeNode implements AbstractTreeNode { */ @Getter @Setter + @ChineseDescription("节点图标") private String iconSkin; /** @@ -88,6 +95,7 @@ public class ZTreeNode implements AbstractTreeNode { */ @Getter @Setter + @ChineseDescription("子节点集合") private List children; /** diff --git a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitItem.java b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitItem.java index 8f9134699..8073a4c59 100644 --- a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitItem.java +++ b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitItem.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.config.api.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,21 +19,25 @@ public class ConfigInitItem { /** * 配置中文名称 */ + @ChineseDescription("配置中文名称") private String configName; /** * 配置编码 */ + @ChineseDescription("配置编码") private String configCode; /** * 配置的初始化值 */ + @ChineseDescription("配置初始化值") private String configValue; /** * 配置的描述 */ + @ChineseDescription("配置的描述") private String configDescription; } diff --git a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitRequest.java b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitRequest.java index ea99dc443..1b6e21416 100644 --- a/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitRequest.java +++ b/kernel-d-config/config-api/src/main/java/cn/stylefeng/roses/kernel/config/api/pojo/ConfigInitRequest.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.config.api.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.util.Map; @@ -18,6 +19,7 @@ public class ConfigInitRequest { *

* key是配置编码，value是配置值 */ + @ChineseDescription("系统配置集合") private Map sysConfigs; } diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/entity/SysConfig.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/entity/SysConfig.java index c488d345a..d85215ece 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/entity/SysConfig.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/entity/SysConfig.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.config.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,54 +47,63 @@ public class SysConfig extends BaseEntity { * 主键 */ @TableId(value = "config_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long configId; /** * 名称 */ @TableField("config_name") + @ChineseDescription("名称") private String configName; /** * 编码 */ @TableField("config_code") + @ChineseDescription("编码") private String configCode; /** * 属性值 */ @TableField("config_value") + @ChineseDescription("属性值") private String configValue; /** * 是否是系统参数：Y-是，N-否 */ @TableField("sys_flag") + @ChineseDescription("是否是系统参数：Y-是，N-否") private String sysFlag; /** * 备注 */ @TableField("remark") + @ChineseDescription("备注") private String remark; /** * 状态：1-正常，2停用 */ @TableField("status_flag") + @ChineseDescription("状态：1-正常，2停用") private Integer statusFlag; /** * 常量所属分类的编码，来自于“常量的分类”字典 */ @TableField("group_code") + @ChineseDescription("常量所属分类的编码") private String groupCode; /** * 是否删除：Y-被删除，N-未删除 */ @TableField(value = "del_flag", fill = FieldFill.INSERT) + @ChineseDescription("是否删除：Y-被删除，N-未删除") private String delFlag; } diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/param/SysConfigParam.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/param/SysConfigParam.java index 30e315a85..6ceb371cc 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/param/SysConfigParam.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/param/SysConfigParam.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.config.modular.param; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.api.validators.flag.FlagValue; import lombok.Data; @@ -46,24 +47,28 @@ public class SysConfigParam extends BaseRequest { * 主键 */ @NotNull(message = "configId不能为空", groups = {edit.class, delete.class, detail.class}) + @ChineseDescription("主键") private Long configId; /** * 名称 */ @NotBlank(message = "名称不能为空", groups = {add.class, edit.class}) + @ChineseDescription("名称") private String configName; /** * 编码 */ @NotBlank(message = "编码不能为空", groups = {add.class, edit.class}) + @ChineseDescription("编码") private String configCode; /** * 配置值 */ @NotBlank(message = "配置值不能为空", groups = {add.class, edit.class}) + @ChineseDescription("配置值") private String configValue; /** @@ -71,22 +76,26 @@ public class SysConfigParam extends BaseRequest { */ @NotBlank(message = "是否是系统参数不能为空", groups = {add.class, edit.class}) @FlagValue(message = "是否是系统参数格式错误，正确格式应该Y或者N", groups = {add.class, edit.class}) + @ChineseDescription("是否系统参数") private String sysFlag; /** * 备注 */ + @ChineseDescription("备注") private String remark; /** * 状态：1-正常，2停用 */ + @ChineseDescription("状态") private Integer statusFlag; /** * 常量所属分类的编码，来自于“常量的分类”字典 */ @NotBlank(message = "量所属分类的编码不能为空", groups = {add.class, edit.class}) + @ChineseDescription("常量所属分类的编码") private String groupCode; } diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java index 6e09aba0c..2e17f70c0 100644 --- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java +++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.dsctn.api.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue; import lombok.Data; @@ -48,6 +49,7 @@ public class DatabaseInfoRequest extends BaseRequest { * 主键id */ @NotNull(message = "dbId不能为空", groups = {edit.class, delete.class, detail.class}) + @ChineseDescription("主键id") private Long dbId; /** @@ -61,45 +63,53 @@ public class DatabaseInfoRequest extends BaseRequest { columnName = "db_name", idFieldName = "db_id", excludeLogicDeleteItems = true) + @ChineseDescription("数据库名称（英文名称）") private String dbName; /** * jdbc的驱动类型 */ @NotBlank(message = "jdbc的驱动类型为空", groups = {add.class, edit.class}) + @ChineseDescription("jdbc的驱动类型") private String jdbcDriver; /** * jdbc的url */ @NotBlank(message = "jdbc的url", groups = {add.class, edit.class}) + @ChineseDescription("jdbc的url") private String jdbcUrl; /** * 数据库连接的账号 */ @NotBlank(message = "数据库连接的账号", groups = {add.class, edit.class}) + @ChineseDescription("数据库连接的账号") private String username; /** * 数据库连接密码 */ @NotBlank(message = "数据库连接密码", groups = {add.class, edit.class}) + @ChineseDescription("数据库连接密码") private String password; /** * 数据库schemaName，注意，每种数据库的schema意义不同 */ + @ChineseDescription("数据库schemaName") private String schemaName; /** * 状态标识：1-正常，2-无法连接 */ + @ChineseDescription("状态标识：1-正常，2-无法连接") private Integer statusFlag; /** * 备注，摘要 */ + @ChineseDescription("备注") private String remarks; } diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/entity/DatabaseInfo.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/entity/DatabaseInfo.java index 065474b38..cf94be174 100644 --- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/entity/DatabaseInfo.java +++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/entity/DatabaseInfo.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.dsctn.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,60 +47,70 @@ public class DatabaseInfo extends BaseEntity { * 主键id */ @TableId(value = "db_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long dbId; /** * 数据库名称（英文名称） */ @TableField("db_name") + @ChineseDescription("数据库名称（英文名称）") private String dbName; /** * jdbc的驱动类型 */ @TableField("jdbc_driver") + @ChineseDescription("jdbc的驱动类型") private String jdbcDriver; /** * jdbc的url */ @TableField("jdbc_url") + @ChineseDescription("jdbc的url") private String jdbcUrl; /** * 数据库连接的账号 */ @TableField("username") + @ChineseDescription("数据库连接的账号") private String username; /** * 数据库连接密码 */ @TableField("password") + @ChineseDescription("数据库连接密码") private String password; /** * 数据库的schema名称，每种数据库的schema意义都不同 */ @TableField("schema_name") + @ChineseDescription("数据库的schema名称") private String schemaName; /** * 状态标识：1-正常，2-无法连接 */ @TableField("status_flag") + @ChineseDescription("状态标识：1-正常，2-无法连接") private Integer statusFlag; /** * 无法连接原因 */ @TableField("error_description") + @ChineseDescription("无法连接原因") private String errorDescription; /** * 备注，摘要 */ @TableField("remarks") + @ChineseDescription("备注") private String remarks; /** diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java index 130c8c7ac..4289d98c1 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.file.api.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -48,6 +49,7 @@ public class SysFileInfoRequest extends BaseRequest { * 文件ID */ @NotNull(message = "fileId不能为空", groups = {versionBack.class, detail.class}) + @ChineseDescription("文件id") private Long fileId; /** @@ -58,6 +60,7 @@ public class SysFileInfoRequest extends BaseRequest { * 版本号升级的依据，code相同id不同视为同一个文件的不同版本 */ @NotNull(message = "fileCode不能为空", groups = {edit.class, delete.class,}) + @ChineseDescription("文件编码") private Long fileCode; /** @@ -66,48 +69,57 @@ public class SysFileInfoRequest extends BaseRequest { * 机密文件为需要鉴权的文件，非机密文件则不需要任何权限（不登录也可以访问） */ @NotBlank(message = "是否是机密文件不能为空", groups = {add.class, edit.class}) + @ChineseDescription("是否为机密文件，Y-是机密，N-不是机密") private String secretFlag; /** * 文件名称（上传时候的文件全名，例如：开发文档.txt） */ + @ChineseDescription("文件名称（上传时候的文件全名，例如：开发文档.txt）") private String fileOriginName; /** * 其他文件形式传参 */ + @ChineseDescription("其他文件形式参数") private String token; /** * 文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地 */ + @ChineseDescription("文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地") private Integer fileLocation; /** * 文件仓库（文件夹） */ @NotBlank(message = "fileBucket不能为空", groups = {previewByObjectName.class}) + @ChineseDescription("文件仓库(文件夹)") private String fileBucket; /** * 文件后缀 */ + @ChineseDescription("文件后缀") private String fileSuffix; /** * 文件大小kb */ + @ChineseDescription("文件大小") private Long fileSizeKb; /** * 存储到bucket中的名称，主键id+.后缀 */ @NotBlank(message = "fileObjectName不能为空", groups = {previewByObjectName.class}) + @ChineseDescription("存储到bucket中的名称，主键id+.后缀") private String fileObjectName; /** * 存储路径 */ + @ChineseDescription("存储路径") private String filePath; /** diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java index 6cd1b6cc4..b12d2ee64 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.file.api.pojo.response; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.io.Serializable; @@ -43,6 +44,7 @@ public class SysFileInfoListResponse implements Serializable { /** * 主键id */ + @ChineseDescription("主键id") private Long fileId; /** @@ -52,83 +54,99 @@ public class SysFileInfoListResponse implements Serializable { *

* 版本号升级的依据，code相同id不同视为同一个文件的不同版本 */ + @ChineseDescription("文件编码") private Long fileCode; /** * 文件仓库（文件夹） */ + @ChineseDescription("文件仓库(文件夹)") private String fileBucket; /** * 存储到bucket中的名称，主键id+.后缀 */ + @ChineseDescription("存储到bucket中的名称，主键id+.后缀") private String fileObjectName; /** * 是否为机密文件 */ + @ChineseDescription("是否为机密文件") private String secretFlag; /** * 文件应用Code名称 */ + @ChineseDescription("文件应用Code名称") private String fileAppCodeName; /** * 文件名称（上传时候的文件名） */ + @ChineseDescription("文件名称（上传时候的文件名）") private String fileOriginName; /** * 文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地 */ + @ChineseDescription("存储位置：1-阿里云，2-腾讯云，3-minio，4-本地") private Integer fileLocation; /** * 文件后缀 */ + @ChineseDescription("文件后缀") private String fileSuffix; /** * 文件大小信息，计算后的 */ + @ChineseDescription("文件大小信息，计算后") private String fileSizeInfo; /** * 文件版本 */ + @ChineseDescription("文件版本") private Integer fileVersion; /** * 创建人 */ + @ChineseDescription("创建人") private Long createAccountId; /** * 创建人部门id */ + @ChineseDescription("创建人部门id") private Long createDeptId; /** * 创建人姓名 */ + @ChineseDescription("创建人姓名") private String createUserName; /** * 创建时间 */ + @ChineseDescription("创建时间") private Date createTime; /** * 创建人姓名 */ + @ChineseDescription("创建人姓名") private String realName; /** * 文件访问的url */ + @ChineseDescription("文件访问的url") private String fileUrl; } diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java index f49e9b2b9..95e9497b9 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.file.api.pojo.response; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; /** @@ -38,6 +39,7 @@ public class SysFileInfoResponse { /** * 主键id */ + @ChineseDescription("主键id") private Long fileId; /** @@ -47,71 +49,85 @@ public class SysFileInfoResponse { *

* 版本号升级的依据，code相同id不同视为同一个文件的不同版本 */ + @ChineseDescription("文件编码") private Long fileCode; /** * 文件版本 */ + @ChineseDescription("文件版本") private Integer fileVersion; /** * 文件状态（0-历史版,1-最新版） */ + @ChineseDescription("文件状态") private String fileStatus; /** * 文件后缀，例如.txt */ + @ChineseDescription("问价后缀") private String fileSuffix; /** * 文件大小kb */ + @ChineseDescription("文件大小kb") private Long fileSizeKb; /** * 文件大小信息，计算后的 */ + @ChineseDescription("文件大小信息，计算后") private String fileSizeInfo; /** * 是否为机密文件 */ + @ChineseDescription("是否为机密文件") private String secretFlag; /** * 文件的字节 */ + @ChineseDescription("文件的字节") private byte[] fileBytes; /** * 存储到bucket中的名称，主键id+.后缀 */ + @ChineseDescription("存储到bucket中的名称，主键id+.后缀") private String fileObjectName; /** * 文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地 */ + @ChineseDescription("文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地") private Integer fileLocation; /** * 文件仓库 */ + @ChineseDescription("文件仓库") private String fileBucket; /** * 文件名称（上传时候的文件名） */ + @ChineseDescription("文件名称（上传时候的文件名）") private String fileOriginName; /** * 存储路径 */ + @ChineseDescription("存储路径") private String filePath; /** * 文件访问的路径，如果是私密文件，则返回带鉴权的url，如果不是私密文件，则返回公网能直接访问的url */ + @ChineseDescription("文件访问路径") private String fileUrl; } diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java index 60940ab7e..1a29445b6 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.file.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,6 +47,7 @@ public class SysFileInfo extends BaseEntity { * 主键id */ @TableId(value = "file_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long fileId; /** @@ -54,78 +56,91 @@ public class SysFileInfo extends BaseEntity { * 解决一个文件多个版本问题，多次上传文件编码不变 */ @TableField("file_code") + @ChineseDescription("文件编码") private Long fileCode; /** * 文件版本，从1开始 */ @TableField("file_version") + @ChineseDescription("文件版本") private Integer fileVersion; /** * 当前状态：0-历史版，1-最新版 */ @TableField("file_status") + @ChineseDescription("当前状态：0-历史版，1-最新版") private String fileStatus; /** * 文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地 */ @TableField("file_location") + @ChineseDescription("文件存储位置") private Integer fileLocation; /** * 文件仓库（文件夹） */ @TableField("file_bucket") + @ChineseDescription("文件仓库(文件夹)") private String fileBucket; /** * 文件名称（上传时候的文件全名） */ @TableField("file_origin_name") + @ChineseDescription("文件名称（上传时候的文件全名）") private String fileOriginName; /** * 文件后缀，例如.txt */ @TableField("file_suffix") + @ChineseDescription("文件后缀") private String fileSuffix; /** * 文件大小kb为单位 */ @TableField("file_size_kb") + @ChineseDescription("文件大小") private Long fileSizeKb; /** * 文件大小信息，计算后的 */ @TableField("file_size_info") + @ChineseDescription("文件大小信息，计算后的") private String fileSizeInfo; /** * 存储到bucket中的名称，主键id+.后缀 */ @TableField("file_object_name") + @ChineseDescription("存储到bucket中的名称，主键id+.后缀") private String fileObjectName; /** * 存储路径 */ @TableField("file_path") + @ChineseDescription("存储路径") private String filePath; /** * 是否为机密文件 */ @TableField("secret_flag") + @ChineseDescription("是否为机密文件") private String secretFlag; /** * 是否删除：Y-被删除，N-未删除 */ @TableField(value = "del_flag", fill = FieldFill.INSERT) + @ChineseDescription("是否删除") private String delFlag; } diff --git a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java index c781d57c8..9cc51da07 100644 --- a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java +++ b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.i18n.api.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -47,35 +48,41 @@ public class TranslationRequest extends BaseRequest { * 主键id */ @NotNull(message = "tranId不能为空", groups = {edit.class, detail.class, delete.class}) + @ChineseDescription("主键id") private Long tranId; /** * 编码 */ @NotBlank(message = "tranCode不能为空", groups = {add.class, edit.class}) + @ChineseDescription("编码") private String tranCode; /** * 多语言条例名称 */ + @ChineseDescription("多语言条例名称") @NotBlank(message = "tranName不能为空", groups = {add.class, edit.class}) private String tranName; /** * 语种字典 */ + @ChineseDescription("语种字典") @NotBlank(message = "tranLanguageCode不能为空", groups = {add.class, edit.class, changeUserLanguage.class, deleteTranLanguage.class}) private String tranLanguageCode; /** * 翻译的值 */ + @ChineseDescription("翻译的值") @NotBlank(message = "tranValue不能为空", groups = {add.class, edit.class}) private String tranValue; /** * 字典id，用在删除语种 */ + @ChineseDescription("字典id") @NotNull(message = "字典id", groups = {deleteTranLanguage.class}) private Long dictId; diff --git a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/entity/Translation.java b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/entity/Translation.java index 2a5bbdc79..c6b306f1c 100644 --- a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/entity/Translation.java +++ b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/entity/Translation.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.i18n.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -49,30 +50,35 @@ public class Translation extends BaseEntity { * 主键id */ @TableId(value = "tran_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long tranId; /** * 编码 */ @TableField("tran_code") + @ChineseDescription("编码") private String tranCode; /** * 多语言条例名称 */ @TableField("tran_name") + @ChineseDescription("多语言条例名称") private String tranName; /** * 语种字典 */ @TableField("tran_language_code") + @ChineseDescription("语种字典") private String tranLanguageCode; /** * 翻译的值 */ @TableField("tran_value") + @ChineseDescription("翻译的值") private String tranValue; } diff --git a/kernel-d-i18n/i18n-sdk/pom.xml b/kernel-d-i18n/i18n-sdk/pom.xml index de63e4610..fed59d72a 100644 --- a/kernel-d-i18n/i18n-sdk/pom.xml +++ b/kernel-d-i18n/i18n-sdk/pom.xml @@ -25,7 +25,7 @@ - + cn.stylefeng.roses auth-api diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java index ce8ae6671..b94c19e08 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.log.api.pojo.loginlog; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,51 +21,61 @@ public class SysLoginLogDto extends BaseRequest { /** * 主键id */ + @ChineseDescription("主键id") private Long llgId; /** * 日志名称 */ + @ChineseDescription("日志名称") private String llgName; /** * 是否执行成功 */ + @ChineseDescription("是否执行成功") private String llgSucceed; /** * 具体消息 */ + @ChineseDescription("具体消息") private String llgMessage; /** * 登录ip */ + @ChineseDescription("登录ip") private String llgIpAddress; /** * 用户id */ + @ChineseDescription("用户id") private Long userId; /** * 登录姓名 */ + @ChineseDescription("登录姓名") private String userName; /** * 开始时间 */ + @ChineseDescription("创建时间") private Date createTime; /** * 开始时间 */ + @ChineseDescription("开始时间") private String beginTime; /** * 结束时间 */ + @ChineseDescription("结束时间") private String endTime; } diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java index 7dd6a57b7..e21c5767c 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.log.api.pojo.loginlog; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,46 +46,55 @@ public class SysLoginLogRequest extends BaseRequest { * 主键id */ @NotNull(message = "llgId不能为空", groups = {detail.class}) + @ChineseDescription("主鍵id") private Long llgId; /** * 日志名称 */ + @ChineseDescription("日志名称") private String llgName; /** * 是否执行成功 */ + @ChineseDescription("是否执行成功") private String llgSucceed; /** * 具体消息 */ + @ChineseDescription("具体消息") private String llgMessage; /** * 登录ip */ + @ChineseDescription("登录ip") private String llgIpAddress; /** * 用户id */ + @ChineseDescription("用户id") private Long userId; /** - * 开始时间 + * 创建时间 */ + @ChineseDescription("创建时间") private Date createTime; /** * 开始时间 */ + @ChineseDescription("开始时间") private String beginTime; /** * 结束时间 */ + @ChineseDescription("结束时间") private String endTime; } diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java index c64fb69dc..d71781e8d 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.log.api.pojo.manage; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,49 +46,58 @@ public class LogManagerRequest extends BaseRequest { * 单条日志id */ @NotNull(message = "日志id不能为空", groups = {detail.class}) + @ChineseDescription("单条日志id") private Long logId; /** * 查询的起始时间 */ @NotBlank(message = "起始时间不能为空", groups = {delete.class}) + @ChineseDescription("查询的起始时间") private String beginDate; /** * 查询日志的结束时间 */ + @ChineseDescription("查询的结束时间") @NotBlank(message = "结束时间不能为空", groups = {delete.class}) private String endDate; /** * 日志的名称，一般为业务名称 */ + @ChineseDescription("日志名称") private String logName; /** * 服务名称，一般为spring.application.name */ @NotBlank(message = "服务名称不能为空", groups = {delete.class}) + @ChineseDescription("服务名称") private String appName; /** * 当前服务器的ip */ + @ChineseDescription("当前服务器ip") private String serverIp; /** * 客户端请求的用户id */ + @ChineseDescription("客户端请求的用户id") private Long userId; /** * 客户端的ip */ + @ChineseDescription("客户端的ip") private String clientIp; /** * 当前用户请求的url */ + @ChineseDescription("当前用户的请求url") private String requestUrl; } diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java index d9fa88cc0..98e804cd4 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.log.api.pojo.record; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.util.Date; @@ -40,41 +41,49 @@ public class LogRecordDTO { /** * 日志id */ + @ChineseDescription("日志id") private Long logId; /** * 日志的名称，一般为业务名称 */ + @ChineseDescription("日志名称") private String logName; /** * 日志记录的内容 */ + @ChineseDescription("日志记录内容") private Object logContent; /** * 服务名称，一般为spring.application.name */ + @ChineseDescription("服务名称") private String appName; /** * http或方法的请求参数体 */ + @ChineseDescription("http或方法的请求参数体") private String requestParams; /** * http或方法的请求结果 */ + @ChineseDescription("http或方法的请求结果") private String requestResult; /** * 操作发生的时间 */ + @ChineseDescription("操作发生的时间") private Date dateTime; /** * 当前服务器的ip */ + @ChineseDescription("当前服务器的ip") private String serverIp; /** @@ -82,6 +91,7 @@ public class LogRecordDTO { *

* 如果是http请求，并且用户已经登录，可以带这项 */ + @ChineseDescription("客户端请求的token") private String token; /** @@ -89,6 +99,7 @@ public class LogRecordDTO { *

* 如果是http请求，并且用户已经登录，可以带这项 */ + @ChineseDescription("客户端请求的用户id") private Long userId; /** @@ -96,6 +107,7 @@ public class LogRecordDTO { *

* 如果是http请求，可以带这项 */ + @ChineseDescription("客户端的ip") private String clientIp; /** @@ -103,6 +115,7 @@ public class LogRecordDTO { *

* 如果是http请求，可以带这项 */ + @ChineseDescription("当前用户请求的requestUrl") private String requestUrl; /** @@ -110,6 +123,7 @@ public class LogRecordDTO { *

* 如果是http请求，可以带这项 */ + @ChineseDescription("请求方式") private String httpMethod; /** @@ -117,6 +131,7 @@ public class LogRecordDTO { *

* 如果是http请求，可以带这项 */ + @ChineseDescription("浏览器") private String clientBrowser; /** @@ -124,11 +139,13 @@ public class LogRecordDTO { *

* 如果是http请求，可以带这项 */ + @ChineseDescription("操作系统") private String clientOs; /** * 创建时间 */ + @ChineseDescription("创建时间") private Date createTime; } diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java index 24ae6fb8a..111e85fda 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.system.modular.loginlog.entity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -46,42 +47,49 @@ public class SysLoginLog { * 主键id */ @TableId("llg_id") + @ChineseDescription("主键id") private Long llgId; /** * 日志名称 */ @TableField("llg_name") + @ChineseDescription("日志名称") private String llgName; /** * 是否执行成功 */ @TableField("llg_succeed") + @ChineseDescription("是否执行成功") private String llgSucceed; /** * 具体消息 */ @TableField("llg_message") + @ChineseDescription("具体消息") private String llgMessage; /** * 登录ip */ @TableField("llg_ip_address") + @ChineseDescription("登录ip") private String llgIpAddress; /** * 用户id */ @TableField(value = "user_id") + @ChineseDescription("用户id") private Long userId; /** * 创建时间 */ @TableField(value = "create_time", fill = FieldFill.INSERT) + @ChineseDescription("创建时间") private Date createTime; } diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/resource/ReportResourceParam.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/resource/ReportResourceParam.java index 79e13f520..deed2e0a4 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/resource/ReportResourceParam.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/resource/ReportResourceParam.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.scanner.api.pojo.resource; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,11 +46,13 @@ public class ReportResourceParam extends BaseRequest { *

* 修复一个项目启动的时候会误删别的项目资源的问题 */ + @ChineseDescription("项目编码") private String projectCode; /** * 资源集合 */ + @ChineseDescription("资源集合") private Map> resourceDefinitions; public ReportResourceParam(String projectCode, Map> resourceDefinitions) { diff --git a/kernel-d-security/security-api/src/main/java/cn/stylefeng/roses/kernel/security/api/pojo/DragCaptchaImageDTO.java b/kernel-d-security/security-api/src/main/java/cn/stylefeng/roses/kernel/security/api/pojo/DragCaptchaImageDTO.java index 6ea86dc8f..b5512e2e4 100644 --- a/kernel-d-security/security-api/src/main/java/cn/stylefeng/roses/kernel/security/api/pojo/DragCaptchaImageDTO.java +++ b/kernel-d-security/security-api/src/main/java/cn/stylefeng/roses/kernel/security/api/pojo/DragCaptchaImageDTO.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.security.api.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,26 +17,31 @@ public class DragCaptchaImageDTO { /** * 本次验证码缓存的key */ + @ChineseDescription("本次验证码缓存的key") private String key; /** * 剪裁后的源图片（base64编码） */ + @ChineseDescription("剪裁后的源图片（base64编码）") private String srcImage; /** * 剪裁的小拼图图片（base64编码） */ + @ChineseDescription("剪裁的小拼图图片（base64编码）") private String cutImage; /** * x轴坐标 */ + @ChineseDescription("x轴坐标") private Integer locationX; /** * y轴坐标 */ + @ChineseDescription("y轴坐标") private Integer locationY; public DragCaptchaImageDTO(String srcImage, String cutImage, int locationX, int locationY) { diff --git a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/entity/SysSms.java b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/entity/SysSms.java index 8126f080d..9806a630f 100644 --- a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/entity/SysSms.java +++ b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/entity/SysSms.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.sms.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -53,42 +54,49 @@ public class SysSms extends BaseEntity implements Serializable { * 主键 */ @TableId(value = "sms_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long smsId; /** * 手机号 */ @TableField("phone_number") + @ChineseDescription("手机号") private String phoneNumber; /** * 短信验证码 */ @TableField("validate_code") + @ChineseDescription("短信验证码") private String validateCode; /** * 短信模板编号 */ @TableField("template_code") + @ChineseDescription("短信模板编号") private String templateCode; /** * 业务id */ @TableField("biz_id") + @ChineseDescription("业务id") private String bizId; /** * 发送状态：1-未发送，2-发送成功，3-发送失败，4-失效 */ @TableField("status_flag") + @ChineseDescription("发送状态：1-未发送，2-发送成功，3-发送失败，4-失效") private Integer statusFlag; /** * 来源：1-app，2-pc，3-其他 */ @TableField("source") + @ChineseDescription("来源：1-app，2-pc，3-其他") private Integer source; /** @@ -96,6 +104,7 @@ public class SysSms extends BaseEntity implements Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("invalid_time") + @ChineseDescription("短信失效截止时间") private Date invalidTime; } diff --git a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsInfoParam.java b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsInfoParam.java index ad2ded58d..cb0030012 100644 --- a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsInfoParam.java +++ b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsInfoParam.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.sms.modular.param; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,41 +44,49 @@ public class SysSmsInfoParam extends BaseRequest { /** * 主键 */ + @ChineseDescription("主键id") private Long smsId; /** * 手机号 */ + @ChineseDescription("手机号") private String phone; /** * 短信验证码 */ + @ChineseDescription("短信验证码") private String validateCode; /** * 短信模板编号 */ + @ChineseDescription("短信模板编号") private String templateCode; /** * 业务id */ + @ChineseDescription("业务id") private String bizId; /** * 发送状态：1-未发送，2-发送成功，3-发送失败，4-失效 */ + @ChineseDescription("发送状态") private Integer statusFlag; /** * 来源：1-app，2-pc，3-其他 */ + @ChineseDescription("来源") private Integer source; /** * 短信失效截止时间 */ + @ChineseDescription("短信失效戒截止时间") private Date invalidTime; } diff --git a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsSendParam.java b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsSendParam.java index 0d6a0704f..b14395346 100644 --- a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsSendParam.java +++ b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsSendParam.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.sms.modular.param; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.sms.modular.enums.SmsSendSourceEnum; import cn.stylefeng.roses.kernel.sms.modular.enums.SmsTypeEnum; import lombok.Data; @@ -44,37 +45,44 @@ public class SysSmsSendParam { * 手机号 */ @NotBlank(message = "手机号码为空") + @ChineseDescription("手机号") private String phone; /** * 模板号 */ @NotBlank(message = "模板号为空") + @ChineseDescription("模板号") private String templateCode; /** * 缓存 key */ + @ChineseDescription("缓存key") private String verKey; /** * 图形验证码 */ + @ChineseDescription("图形验证码") private String verCode; /** * 模板中的参数 */ + @ChineseDescription("模板中的参数") private Map params; /** * 发送源 */ + @ChineseDescription("发送源") private SmsSendSourceEnum smsSendSourceEnum = SmsSendSourceEnum.PC; /** * 消息类型，1验证码，2消息，默认不传为验证码 */ + @ChineseDescription("消息类型：1-验证码，2-消息，默认验证码") private SmsTypeEnum smsTypeEnum = SmsTypeEnum.SMS; } diff --git a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsVerifyParam.java b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsVerifyParam.java index 39ae7d2f1..c0b12f778 100644 --- a/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsVerifyParam.java +++ b/kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/param/SysSmsVerifyParam.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.sms.modular.param; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.sms.modular.enums.SmsSendSourceEnum; import lombok.Data; @@ -42,23 +43,27 @@ public class SysSmsVerifyParam { * 手机号 */ @NotBlank(message = "手机号不能为空") + @ChineseDescription("手机号") private String phone; /** * 验证码 */ @NotBlank(message = "验证码不能为空") + @ChineseDescription("验证码") private String code; /** * 模板号 */ @NotBlank(message = "模板号不能为空") + @ChineseDescription("模板号") private String templateCode; /** * 来源 */ + @ChineseDescription("来源") private SmsSendSourceEnum smsSendSourceEnum = SmsSendSourceEnum.PC; } diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java index c17422f1d..181a295a5 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.timer.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -44,48 +45,56 @@ public class SysTimers extends BaseEntity { * 定时器id */ @TableId(value = "timer_id", type = IdType.ASSIGN_ID) + @ChineseDescription("定时器id") private Long timerId; /** * 任务名称 */ @TableField("timer_name") + @ChineseDescription("任务名称") private String timerName; /** * 执行任务的class的类名（实现了TimerAction接口的类的全称） */ @TableField("action_class") + @ChineseDescription("执行任务的class的类名") private String actionClass; /** * 定时任务表达式 */ @TableField("cron") + @ChineseDescription("定时任务表达式") private String cron; /** * 参数 */ @TableField("params") + @ChineseDescription("参数") private String params; /** * 状态：1-运行，2-停止 */ @TableField("job_status") + @ChineseDescription("状态：1-运行，2-停止") private Integer jobStatus; /** * 备注信息 */ @TableField("remark") + @ChineseDescription("备注信息") private String remark; /** * 是否删除：Y-被删除，N-未删除 */ @TableField(value = "del_flag", fill = FieldFill.INSERT) + @ChineseDescription("是否删除") private String delFlag; } diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java index 3f36fdc76..e64dc8459 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.timer.modular.param; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,45 +46,53 @@ public class SysTimersParam extends BaseRequest { * 定时器id */ @NotNull(message = "主键timerId不能为空", groups = {edit.class, detail.class, delete.class, startTimer.class, stopTimer.class}) + @ChineseDescription("定时器id") private Long timerId; /** * 任务名称 */ @NotBlank(message = "任务名称不能为空", groups = {add.class, edit.class}) + @ChineseDescription("任务名称") private String timerName; /** * 执行任务的class的类名（实现了TimerTaskRunner接口的类的全称） */ @NotBlank(message = "任务的class的类名不能为空", groups = {add.class, edit.class}) + @ChineseDescription("执行任务的class的类名") private String actionClass; /** * 定时任务表达式 */ @NotBlank(message = "定时任务表达式不能为空", groups = {add.class, edit.class}) + @ChineseDescription("定时任务表达式") private String cron; /** * 状态（字典 1运行 2停止） */ @NotNull(message = "任务状态不能为空", groups = {edit.class}) + @ChineseDescription("状态（字典 1运行 2停止）") private Integer jobStatus; /** * 参数 */ + @ChineseDescription("参数") private String params; /** * 备注信息 */ + @ChineseDescription("备注信息") private String remark; /** * 是否删除标记 */ + @ChineseDescription("是否删除标记") private String delFlag; /** diff --git a/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java b/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java index 490b1586a..93645e63d 100644 --- a/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java +++ b/kernel-o-monitor/monitor-business-system-info/src/main/java/cn/stylefeng/roses/kernel/monitor/system/SystemHardwareCalculator.java @@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.monitor.system; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.NumberUtil; import cn.stylefeng.roses.kernel.monitor.api.pojo.*; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.util.IpInfoUtils; import lombok.Data; import oshi.SystemInfo; @@ -57,26 +58,31 @@ public class SystemHardwareCalculator { /** * CPU相关信息 */ + @ChineseDescription("CPU相关信息") private CpuInfo cpu = new CpuInfo(); /** * 內存相关信息 */ + @ChineseDescription("内存相关信息") private MemInfo mem = new MemInfo(); /** * JVM相关信息 */ + @ChineseDescription("JWT相关信息") private JvmInfo jvm = new JvmInfo(); /** * 服务器相关信息 */ + @ChineseDescription("服务器相关信息") private SysInfo sys = new SysInfo(); /** * 磁盘相关信息 */ + @ChineseDescription("磁盘相关信息") private List sysFiles = new LinkedList<>(); /** diff --git a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java index 9073cb211..bfccbf3cd 100644 --- a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java +++ b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.customer.api.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.util.Date; @@ -16,61 +17,73 @@ public class CustomerInfo { /** * 主键id */ + @ChineseDescription("主键id") private Long customerId; /** * 账号 */ + @ChineseDescription("帐号") private String account; /** * 昵称（显示名称） */ + @ChineseDescription("昵称（显示名称）") private String nickName; /** * 邮箱 */ + @ChineseDescription("邮箱") private String email; /** * 手机 */ + @ChineseDescription("手机") private String telephone; /** * 用户头像（文件表id） */ + @ChineseDescription("用户头像（文件表id）") private Long avatar; /** * 用户头像的全部url */ + @ChineseDescription("用户头像的全部url") private String avatarObjectUrl; /** * 用户积分 */ + @ChineseDescription("用户积分") private Integer score; /** * 用户秘钥 */ + @ChineseDescription("用户秘钥") private String secretKey; /** * 是否是会员 */ + @ChineseDescription("是否会员") private Boolean memberFlag; /** * 会员截止日期，到期时间 */ + @ChineseDescription("会员截止日期，到期时间") private Date memberExpireTime; /** * 用户状态（1：启用，2：禁用，3：冻结） */ + @ChineseDescription("用户状态") private Integer statusFlag; } diff --git a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfoRequest.java b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfoRequest.java index 89a4bc443..38c4ae62c 100644 --- a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfoRequest.java +++ b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfoRequest.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.customer.api.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,24 +22,28 @@ public class CustomerInfoRequest extends BaseRequest { * 主键id */ @NotNull(message = "用户id不能为空", groups = {changeAvatar.class, changePassword.class}) + @ChineseDescription("主键id") private Long customerId; /** * 用户头像（文件表id） */ @NotNull(message = "用户头像", groups = changeAvatar.class) + @ChineseDescription("用户头像（文件表id）") private Long avatar; /** * 原密码 */ @NotBlank(message = "原密码不能为空", groups = changePassword.class) + @ChineseDescription("原密码") private String oldPassword; /** * 新密码 */ @NotBlank(message = "新密码不能为空", groups = changePassword.class) + @ChineseDescription("新密码") private String newPassword; /** diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java index a5cc0b9c5..5a66ee2c6 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.dict.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -48,88 +49,103 @@ public class SysDict extends BaseEntity { * 字典id */ @TableId(value = "dict_id", type = IdType.ASSIGN_ID) + @ChineseDescription("字典id") private Long dictId; /** * 字典编码 */ @TableField("dict_code") + @ChineseDescription("字典编码") private String dictCode; /** * 字典名称 */ @TableField("dict_name") + @ChineseDescription("字典名称") private String dictName; /** * 字典名称首字母 */ @TableField("dict_name_pinyin") + @ChineseDescription("字典名称首字母") private String dictNamePinyin; /** * 字典编码 */ @TableField("dict_encode") + @ChineseDescription("字典编码") private String dictEncode; /** * 字典类型的编码 */ @TableField("dict_type_code") + @ChineseDescription("字典类型的编码") private String dictTypeCode; /** * 字典简称 */ @TableField("dict_short_name") + @ChineseDescription("字典简称") private String dictShortName; /** * 字典简称的编码 */ @TableField("dict_short_code") + @ChineseDescription("字典简称的编码") private String dictShortCode; /** * 上级字典的id(如果没有上级字典id，则为-1) */ @TableField("dict_parent_id") + @ChineseDescription("上级字典的id(如果没有上级字典id，则为-1)") private Long dictParentId; /** * 状态：(1-启用,2-禁用),参考 StatusEnum */ @TableField("status_flag") + @ChineseDescription("状态：(1-启用,2-禁用)") private Integer statusFlag; /** * 排序，带小数点 */ @TableField("dict_sort") + @ChineseDescription("排序") private BigDecimal dictSort; /** * 父id集合 */ @TableField("dict_pids") + @ChineseDescription("父id集合") private String dictPids; /** * 是否删除，Y-被删除，N-未删除 */ @TableField(value = "del_flag", fill = FieldFill.INSERT) + @ChineseDescription("是否删除，Y-被删除，N-未删除") private String delFlag; /** * 字典类型的名称 */ + @ChineseDescription("字典类型的名称") private transient String dictTypeName; /** * 字典上级的名称（字典有上下级，字典类型没有上下级） */ + @ChineseDescription("字典上级的名称（字典有上下级，字典类型没有上下级）") private transient String parentName; } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java index 33e9d6939..eb2a04994 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.dict.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,60 +47,70 @@ public class SysDictType extends BaseEntity { * 字典类型id */ @TableId(value = "dict_type_id", type = IdType.ASSIGN_ID) + @ChineseDescription("字典类型id") private Long dictTypeId; /** * 字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum */ @TableField("dict_type_class") + @ChineseDescription("字典类型") private Integer dictTypeClass; /** * 字典类型编码 */ @TableField("dict_type_code") + @ChineseDescription("字典类型编码") private String dictTypeCode; /** * 字典类型业务编码 */ @TableField("dict_type_bus_code") + @ChineseDescription("字典类型业务编码") private String dictTypeBusCode; /** * 字典类型名称 */ @TableField("dict_type_name") + @ChineseDescription("字典类型名称") private String dictTypeName; /** * 字典类型名称拼音 */ @TableField("dict_type_name_pinyin") + @ChineseDescription("字典类型名词拼音") private String dictTypeNamePinyin; /** * 字典类型描述 */ @TableField("dict_type_desc") + @ChineseDescription("字典类型描述") private String dictTypeDesc; /** * 字典类型的状态：1-启用，2-禁用，参考 StatusEnum */ @TableField("status_flag") + @ChineseDescription("字典类型的状态：1-启用，2-禁用") private Integer statusFlag; /** * 删除标记 Y-已删除，N-未删除，参考 YesOrNotEnum */ @TableField(value = "del_flag", fill = FieldFill.INSERT) + @ChineseDescription("删除标记") private String delFlag; /** * 排序，带小数点 */ @TableField(value = "dict_type_sort") + @ChineseDescription("排序") private BigDecimal dictTypeSort; } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java index 92d463211..1e4667304 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/TreeDictInfo.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.dict.modular.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import lombok.Data; @@ -43,26 +44,31 @@ public class TreeDictInfo implements AbstractTreeNode { /** * 字典id */ + @ChineseDescription("字典id") private Long dictId; /** * 字典编码 */ + @ChineseDescription("字典编码") private String dictCode; /** * 字典名称 */ + @ChineseDescription("字典名称") private String dictName; /** * 上级字典id */ + @ChineseDescription("上级字典id") private Long dictParentId; /** * tree子节点 */ + @ChineseDescription("tree子节点") private List children; @Override diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictRequest.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictRequest.java index 64f401f99..94efa6d8c 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictRequest.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.dict.modular.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue; import lombok.Data; @@ -47,44 +48,52 @@ public class DictRequest extends BaseRequest { * 字典id */ @NotNull(message = "id不能为空", groups = {edit.class, delete.class, detail.class, updateStatus.class}) + @ChineseDescription("字典id") private Long dictId; /** * 字典编码 */ @NotBlank(message = "字典编码不能为空", groups = {add.class, edit.class, validateAvailable.class}) + @ChineseDescription("字典编码") private String dictCode; /** * 字典名称 */ @NotBlank(message = "字典名称不能为空", groups = {add.class, edit.class}) + @ChineseDescription("字典名称") private String dictName; /** * 字典名称拼音 */ + @ChineseDescription("字典名称拼音") private String dictNamePinYin; /** * 字典编码 */ + @ChineseDescription("字典编码") private String dictEncode; /** * 字典类型编码 */ @NotBlank(message = "字典类型编码不能为空", groups = {add.class, edit.class, treeList.class, dictZTree.class}) + @ChineseDescription("字典类型编码") private String dictTypeCode; /** * 字典简称 */ + @ChineseDescription("字典简称") private String dictShortName; /** * 字典简称的编码 */ + @ChineseDescription("字典简称的编码") private String dictShortCode; /** @@ -94,6 +103,7 @@ public class DictRequest extends BaseRequest { *

* 如果没有上级字典id，则为-1 */ + @ChineseDescription("上级字典的id") private Long dictParentId; /** @@ -101,22 +111,26 @@ public class DictRequest extends BaseRequest { */ @NotNull(message = "状态不能为空", groups = {updateStatus.class}) @StatusValue(groups = updateStatus.class) + @ChineseDescription("状态") private Integer statusFlag; /** * 排序，带小数点 */ + @ChineseDescription("排序") @NotNull(message = "排序不能为空", groups = {add.class, edit.class}) private BigDecimal dictSort; /** * 所有的父级id,逗号分隔 */ + @ChineseDescription("所有的父级id") private String dictPids; /** * 字典类型id，用在作为查询条件 */ + @ChineseDescription("字典类型id") private Long dictTypeId; /** diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictTypeRequest.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictTypeRequest.java index 79947c7cc..13bd1d954 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictTypeRequest.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/pojo/request/DictTypeRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.dict.modular.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue; import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue; @@ -48,17 +49,20 @@ public class DictTypeRequest extends BaseRequest { * 字典类型id */ @NotNull(message = "id不能为空", groups = {edit.class, delete.class, detail.class, updateStatus.class}) + @ChineseDescription("字典类型id") private Long dictTypeId; /** * 字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum */ @NotNull(message = "字典类型不能为空", groups = {add.class, edit.class}) + @ChineseDescription("字典类型") private Integer dictTypeClass; /** * 字典类型业务编码 */ + @ChineseDescription("字典类型业务编码") private String dictTypeBusCode; /** @@ -72,22 +76,26 @@ public class DictTypeRequest extends BaseRequest { columnName = "dict_type_code", idFieldName = "dict_type_id", excludeLogicDeleteItems = true) + @ChineseDescription("字典类型编码") private String dictTypeCode; /** * 字典类型名称 */ @NotBlank(message = "字典类型名称不能为空", groups = {add.class, edit.class}) + @ChineseDescription("字典类型名称") private String dictTypeName; /** * 字典类型名词拼音 */ + @ChineseDescription("字典类型名词拼音") private String dictTypeNamePinYin; /** * 字典类型描述 */ + @ChineseDescription("字典类型描述") private String dictTypeDesc; /** @@ -95,12 +103,14 @@ public class DictTypeRequest extends BaseRequest { */ @NotNull(message = "状态不能为空", groups = {updateStatus.class}) @StatusValue(groups = updateStatus.class) + @ChineseDescription("字典类型的状态：1-启用，2-禁用") private Integer statusFlag; /** * 排序，带小数 */ @NotNull(message = "排序不能为空", groups = {add.class, edit.class}) + @ChineseDescription("排序") private BigDecimal dictTypeSort; /** diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageRequest.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageRequest.java index 1e26c9526..9f606afd9 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageRequest.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.message.api.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -47,63 +48,75 @@ public class MessageRequest extends BaseRequest { * 消息id */ @NotNull(message = "messageId不能为空", groups = {edit.class, delete.class, detail.class, updateStatus.class}) + @ChineseDescription("消息id") private Long messageId; /** * 接收用户id */ + @ChineseDescription("接收用户id") private Long receiveUserId; /** * 发送用户id */ + @ChineseDescription("发送用户id") private Long sendUserId; /** * 消息标题 */ + @ChineseDescription("消息标题") private String messageTitle; /** * 消息的内容 */ + @ChineseDescription("消息内容") private String messageContent; /** * 消息类型 */ + @ChineseDescription("消息类型") private String messageType; /** * 消息优先级 */ + @ChineseDescription("消息优先级") private String priorityLevel; /** * 消息发送时间 */ + @ChineseDescription("消息发送时间") private Date messageSendTime; /** * 业务id */ + @ChineseDescription("业务id") private Long businessId; /** * 业务类型 */ + @ChineseDescription("业务类型") private String businessType; /** * 阅读状态：0-未读，1-已读 */ @NotNull(message = "阅读状态不能为空", groups = {updateStatus.class}) + @ChineseDescription("阅读状态") private Integer readFlag; /** * 消息id集合 */ @NotEmpty(message = "消息id集合不能为空", groups = {updateReadFlag.class}) + @ChineseDescription("消息id集合") private List messageIdList; diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageSendRequest.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageSendRequest.java index d29df56cd..f646cfd93 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageSendRequest.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/request/MessageSendRequest.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.message.api.pojo.request; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,49 +47,58 @@ public class MessageSendRequest extends BaseRequest { * 接收用户id字符串，多个以,分割 */ @NotBlank(message = "接收用户ID字符串不能为空", groups = {add.class, edit.class}) + @ChineseDescription("接收用户id字符串，多个以,分割") private String receiveUserIds; /** * 消息标题 */ @NotBlank(message = "消息标题不能为空", groups = {add.class, edit.class}) + @ChineseDescription("消息标题") private String messageTitle; /** * 消息的内容 */ + @ChineseDescription("消息内容") private String messageContent; /** * 消息类型 */ + @ChineseDescription("消息类型") private String messageType; /** * 消息优先级 */ + @ChineseDescription("消息优先级") private String priorityLevel; /** * 业务id */ @NotNull(message = "业务id不能为空", groups = {add.class, edit.class}) + @ChineseDescription("业务id") private Long businessId; /** * 业务类型 */ @NotBlank(message = "业务类型不能为空", groups = {add.class, edit.class}) + @ChineseDescription("业务类型") private String businessType; /** * 业务类型值 */ + @ChineseDescription("业务类型值") private String businessTypeValue; /** * 消息发送时间 */ + @ChineseDescription("消息发送时间") private Date messageSendTime; } diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/response/MessageResponse.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/response/MessageResponse.java index ea684a0e9..0d560f198 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/response/MessageResponse.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/response/MessageResponse.java @@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.message.api.pojo.response; import cn.stylefeng.roses.kernel.message.api.enums.MessageBusinessTypeEnum; import cn.stylefeng.roses.kernel.message.api.enums.MessagePriorityLevelEnum; import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.io.Serializable; @@ -46,66 +47,79 @@ public class MessageResponse implements Serializable { /** * 消息id */ + @ChineseDescription("消息id") private Long messageId; /** * 接收用户id */ + @ChineseDescription("接收用户id") private Long receiveUserId; /** * 发送用户id */ + @ChineseDescription("发送用户id") private Long sendUserId; /** * 消息标题 */ + @ChineseDescription("消息标题") private String messageTitle; /** * 消息的内容 */ + @ChineseDescription("消息内容") private String messageContent; /** * 消息优先级 */ + @ChineseDescription("消息优先级") private String priorityLevel; /** * 消息类型 */ + @ChineseDescription("消息类型") private String messageType; /** * 消息发送时间 */ + @ChineseDescription("消息发送时间") private Date messageSendTime; /** * 业务id */ + @ChineseDescription("业务id") private Long businessId; /** * 业务类型 */ + @ChineseDescription("业务类型") private String businessType; /** * 阅读状态：0-未读，1-已读 */ + @ChineseDescription("阅读状态：0-未读，1-已读") private Integer readFlag; /** * 消息优先级 */ + @ChineseDescription("消息优先级") private String priorityLevelValue; /** * 阅读状态：0-未读，1-已读 */ + @ChineseDescription("阅读状态：0-未读，1-已读") private String readFlagValue; public String getPriorityLevelValue(){ diff --git a/kernel-s-migration/migration-api/src/main/java/cn/stylefeng/roses/kernel/migration/api/pojo/MigrationAggregationPOJO.java b/kernel-s-migration/migration-api/src/main/java/cn/stylefeng/roses/kernel/migration/api/pojo/MigrationAggregationPOJO.java index cc4a53fb2..611dacfd4 100644 --- a/kernel-s-migration/migration-api/src/main/java/cn/stylefeng/roses/kernel/migration/api/pojo/MigrationAggregationPOJO.java +++ b/kernel-s-migration/migration-api/src/main/java/cn/stylefeng/roses/kernel/migration/api/pojo/MigrationAggregationPOJO.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.migration.api.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; @@ -20,12 +21,14 @@ public class MigrationAggregationPOJO extends BaseRequest { * 应用和模块名称列表 */ @NotNull(message = "模块名称不能为空", groups = {export.class, restore.class}) + @ChineseDescription("应用和模块名称列表") private List appAndModuleNameList; /** * 数据集 */ @NotNull(message = "数据集不能为空", groups = {restore.class}) + @ChineseDescription("数据集") private Map data; /** diff --git a/kernel-s-migration/migration-business-web/src/main/java/cn/stylefeng/roses/kernel/migration/web/pojo/MigrationRequest.java b/kernel-s-migration/migration-business-web/src/main/java/cn/stylefeng/roses/kernel/migration/web/pojo/MigrationRequest.java index 8daeb7ee5..3599718e7 100644 --- a/kernel-s-migration/migration-business-web/src/main/java/cn/stylefeng/roses/kernel/migration/web/pojo/MigrationRequest.java +++ b/kernel-s-migration/migration-business-web/src/main/java/cn/stylefeng/roses/kernel/migration/web/pojo/MigrationRequest.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.migration.web.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.util.List; @@ -16,11 +17,13 @@ public class MigrationRequest { /** * 应用名称 */ + @ChineseDescription("应用名称") private String appName; /** * 模块列表 */ + @ChineseDescription("模块列表") private List moduleNames; } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeDTO.java index 2e36ef2aa..50825a8b1 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeDTO.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.system.api.pojo.theme; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.util.Date; @@ -16,35 +17,42 @@ public class SysThemeDTO { /** * 主键ID */ + @ChineseDescription("主键id") private Long themeId; /** * 主题名称 */ + @ChineseDescription("主题名称") private String themeName; /** * 主题属性(JSON格式) */ + @ChineseDescription("主题属性(JSON格式)") private String themeValue; /** * 主题模板ID */ + @ChineseDescription("主题模板id") private Long templateId; /** * 启用状态：Y-启用，N-禁用 */ + @ChineseDescription("启用状态：Y-启用，N-禁用") private Character statusFlag; /** * 模板名称，用于前端数据渲染 */ + @ChineseDescription("模板名称，用于前端数据渲染") private String templateName; /** * 创建时间 */ + @ChineseDescription("创建时间") private Date createTime; } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeTemplateDataDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeTemplateDataDTO.java index c51806e29..bfcfce0e4 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeTemplateDataDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/theme/SysThemeTemplateDataDTO.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.system.api.pojo.theme; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; /** @@ -14,50 +15,60 @@ public class SysThemeTemplateDataDTO { /** * 主键ID */ + @ChineseDescription("主键id") private Long templateId; /** * 主题模板名称 */ + @ChineseDescription("主题模板名称") private String templateName; /** * 主题模板编码 */ + @ChineseDescription("主题模板编码") private String templateCode; /** * 主键ID */ + @ChineseDescription("属性字段id") private Long fieldId; /** * 属性名称 */ + @ChineseDescription("属性名称") private String fieldName; /** * 属性编码 */ + @ChineseDescription("想属性编码") private String fieldCode; /** - * 属性展示类型(字典维护) + * 属性展示类型 */ + @ChineseDescription("属性展示类型") private String fieldType; /** * 是否必填：Y-必填，N-非必填 */ + @ChineseDescription("是否必填：Y-必填，N-非必填") private Character fieldRequired; /** * 属性长度 */ + @ChineseDescription("属性长度") private Integer fieldLength; /** * 属性描述 */ + @ChineseDescription("属性描述") private String fieldDescription; } diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java index 5c5107c54..9f2271a44 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java @@ -1,10 +1,12 @@ package cn.stylefeng.roses.kernel.system.modular.home.controller; +import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsCount; import cn.stylefeng.roses.kernel.system.modular.home.pojo.request.SysStatisticsCountRequest; import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsCountService; import org.springframework.validation.annotation.Validated; @@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 常用功能的统计次数控制器 @@ -33,9 +36,9 @@ public class SysStatisticsController { * @date 2022/02/10 21:17 */ @PostResource(name = "添加", path = "/sysStatisticsCount/add") - public ResponseData add(@RequestBody @Validated(SysStatisticsCountRequest.add.class) SysStatisticsCountRequest sysStatisticsCountRequest) { + public ResponseData add(@RequestBody @Validated(SysStatisticsCountRequest.add.class) SysStatisticsCountRequest sysStatisticsCountRequest) { sysStatisticsCountService.add(sysStatisticsCountRequest); - return new SuccessResponseData(); + return new SuccessResponseData<>(); } /** @@ -45,9 +48,9 @@ public class SysStatisticsController { * @date 2022/02/10 21:17 */ @PostResource(name = "删除", path = "/sysStatisticsCount/delete") - public ResponseData delete(@RequestBody @Validated(SysStatisticsCountRequest.delete.class) SysStatisticsCountRequest sysStatisticsCountRequest) { + public ResponseData delete(@RequestBody @Validated(SysStatisticsCountRequest.delete.class) SysStatisticsCountRequest sysStatisticsCountRequest) { sysStatisticsCountService.del(sysStatisticsCountRequest); - return new SuccessResponseData(); + return new SuccessResponseData<>(); } /** @@ -57,9 +60,9 @@ public class SysStatisticsController { * @date 2022/02/10 21:17 */ @PostResource(name = "编辑", path = "/sysStatisticsCount/edit") - public ResponseData edit(@RequestBody @Validated(SysStatisticsCountRequest.edit.class) SysStatisticsCountRequest sysStatisticsCountRequest) { + public ResponseData edit(@RequestBody @Validated(SysStatisticsCountRequest.edit.class) SysStatisticsCountRequest sysStatisticsCountRequest) { sysStatisticsCountService.edit(sysStatisticsCountRequest); - return new SuccessResponseData(); + return new SuccessResponseData<>(); } /** @@ -69,8 +72,8 @@ public class SysStatisticsController { * @date 2022/02/10 21:17 */ @GetResource(name = "查看详情", path = "/sysStatisticsCount/detail") - public ResponseData detail(@Validated(SysStatisticsCountRequest.detail.class) SysStatisticsCountRequest sysStatisticsCountRequest) { - return new SuccessResponseData(sysStatisticsCountService.detail(sysStatisticsCountRequest)); + public ResponseData detail(@Validated(SysStatisticsCountRequest.detail.class) SysStatisticsCountRequest sysStatisticsCountRequest) { + return new SuccessResponseData<>(sysStatisticsCountService.detail(sysStatisticsCountRequest)); } /** @@ -80,8 +83,8 @@ public class SysStatisticsController { * @date 2022/02/10 21:17 */ @GetResource(name = "获取列表", path = "/sysStatisticsCount/list") - public ResponseData list(SysStatisticsCountRequest sysStatisticsCountRequest) { - return new SuccessResponseData(sysStatisticsCountService.findList(sysStatisticsCountRequest)); + public ResponseData> list(SysStatisticsCountRequest sysStatisticsCountRequest) { + return new SuccessResponseData<>(sysStatisticsCountService.findList(sysStatisticsCountRequest)); } /** @@ -91,8 +94,8 @@ public class SysStatisticsController { * @date 2022/02/10 21:17 */ @GetResource(name = "分页查询", path = "/sysStatisticsCount/page") - public ResponseData page(SysStatisticsCountRequest sysStatisticsCountRequest) { - return new SuccessResponseData(sysStatisticsCountService.findPage(sysStatisticsCountRequest)); + public ResponseData> page(SysStatisticsCountRequest sysStatisticsCountRequest) { + return new SuccessResponseData<>(sysStatisticsCountService.findPage(sysStatisticsCountRequest)); } } diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java index d1d068e68..00e4488d8 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.home.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -23,24 +24,28 @@ public class SysStatisticsCount extends BaseEntity { * 主键ID */ @TableId(value = "stat_count_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long statCountId; /** * 用户id */ @TableField("user_id") + @ChineseDescription("用户id") private Long userId; /** * 访问的地址 */ @TableField("stat_url_id") + @ChineseDescription("访问地址") private Long statUrlId; /** * 访问的次数 */ @TableField("stat_count") + @ChineseDescription("访问次数") private Integer statCount; } diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java index 527d4b12c..a83c7dbe1 100644 --- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java +++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.system.modular.theme.pojo; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import lombok.Data; import java.util.Map; @@ -16,41 +17,49 @@ public class DefaultTheme { /** * 平台名称 */ + @ChineseDescription("平台名称") private String gunsMgrName; /** * 登录页背景图片 */ + @ChineseDescription("登录页背景图片") private String gunsMgrLoginBackgroundImg; /** * 平台LOGO */ + @ChineseDescription("平台LOGO") private String gunsMgrLogo; /** * 浏览器Icon */ + @ChineseDescription("浏览器Icon") private String gunsMgrFavicon; /** * 页脚文字 */ + @ChineseDescription("页脚文字") private String gunsMgrFooterText; /** * 备案号 */ + @ChineseDescription("备案号") private String gunsMgrBeiNo; /** * 备案号跳转链接 */ + @ChineseDescription("备案号跳转链接") private String gunsMgrBeiUrl; /** * 其他的主题配置 */ + @ChineseDescription("其他的主题配置") private Map otherConfigs; } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java index 4b97326dd..a07c88a79 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -45,18 +46,21 @@ public class SysUserRole extends BaseEntity { * 主键 */ @TableId(value = "user_role_id", type = IdType.ASSIGN_ID) + @ChineseDescription("主键id") private Long userRoleId; /** * 用户id */ @TableField("user_id") + @ChineseDescription("用户id") private Long userId; /** * 角色id */ @TableField("role_id") + @ChineseDescription("角色id") private Long roleId; }