Merge branch 'dev' into test

This commit is contained in:
chenbowen
2025-12-17 20:18:58 +08:00

View File

@@ -529,25 +529,30 @@ COMMENT ON TABLE infra_job_log IS '定时任务日志表';
-- ---------------------------- -- ----------------------------
CREATE TABLE system_dept ( CREATE TABLE system_dept (
id bigint NOT NULL PRIMARY KEY, id bigint NOT NULL PRIMARY KEY,
name varchar(30) DEFAULT '' NULL, code varchar(50) DEFAULT '' NULL,
name varchar(250) DEFAULT '' NULL,
short_name varchar(20) DEFAULT '' NULL,
parent_id bigint DEFAULT 0 NOT NULL, parent_id bigint DEFAULT 0 NOT NULL,
sort int DEFAULT 0 NOT NULL, sort int DEFAULT 0 NOT NULL,
leader_user_id bigint DEFAULT NULL NULL, leader_user_id bigint DEFAULT NULL NULL,
phone varchar(11) DEFAULT NULL NULL, phone varchar(15) DEFAULT NULL NULL,
email varchar(50) DEFAULT NULL NULL, email varchar(50) DEFAULT NULL NULL,
status smallint NOT NULL, status smallint NOT NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL, deleted bit DEFAULT '0' NOT NULL,
tenant_id bigint DEFAULT 0 NOT NULL, tenant_id bigint DEFAULT 0 NOT NULL,
is_company bit DEFAULT '0' NOT NULL, is_company bit DEFAULT '0' NOT NULL,
is_group bit DEFAULT '0' NOT NULL is_group bit DEFAULT '0' NOT NULL,
dept_source tinyint DEFAULT 1 NOT NULL
); );
COMMENT ON COLUMN system_dept.id IS '部门id'; COMMENT ON COLUMN system_dept.id IS '部门id';
COMMENT ON COLUMN system_dept.code IS '部门编码';
COMMENT ON COLUMN system_dept.name IS '部门名称'; COMMENT ON COLUMN system_dept.name IS '部门名称';
COMMENT ON COLUMN system_dept.short_name IS '部门简称';
COMMENT ON COLUMN system_dept.parent_id IS '父部门id'; COMMENT ON COLUMN system_dept.parent_id IS '父部门id';
COMMENT ON COLUMN system_dept.sort IS '显示顺序'; COMMENT ON COLUMN system_dept.sort IS '显示顺序';
COMMENT ON COLUMN system_dept.leader_user_id IS '负责人'; COMMENT ON COLUMN system_dept.leader_user_id IS '负责人';
@@ -562,8 +567,47 @@ COMMENT ON COLUMN system_dept.deleted IS '是否删除';
COMMENT ON COLUMN system_dept.tenant_id IS '租户编号'; COMMENT ON COLUMN system_dept.tenant_id IS '租户编号';
COMMENT ON COLUMN system_dept.is_company IS '是否公司'; COMMENT ON COLUMN system_dept.is_company IS '是否公司';
COMMENT ON COLUMN system_dept.is_group IS '是否集团'; COMMENT ON COLUMN system_dept.is_group IS '是否集团';
COMMENT ON COLUMN system_dept.dept_source IS '部门来源: 1-外部部门, 2-同步部门';
COMMENT ON TABLE system_dept IS '部门表'; COMMENT ON TABLE system_dept IS '部门表';
-- ----------------------------
-- Table structure for system_dept_external_code
-- ----------------------------
CREATE TABLE system_dept_external_code (
id bigint NOT NULL PRIMARY KEY,
dept_id bigint NOT NULL,
system_code varchar(64) NOT NULL,
external_dept_code varchar(128) NOT NULL,
external_dept_name varchar(255) DEFAULT NULL NULL,
status tinyint DEFAULT 0 NOT NULL,
remark varchar(512) DEFAULT NULL NULL,
tenant_id bigint DEFAULT 0 NULL,
creator varchar(64) DEFAULT NULL NULL,
create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT NULL NULL,
update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted tinyint DEFAULT 0 NOT NULL
);
CREATE UNIQUE INDEX uk_system_dept_external_code_ext ON system_dept_external_code (tenant_id, system_code, external_dept_code);
CREATE UNIQUE INDEX uk_system_dept_external_code_dept ON system_dept_external_code (tenant_id, system_code, dept_id);
CREATE INDEX idx_system_dept_external_code_dept ON system_dept_external_code (tenant_id, dept_id);
COMMENT ON TABLE system_dept_external_code IS '部门外部组织编码映射';
COMMENT ON COLUMN system_dept_external_code.id IS '主键编号';
COMMENT ON COLUMN system_dept_external_code.dept_id IS '本系统部门编号';
COMMENT ON COLUMN system_dept_external_code.system_code IS '外部系统标识';
COMMENT ON COLUMN system_dept_external_code.external_dept_code IS '外部组织编码';
COMMENT ON COLUMN system_dept_external_code.external_dept_name IS '外部组织名称';
COMMENT ON COLUMN system_dept_external_code.status IS '状态0开启 1关闭';
COMMENT ON COLUMN system_dept_external_code.remark IS '备注';
COMMENT ON COLUMN system_dept_external_code.tenant_id IS '租户编号';
COMMENT ON COLUMN system_dept_external_code.creator IS '创建者';
COMMENT ON COLUMN system_dept_external_code.create_time IS '创建时间';
COMMENT ON COLUMN system_dept_external_code.updater IS '更新者';
COMMENT ON COLUMN system_dept_external_code.update_time IS '更新时间';
COMMENT ON COLUMN system_dept_external_code.deleted IS '删除标记';
-- ---------------------------- -- ----------------------------
-- Records of system_dept -- Records of system_dept
-- ---------------------------- -- ----------------------------
@@ -601,9 +645,9 @@ CREATE TABLE system_dict_data (
css_class varchar(100) DEFAULT '' NULL, css_class varchar(100) DEFAULT '' NULL,
remark varchar(500) DEFAULT NULL NULL, remark varchar(500) DEFAULT NULL NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL deleted bit DEFAULT '0' NOT NULL
); );
@@ -1231,6 +1275,7 @@ INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_t
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2171, 30, 'ROCKETMQ', '30', 'iot_data_bridge_type_enum', 0, 'primary', '', '', '1', '2025-03-09 12:41:30', '1', '2025-03-17 09:40:46', '0'); INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2171, 30, 'ROCKETMQ', '30', 'iot_data_bridge_type_enum', 0, 'primary', '', '', '1', '2025-03-09 12:41:30', '1', '2025-03-17 09:40:46', '0');
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2172, 31, 'RABBITMQ', '31', 'iot_data_bridge_type_enum', 0, 'primary', '', '', '1', '2025-03-09 12:41:47', '1', '2025-03-17 09:40:46', '0'); INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2172, 31, 'RABBITMQ', '31', 'iot_data_bridge_type_enum', 0, 'primary', '', '', '1', '2025-03-09 12:41:47', '1', '2025-03-17 09:40:46', '0');
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2173, 32, 'KAFKA', '32', 'iot_data_bridge_type_enum', 0, 'primary', '', '', '1', '2025-03-09 12:41:59', '1', '2025-03-17 09:40:46', '0'); INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2173, 32, 'KAFKA', '32', 'iot_data_bridge_type_enum', 0, 'primary', '', '', '1', '2025-03-09 12:41:59', '1', '2025-03-17 09:40:46', '0');
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (2005001, 1, 'ERP 系统', 'ERP', 'system_dept_external_system', 0, '', '', '企业资源计划系统', 'admin', '2025-05-17 00:00:00', 'admin', '2025-05-17 00:00:00', '0');
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3000, 16, '百川智能', 'BaiChuan', 'ai_platform', 0, '', '', '', '1', '2025-03-23 12:15:46', '1', '2025-03-23 12:15:46', '0'); INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3000, 16, '百川智能', 'BaiChuan', 'ai_platform', 0, '', '', '', '1', '2025-03-23 12:15:46', '1', '2025-03-23 12:15:46', '0');
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3001, 50, 'Vben5.0 Ant Design Schema 模版', '40', 'infra_codegen_front_type', 0, '', '', NULL, '1', '2025-04-23 21:47:47', '1', '2025-05-02 12:01:15', '0'); INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3001, 50, 'Vben5.0 Ant Design Schema 模版', '40', 'infra_codegen_front_type', 0, '', '', NULL, '1', '2025-04-23 21:47:47', '1', '2025-05-02 12:01:15', '0');
INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3002, 6, '支付宝余额', '6', 'brokerage_withdraw_type', 0, '', '', 'API 打款', '1', '2025-05-10 08:24:49', '1', '2025-05-10 08:24:49', '0'); INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted) VALUES (3002, 6, '支付宝余额', '6', 'brokerage_withdraw_type', 0, '', '', 'API 打款', '1', '2025-05-10 08:24:49', '1', '2025-05-10 08:24:49', '0');
@@ -1248,11 +1293,11 @@ CREATE TABLE system_dict_type (
status smallint DEFAULT 0 NOT NULL, status smallint DEFAULT 0 NOT NULL,
remark varchar(500) DEFAULT NULL NULL, remark varchar(500) DEFAULT NULL NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL, deleted bit DEFAULT '0' NOT NULL,
deleted_time datetime DEFAULT NULL NULL deleted_time datetime(6) DEFAULT NULL NULL
); );
COMMENT ON COLUMN system_dict_type.id IS '字典主键'; COMMENT ON COLUMN system_dict_type.id IS '字典主键';
@@ -1380,6 +1425,7 @@ INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_ti
INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (1011, 'IoT 物模型单位', 'iot_thing_model_unit', 0, '', '1', '2024-12-25 17:36:46', '1', '2025-03-17 09:25:35', '0', '1970-01-01 00:00:00'); INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (1011, 'IoT 物模型单位', 'iot_thing_model_unit', 0, '', '1', '2024-12-25 17:36:46', '1', '2025-03-17 09:25:35', '0', '1970-01-01 00:00:00');
INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (1012, 'IoT 数据桥接的方向枚举', 'iot_data_bridge_direction_enum', 0, '', '1', '2025-03-09 12:37:40', '1', '2025-03-17 09:25:39', '0', '1970-01-01 00:00:00'); INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (1012, 'IoT 数据桥接的方向枚举', 'iot_data_bridge_direction_enum', 0, '', '1', '2025-03-09 12:37:40', '1', '2025-03-17 09:25:39', '0', '1970-01-01 00:00:00');
INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (1013, 'IoT 数据桥梁的类型枚举', 'iot_data_bridge_type_enum', 0, '', '1', '2025-03-09 12:39:36', '1', '2025-04-06 17:09:46', '0', '1970-01-01 00:00:00'); INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (1013, 'IoT 数据桥梁的类型枚举', 'iot_data_bridge_type_enum', 0, '', '1', '2025-03-09 12:39:36', '1', '2025-04-06 17:09:46', '0', '1970-01-01 00:00:00');
INSERT INTO system_dict_type (id, name, type, status, remark, creator, create_time, updater, update_time, deleted, deleted_time) VALUES (20050, '外部系统标识', 'system_dept_external_system', 0, '部门外部组织编码中的外部系统标识', 'admin', '2025-05-17 00:00:00', 'admin', '2025-05-17 00:00:00', '0', '1970-01-01 00:00:00');
COMMIT; COMMIT;
-- SET IDENTITY_INSERT system_dict_type OFF; -- SET IDENTITY_INSERT system_dict_type OFF;
-- @formatter:on -- @formatter:on
@@ -1398,9 +1444,9 @@ CREATE TABLE system_login_log (
user_ip varchar(50) NOT NULL, user_ip varchar(50) NOT NULL,
user_agent varchar(512) NOT NULL, user_agent varchar(512) NOT NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL, deleted bit DEFAULT '0' NOT NULL,
tenant_id bigint DEFAULT 0 NOT NULL tenant_id bigint DEFAULT 0 NOT NULL
); );
@@ -1435,9 +1481,9 @@ CREATE TABLE system_mail_account (
ssl_enable bit DEFAULT '0' NOT NULL, ssl_enable bit DEFAULT '0' NOT NULL,
starttls_enable bit DEFAULT '0' NOT NULL, starttls_enable bit DEFAULT '0' NOT NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL deleted bit DEFAULT '0' NOT NULL
); );
@@ -1486,13 +1532,13 @@ CREATE TABLE system_mail_log (
template_content varchar(10240) NOT NULL, template_content varchar(10240) NOT NULL,
template_params varchar(255) NOT NULL, template_params varchar(255) NOT NULL,
send_status smallint DEFAULT 0 NOT NULL, send_status smallint DEFAULT 0 NOT NULL,
send_time datetime DEFAULT NULL NULL, send_time datetime(6) DEFAULT NULL NULL,
send_message_id varchar(255) DEFAULT NULL NULL, send_message_id varchar(255) DEFAULT NULL NULL,
send_exception varchar(4096) DEFAULT NULL NULL, send_exception varchar(4096) DEFAULT NULL NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL deleted bit DEFAULT '0' NOT NULL
); );
@@ -1534,9 +1580,9 @@ CREATE TABLE system_mail_template (
status smallint NOT NULL, status smallint NOT NULL,
remark varchar(255) DEFAULT NULL NULL, remark varchar(255) DEFAULT NULL NULL,
creator varchar(64) DEFAULT '' NULL, creator varchar(64) DEFAULT '' NULL,
create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, create_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
updater varchar(64) DEFAULT '' NULL, updater varchar(64) DEFAULT '' NULL,
update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_time datetime(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
deleted bit DEFAULT '0' NOT NULL deleted bit DEFAULT '0' NOT NULL
); );