From d191ec10e3383fe8b0fd65ada6bcec90e85aa390 Mon Sep 17 00:00:00 2001 From: wangyu <727842003@qq.com> Date: Sun, 30 Jun 2024 16:21:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/domain/record/ApproveRecord.java | 3 +- .../src/main/resources/schema.sql | 21 +++ .../framework/backup/domain/Backup.java | 2 +- flyfish-backup/src/main/resources/schema.sql | 19 +++ .../framework/domain/po/Department.java | 4 +- .../framework/domain/po/ExcelMapping.java | 2 +- .../framework/domain/po/Permission.java | 2 +- .../com/flyfish/framework/domain/po/Role.java | 2 +- .../com/flyfish/framework/domain/po/User.java | 15 +- .../src/main/resources/schema.sql | 130 ++++++++++++++++++ .../src/test/resources/schema-clean.sql | 1 - .../r2dbc/config/R2dbcDataConfig.java | 22 ++- .../src/test/resources/schema.sql | 8 +- flyfish-data/scripts/schema.sql | 15 -- .../framework/dict/domain/AutoComplete.java | 2 +- .../framework/dict/domain/Dictionary.java | 2 +- flyfish-dict/src/main/resources/schema.sql | 35 +++++ .../framework/file/domain/Attachment.java | 2 +- .../src/main}/resources/schema.sql | 10 +- .../framework/form/domain/OnlineForm.java | 2 +- flyfish-form/src/main/resources/schema.sql | 21 +++ .../flyfish/framework/logging/domain/Log.java | 5 +- flyfish-logging/src/main/resources/schema.sql | 22 +++ .../framework/beans/meta/RestBean.java | 3 +- 24 files changed, 300 insertions(+), 50 deletions(-) create mode 100644 flyfish-approval/src/main/resources/schema.sql create mode 100644 flyfish-backup/src/main/resources/schema.sql create mode 100644 flyfish-data/flyfish-data-domain/src/main/resources/schema.sql delete mode 100644 flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql delete mode 100644 flyfish-data/scripts/schema.sql create mode 100644 flyfish-dict/src/main/resources/schema.sql rename {flyfish-data/flyfish-data-mongodb/src/test => flyfish-file/src/main}/resources/schema.sql (58%) create mode 100644 flyfish-form/src/main/resources/schema.sql create mode 100644 flyfish-logging/src/main/resources/schema.sql diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java index 77133e2..4c86473 100644 --- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java +++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java @@ -14,7 +14,7 @@ import org.springframework.data.relational.core.mapping.Table; * @author wangyu */ @Document(collection = "approve-records") -@Table("approve_records") +@Table("t_approve_records") @Getter @Setter public class ApproveRecord extends AuditDomain { @@ -30,6 +30,7 @@ public class ApproveRecord extends AuditDomain { private String moduleName; // 数据id + @Column("data_id") private String dataId; // 审批人 diff --git a/flyfish-approval/src/main/resources/schema.sql b/flyfish-approval/src/main/resources/schema.sql new file mode 100644 index 0000000..379ea3a --- /dev/null +++ b/flyfish-approval/src/main/resources/schema.sql @@ -0,0 +1,21 @@ +CREATE TABLE IF NOT EXISTS `t_approve_records` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `approved` BIT(1) NULL DEFAULT b'0' COMMENT '是否已审批', + `module` VARCHAR(50) NOT NULL COMMENT '模块', + `module_name` VARCHAR(50) NULL COMMENT '模块名称', + `data_id` VARCHAR(36) NULL COMMENT '数据id', + `approver` VARCHAR(36) NULL COMMENT '审批人', + `action` VARCHAR(24) NULL COMMENT '审批动作', + `opinion` VARCHAR(500) NULL COMMENT '审批意见', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '审批记录'; diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java b/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java index e550901..5b0570f 100644 --- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java +++ b/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java @@ -16,7 +16,7 @@ import org.springframework.data.relational.core.mapping.Table; @Getter @Setter @Document(collection = "backups") -@Table("backup") +@Table("t_backup") public class Backup extends AuditDomain { // 文件路径 diff --git a/flyfish-backup/src/main/resources/schema.sql b/flyfish-backup/src/main/resources/schema.sql new file mode 100644 index 0000000..e43f1a1 --- /dev/null +++ b/flyfish-backup/src/main/resources/schema.sql @@ -0,0 +1,19 @@ +CREATE TABLE IF NOT EXISTS `t_backup` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `filepath` VARCHAR(1000) NULL COMMENT '文件路径', + `log` TEXT NULL COMMENT '备份日志', + `status` VARCHAR(24) NULL COMMENT '备份状态', + `period` BIGINT NULL COMMENT '备份耗时', + `size` VARCHAR(64) NULL COMMENT '备份大小', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '备份记录表'; diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java index cbf94e8..0b8864f 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java @@ -12,7 +12,7 @@ import org.springframework.data.relational.core.mapping.Table; * @author wangyu */ @Document("departments") -@Table("department") +@Table("t_department") @Getter @Setter @NoArgsConstructor @@ -56,5 +56,5 @@ public class Department extends TreeDomain { /** * 排序字段 */ - private String pos; + private Integer pos; } diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java index b9c7426..6feb850 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java @@ -16,7 +16,7 @@ import java.util.Map; @Getter @Setter @Document(collection = "excel-mappings") -@Table("excel_mappings") +@Table("t_excel_mapping") public class ExcelMapping extends AuditDomain { // 映射关系 diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java index f2566de..a0fa828 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java @@ -14,7 +14,7 @@ import org.springframework.data.relational.core.mapping.Table; * @author wangyu */ @Document("permissions") -@Table("permission") +@Table("t_permission") @Data public class Permission extends TreeDomain { diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java index 9e00f87..efbd257 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java @@ -17,7 +17,7 @@ import java.util.List; * @author wangyu */ @Document("roles") -@Table("role") +@Table("t_role") @Data @Builder @AllArgsConstructor diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java index d3ccd6e..7a10646 100644 --- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java +++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java @@ -23,7 +23,7 @@ import java.time.LocalDateTime; import java.util.List; @Document("users") -@Table("user") +@Table("t_user") @Data @Builder @NoArgsConstructor @@ -97,12 +97,6 @@ public class User extends AuditDomain implements IUser { @Column("open_id") private String openId; - /** - * 查询冗余，标记用户信息 - */ - @Transient - private Object detail; - /** * 当前用户的鉴权标记 */ @@ -120,6 +114,13 @@ public class User extends AuditDomain implements IUser { @Column("last_time") private LocalDateTime lastTime; + /** + * 查询冗余，标记用户信息 + */ + @Transient + private Object detail; + + @Override public User toUser() { return this; diff --git a/flyfish-data/flyfish-data-domain/src/main/resources/schema.sql b/flyfish-data/flyfish-data-domain/src/main/resources/schema.sql new file mode 100644 index 0000000..5552b04 --- /dev/null +++ b/flyfish-data/flyfish-data-domain/src/main/resources/schema.sql @@ -0,0 +1,130 @@ +CREATE TABLE IF NOT EXISTS `t_user` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `type` VARCHAR(24) NULL COMMENT '用户类型', + `status` VARCHAR(24) NULL COMMENT '用户状态', + `phone` VARCHAR(16) NOT NULL COMMENT '电话号码', + `username` VARCHAR(50) NOT NULL COMMENT '用户名', + `password` VARCHAR(128) NULL COMMENT '密码', + `enable` BIT(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `app` BIT(1) NOT NULL DEFAULT b'0' COMMENT '能否登录移动端', + `valid_date` DATE NULL COMMENT '有效期至', + `open_id` VARCHAR(64) NULL COMMENT '微信openid', + `authority` VARCHAR(50) NULL COMMENT '当前用户鉴权标记', + `error_count` INT NOT NULL DEFAULT 0 COMMENT '错误次数', + `last_time` DATETIME NULL COMMENT '上次登录时间', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`), + UNIQUE KEY uniq_name (`username`) +) COMMENT '用户表'; + +CREATE TABLE IF NOT EXISTS `t_department` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `full_name` VARCHAR(300) NOT NULL COMMENT '完整名称', + `primary` BIT(1) NOT NULL DEFAULT b'0' COMMENT '默认选中', + `manager` VARCHAR(36) NULL COMMENT '负责人', + `phone` VARCHAR(15) NULL COMMENT '联系电话', + `address` VARCHAR(150) NULL COMMENT '联系地址', + `leaf` BIT(1) NULL COMMENT '是否是叶子节点', + `pos` INT NOT NULL DEFAULT b'0' COMMENT '排序字段', + `parent_id` VARCHAR(36) NULL DEFAULT NULL COMMENT '上级id', + `parent_ids` JSON NULL COMMENT '冗余的上级id集合', + `depth` INT NULL COMMENT '深度', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '部门表'; + +CREATE TABLE IF NOT EXISTS `rel_user_depart` +( + `user_id` VARCHAR(36) NOT NULL COMMENT '用户id', + `depart_id` VARCHAR(36) NOT NULL COMMENT '部门id', + PRIMARY KEY (`user_id`, `depart_id`) +) COMMENT '用户部门关系表'; + +CREATE TABLE IF NOT EXISTS `t_role` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `description` VARCHAR(500) NULL COMMENT '描述', + `admin` BIT(1) NOT NULL DEFAULT b'0' COMMENT '是否是管理员', + `system` BIT(1) NOT NULL DEFAULT b'0' COMMENT '是否是系统内置', + `type` VARCHAR(24) NOT NULL COMMENT '所属平台', + `authorities` JSON NULL COMMENT '角色拥有的数据权限', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '角色表'; + +CREATE TABLE IF NOT EXISTS `rel_user_role` +( + `user_id` VARCHAR(36) NOT NULL COMMENT '用户id', + `role_id` VARCHAR(36) NOT NULL COMMENT '角色id', + PRIMARY KEY (`user_id`, `role_id`) +) COMMENT '用户角色关系表'; + +CREATE TABLE IF NOT EXISTS `t_permission` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `type` VARCHAR(24) NOT NULL COMMENT '权限类型', + `admin` BIT(1) NOT NULL DEFAULT b'0' COMMENT '是否是管理员权限', + `leaf` BIT(1) NULL COMMENT '是否是叶子节点', + `parent_id` VARCHAR(36) NULL DEFAULT NULL COMMENT '上级id', + `parent_ids` JSON NULL COMMENT '冗余的上级id集合', + `depth` INT NULL COMMENT '深度', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '权限定义表'; + +CREATE TABLE IF NOT EXISTS `rel_role_permission` +( + `role_id` VARCHAR(36) NOT NULL COMMENT '角色id', + `permission_id` VARCHAR(36) NOT NULL COMMENT '权限id', + PRIMARY KEY (`role_id`, `permission_id`) +) COMMENT '角色权限关系表'; + +CREATE TABLE IF NOT EXISTS `t_excel_mapping` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `content` JSON NOT NULL COMMENT '映射关系', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT 'Excel映射方案'; diff --git a/flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql b/flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql deleted file mode 100644 index ea9d6dd..0000000 --- a/flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE IF EXISTS `test`; diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java index e0d1dc8..334681c 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java @@ -9,10 +9,13 @@ import com.flyfish.framework.r2dbc.repository.factory.DefaultReactiveRepositoryF import com.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository; import com.flyfish.framework.repository.ReactiveEntityOperations; import io.r2dbc.spi.ConnectionFactory; +import org.apache.commons.lang3.ArrayUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.data.mapping.callback.EntityCallback; import org.springframework.data.r2dbc.config.EnableR2dbcAuditing; import org.springframework.data.r2dbc.core.R2dbcEntityOperations; @@ -23,6 +26,7 @@ import org.springframework.r2dbc.connection.init.ConnectionFactoryInitializer; import org.springframework.r2dbc.connection.init.DatabasePopulator; import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator; +import java.io.IOException; import java.util.Optional; /** @@ -66,13 +70,13 @@ public class R2dbcDataConfig { initializer.setConnectionFactory(connectionFactory); CompositeDatabasePopulator populator = new CompositeDatabasePopulator(); // 添加主要脚本 - preparePopulator("schema.sql").ifPresent(populator::addPopulators); + preparePopulator("classpath*:schema.sql").ifPresent(populator::addPopulators); // 动态执行方言脚本 - preparePopulator("dialect/" + connectionFactory.getMetadata().getName().toLowerCase() + ".sql") + preparePopulator("classpath*:dialect/" + connectionFactory.getMetadata().getName().toLowerCase() + ".sql") .ifPresent(populator::addPopulators); initializer.setDatabasePopulator(populator); // 添加清理脚本 - preparePopulator("schema-clean.sql").ifPresent(initializer::setDatabaseCleaner); + preparePopulator("classpath*:schema-clean.sql").ifPresent(initializer::setDatabaseCleaner); // 返回初始化器 return initializer; } @@ -84,9 +88,13 @@ public class R2dbcDataConfig { * @return 结果 */ private Optional preparePopulator(String path) { - ClassPathResource schema = new ClassPathResource(path); - if (schema.exists()) { - return Optional.of(new ResourceDatabasePopulator(schema)); + ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + try { + Resource[] resources = resolver.getResources(path); + if (ArrayUtils.isNotEmpty(resources)) { + return Optional.of(new ResourceDatabasePopulator(resources)); + } + } catch (IOException ignored) { } return Optional.empty(); } diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/resources/schema.sql b/flyfish-data/flyfish-data-r2dbc/src/test/resources/schema.sql index ae0decb..e5a82c2 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/test/resources/schema.sql +++ b/flyfish-data/flyfish-data-r2dbc/src/test/resources/schema.sql @@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `test` `name` VARCHAR(100) NOT NULL COMMENT '名称', `other_id` VARCHAR(36) NULL COMMENT '其他id', `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modify_time` DATETIME NOT NULL COMMENT '修改时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `creator` VARCHAR(36) NULL COMMENT '创建人名称', `creator_id` VARCHAR(36) NULL COMMENT '创建人id', `modifier` VARCHAR(36) NULL COMMENT '修改人名称', @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `test_child` `name` VARCHAR(100) NOT NULL COMMENT '名称', `parent_id` VARCHAR(36) NOT NULL COMMENT '父id', `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modify_time` DATETIME NOT NULL COMMENT '修改时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `creator` VARCHAR(36) NULL COMMENT '创建人名称', `creator_id` VARCHAR(36) NULL COMMENT '创建人id', `modifier` VARCHAR(36) NULL COMMENT '修改人名称', @@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS `test_asso` `code` VARCHAR(32) NOT NULL COMMENT '编码', `name` VARCHAR(100) NOT NULL COMMENT '名称', `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modify_time` DATETIME NOT NULL COMMENT '修改时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `creator` VARCHAR(36) NULL COMMENT '创建人名称', `creator_id` VARCHAR(36) NULL COMMENT '创建人id', `modifier` VARCHAR(36) NULL COMMENT '修改人名称', @@ -70,7 +70,7 @@ CREATE TABLE IF NOT EXISTS `test_other` `name` VARCHAR(100) NOT NULL COMMENT '名称', `test_id` VARCHAR(36) NOT NULL COMMENT '外部主键', `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modify_time` DATETIME NOT NULL COMMENT '修改时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `creator` VARCHAR(36) NULL COMMENT '创建人名称', `creator_id` VARCHAR(36) NULL COMMENT '创建人id', `modifier` VARCHAR(36) NULL COMMENT '修改人名称', diff --git a/flyfish-data/scripts/schema.sql b/flyfish-data/scripts/schema.sql deleted file mode 100644 index 86b2af2..0000000 --- a/flyfish-data/scripts/schema.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE IF NOT EXISTS `test` -( - `id` VARCHAR(36) NOT NULL COMMENT '主键', - `code` VARCHAR(32) NOT NULL COMMENT '编码', - `name` VARCHAR(100) NOT NULL COMMENT '名称', - `other_id` VARCHAR(36) NULL COMMENT '其他id', - `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modify_time` DATETIME NOT NULL COMMENT '修改时间', - `creator` VARCHAR(36) NULL COMMENT '创建人名称', - `creator_id` VARCHAR(36) NULL COMMENT '创建人id', - `modifier` VARCHAR(36) NULL COMMENT '修改人名称', - `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', - `delete` BIT(1) NOT NULL DEFAULT b'0', - PRIMARY KEY (`id`) -) COMMENT '测试表'; diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java index df2095e..c5f2fe8 100644 --- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java +++ b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java @@ -16,7 +16,7 @@ import java.util.List; @Getter @Setter @Document(collection = "auto-completes") -@Table("auto_complete") +@Table("t_auto_complete") public class AutoComplete extends AuditDomain { // 候选值列表 diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java index 7eab62b..874ecfd 100644 --- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java +++ b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java @@ -18,7 +18,7 @@ import java.util.Objects; @Getter @Setter @Document(collection = "dictionaries") -@Table("dictionary") +@Table("t_dictionary") public class Dictionary extends AuditDomain { // 字典表的值 diff --git a/flyfish-dict/src/main/resources/schema.sql b/flyfish-dict/src/main/resources/schema.sql new file mode 100644 index 0000000..04c4395 --- /dev/null +++ b/flyfish-dict/src/main/resources/schema.sql @@ -0,0 +1,35 @@ +CREATE TABLE IF NOT EXISTS `t_dictionary` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `values` JSON NULL COMMENT '字典值列表', + `description` VARCHAR(500) NULL COMMENT '字典描述', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '字典定义表'; + +CREATE TABLE IF NOT EXISTS `t_auto_complete` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `values` JSON NULL COMMENT '候选值列表', + `cascade` BIT(1) NULL COMMENT '是否多级联动', + `description` VARCHAR(500) NULL COMMENT '描述', + `delimiter` VARCHAR(10) NULL COMMENT '分隔符', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '自动完成数据源'; diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java b/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java index 8673d31..9d5b5ef 100644 --- a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java +++ b/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.relational.core.mapping.Table; @Document(collection = "attachments") -@Table("attachment") +@Table("t_attachment") @Getter @Setter @AllArgsConstructor diff --git a/flyfish-data/flyfish-data-mongodb/src/test/resources/schema.sql b/flyfish-file/src/main/resources/schema.sql similarity index 58% rename from flyfish-data/flyfish-data-mongodb/src/test/resources/schema.sql rename to flyfish-file/src/main/resources/schema.sql index 17ff389..119ebad 100644 --- a/flyfish-data/flyfish-data-mongodb/src/test/resources/schema.sql +++ b/flyfish-file/src/main/resources/schema.sql @@ -1,14 +1,18 @@ -CREATE TABLE IF NOT EXISTS `test` +CREATE TABLE IF NOT EXISTS `t_attachment` ( `id` VARCHAR(36) NOT NULL COMMENT '主键', `code` VARCHAR(32) NOT NULL COMMENT '编码', `name` VARCHAR(100) NOT NULL COMMENT '名称', + `size` VARCHAR(100) NULL COMMENT '文件大小', + `path` VARCHAR(500) NULL COMMENT '文件路径', + `url` VARCHAR(500) NULL COMMENT '文件URL', + `description` VARCHAR(500) NULL COMMENT '文件描述', `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modify_time` DATETIME NOT NULL COMMENT '修改时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `creator` VARCHAR(36) NULL COMMENT '创建人名称', `creator_id` VARCHAR(36) NULL COMMENT '创建人id', `modifier` VARCHAR(36) NULL COMMENT '修改人名称', `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', `delete` BIT(1) NOT NULL DEFAULT b'0', PRIMARY KEY (`id`) -) COMMENT '测试表'; +) COMMENT '附件表'; diff --git a/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java b/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java index f6645bf..e13e653 100644 --- a/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java +++ b/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java @@ -15,7 +15,7 @@ import java.util.List; */ @Document("online-forms") @CompoundIndex(name = "uniq_code", def = "{code: 1}", unique = true) -@Table("online_form") +@Table("t_online_form") @Data public class OnlineForm extends Domain { diff --git a/flyfish-form/src/main/resources/schema.sql b/flyfish-form/src/main/resources/schema.sql new file mode 100644 index 0000000..e15e7e3 --- /dev/null +++ b/flyfish-form/src/main/resources/schema.sql @@ -0,0 +1,21 @@ +CREATE TABLE IF NOT EXISTS `t_online_form` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `description` VARCHAR(500) NULL COMMENT '表单描述', + `form` JSON NULL COMMENT '表单配置', + `groups` JSON NULL COMMENT '表单分组', + `type` VARCHAR(10) NOT NULL DEFAULT 'default' COMMENT '表单样式', + `width` INT NOT NULL DEFAULT 1000 COMMENT '表单宽度', + `layout` JSON NULL COMMENT '默认布局', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`), + UNIQUE KEY (`code`) +) COMMENT '表单定义表'; diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java index 1ddb464..491b5cb 100644 --- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java +++ b/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java @@ -3,6 +3,7 @@ package com.flyfish.framework.logging.domain; import com.flyfish.framework.domain.base.Domain; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.Table; import java.time.LocalDateTime; @@ -11,7 +12,7 @@ import java.time.LocalDateTime; * 日志集合 */ @Document("logs") -@Table("log") +@Table("t_log") @Data public class Log extends Domain { @@ -43,9 +44,11 @@ public class Log extends Domain { private Long period; // 操作时间 + @Column("start_time") private LocalDateTime startTime; // 完成时间 + @Column("end_time") private LocalDateTime endTime; // 操作人 diff --git a/flyfish-logging/src/main/resources/schema.sql b/flyfish-logging/src/main/resources/schema.sql new file mode 100644 index 0000000..cd40453 --- /dev/null +++ b/flyfish-logging/src/main/resources/schema.sql @@ -0,0 +1,22 @@ +CREATE TABLE IF NOT EXISTS `t_log` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `type` VARCHAR(24) NOT NULL COMMENT '日志类型', + `business` VARCHAR(36) NULL COMMENT '业务类型', + `module` VARCHAR(36) NULL COMMENT '模块类型', + `signature` VARCHAR(250) NULL COMMENT '方法签名', + `uri` VARCHAR(300) NOT NULL COMMENT '请求地址', + `body` TEXT NULL COMMENT '请求参数', + `response` TEXT NULL COMMENT '响应结果', + `error` TEXT NULL COMMENT '错误日志', + `period` BIGINT NULL COMMENT '操作耗时', + `start_time` DATETIME NULL COMMENT '操作时间', + `end_time` DATETIME NULL COMMENT '完成时间', + `operator` VARCHAR(36) NULL COMMENT '操作人', + `ip` VARCHAR(50) NULL COMMENT '访问ip', + `success` BIT(1) NOT NULL DEFAULT b'0' COMMENT '成功状态', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '日志表'; diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java index 347a34c..508236e 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java @@ -37,7 +37,8 @@ public @interface RestBean { /** * 表名 - * @return + * + * @return 物理表名 */ @AliasFor(value = "value", annotation = Table.class) String table() default "";