TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-12-25 17:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

!106 feat：数据同步支持唯一键冲突策略

Browse Source 
* refactor：sql同步
* fix: 表格右键导出菜单换行符修复
* feat：数据同步支持唯一键冲突策略
This commit is contained in:
zongyangleo
2024-03-01 04:03:03 +00:00
committed by Coder慌
parent f93231da61
commit 76475e807e
38 changed files with 1117 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
server/resources/script/sql/mayfly-go-sqlite.sql
View File

@@ -39,6 +39,7 @@ CREATE TABLE IF NOT EXISTS "t_db" (
"modifier" text(32),
"is_deleted" integer(8) NOT NULL,
"delete_time" datetime,
"flow_procdef_key" text(64),
PRIMARY KEY ("id")
);
@@ -164,6 +165,7 @@ CREATE TABLE IF NOT EXISTS "t_db_data_sync_task" (
"recent_state" integer(1) NOT NULL,
"task_key" text(100),
"running_state" integer(1),
"duplicate_strategy" integer(1),
PRIMARY KEY ("id")
);
@@ -267,6 +269,9 @@ CREATE TABLE IF NOT EXISTS "t_db_sql_exec" (
"modifier_id" integer(20) NOT NULL,
"is_deleted" integer(8) NOT NULL,
"delete_time" datetime,
"status" integer(8),
"flow_biz_key" text(128),
"res" text(1000),
PRIMARY KEY ("id")
);
@@ -842,6 +847,12 @@ INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight,
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1709045735, 1708910975, '6egfEVYr/3r3hHEub/', 1, 1, '我的任务', 'procinst-tasks', 1708911263, '{"component":"flow/ProcinstTaskList","icon":"Tickets","isKeepAlive":true,"routeName":"ProcinstTaskList"}', 1, 'admin', 1, 'admin', '2024-02-27 22:55:35', '2024-02-27 22:56:35', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1708911264, 1708910975, '6egfEVYr/fw0Hhvye/', 1, 1, '流程定义', 'procdefs', 1708911264, '{"component":"flow/ProcdefList","icon":"List","isKeepAlive":true,"routeName":"ProcdefList"}', 1, 'admin', 1, 'admin', '2024-02-26 09:34:24', '2024-02-27 22:54:32', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1708910975, 0, '6egfEVYr/', 1, 1, '工单流程', '/flow', 60000000, '{"icon":"List","isKeepAlive":true,"routeName":"flow"}', 1, 'admin', 1, 'admin', '2024-02-26 09:29:36', '2024-02-26 15:37:52', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1709208354, 1708911264, '6egfEVYr/fw0Hhvye/b4cNf3iq/', 2, 1, '删除流程', 'flow:procdef:del', 1709208354, 'null', 1, 'admin', 1, 'admin', '2024-02-29 20:05:54', '2024-02-29 20:05:54', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1709208339, 1708911264, '6egfEVYr/fw0Hhvye/r9ZMTHqC/', 2, 1, '保存流程', 'flow:procdef:save', 1709208339, 'null', 1, 'admin', 1, 'admin', '2024-02-29 20:05:40', '2024-02-29 20:05:40', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1709103180, 1708910975, '6egfEVYr/oNCIbynR/', 1, 1, '我的流程', 'procinsts', 1708911263, '{"component":"flow/ProcinstList","icon":"Tickets","isKeepAlive":true,"routeName":"ProcinstList"}', 1, 'admin', 1, 'admin', '2024-02-28 14:53:00', '2024-02-29 20:36:07', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1709045735, 1708910975, '6egfEVYr/3r3hHEub/', 1, 1, '我的任务', 'procinst-tasks', 1708911263, '{"component":"flow/ProcinstTaskList","icon":"Tickets","isKeepAlive":true,"routeName":"ProcinstTaskList"}', 1, 'admin', 1, 'admin', '2024-02-27 22:55:35', '2024-02-27 22:56:35', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1708911264, 1708910975, '6egfEVYr/fw0Hhvye/', 1, 1, '流程定义', 'procdefs', 1708911264, '{"component":"flow/ProcdefList","icon":"List","isKeepAlive":true,"routeName":"ProcdefList"}', 1, 'admin', 1, 'admin', '2024-02-26 09:34:24', '2024-02-27 22:54:32', 0, NULL);
INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1708910975, 0, '6egfEVYr/', 1, 1, '工单流程', '/flow', 60000000, '{"icon":"List","isKeepAlive":true,"routeName":"flow"}', 1, 'admin', 1, 'admin', '2024-02-26 09:29:36', '2024-02-26 15:37:52', 0, NULL);
-- Table: t_sys_role
@@ -988,6 +999,66 @@ CREATE TABLE IF NOT EXISTS "t_team_member" (
);
INSERT INTO t_team_member (id, team_id, account_id, username, create_time, creator_id, creator, update_time, modifier_id, modifier, is_deleted, delete_time) VALUES (7, 3, 1, 'admin', '2022-10-26 20:04:36', 1, 'admin', '2022-10-26 20:04:36', 1, 'admin', 0, NULL);
CREATE TABLE "t_flow_procdef" (
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
"def_key" text(100) NOT NULL ,
"name" text(200) DEFAULT NULL ,
"status" tinyint DEFAULT NULL ,
"tasks" text(3000) NOT NULL ,
"remark" text(191) DEFAULT NULL,
"create_time" datetime NOT NULL,
"creator" text(191) DEFAULT NULL,
"creator_id" integer(20) NOT NULL,
"update_time" datetime NOT NULL,
"modifier" text(191) DEFAULT NULL,
"modifier_id" integer(20) NOT NULL,
"is_deleted" tinyint DEFAULT '0',
"delete_time" datetime DEFAULT NULL
) ;
CREATE TABLE "t_flow_procinst" (
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
"procdef_id" integer(20) NOT NULL ,
"procdef_name" text(64) NOT NULL ,
"task_key" text(100) DEFAULT NULL ,
"status" tinyint DEFAULT NULL ,
"biz_type" text(64) NOT NULL ,
"biz_key" text(64) NOT NULL ,
"biz_status" tinyint DEFAULT NULL ,
"biz_handle_res" text(100) DEFAULT NULL ,
"remark" text(191) DEFAULT NULL,
"end_time" datetime DEFAULT NULL ,
"duration" integer(20) DEFAULT NULL ,
"create_time" datetime NOT NULL ,
"creator" text(191) DEFAULT NULL ,
"creator_id" integer(20) NOT NULL,
"update_time" datetime NOT NULL,
"modifier" text(191) DEFAULT NULL,
"modifier_id" integer(20) NOT NULL,
"is_deleted" tinyint DEFAULT '0',
"delete_time" datetime DEFAULT NULL
) ;
CREATE TABLE "t_flow_procinst_task" (
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
"procinst_id" integer(20) NOT NULL ,
"task_key" text(64) NOT NULL ,
"task_name" text(64) DEFAULT NULL ,
"assignee" text(64) DEFAULT NULL ,
"status" tinyint DEFAULT NULL ,
"remark" text(191) DEFAULT NULL,
"end_time" datetime DEFAULT NULL ,
"duration" integer(20) DEFAULT NULL ,
"create_time" datetime NOT NULL ,
"creator" text(191) DEFAULT NULL,
"creator_id" integer(20) NOT NULL,
"update_time" datetime NOT NULL,
"modifier" text(191) DEFAULT NULL,
"modifier_id" integer(20) NOT NULL,
"is_deleted" tinyint DEFAULT '0',
"delete_time" datetime DEFAULT NULL
)
-- Index: idx_db_backup_id
CREATE INDEX IF NOT EXISTS "idx_db_backup_id"
ON "t_db_backup_history" (
@@ -1006,5 +1077,17 @@ ON "t_db_backup" (
"db_name" ASC
);
-- Index: idx_procdef_id
CREATE INDEX IF NOT EXISTS "idx_procdef_id"
ON "t_flow_procinst" (
"procdef_id" ASC
);
-- Index: idx_procinst_id
CREATE INDEX IF NOT EXISTS "idx_procinst_id"
ON "t_flow_procinst_task" (
"procinst_id" ASC
);
COMMIT TRANSACTION;
PRAGMA foreign_keys = on;

1
server/resources/script/sql/mayfly-go.sql
View File

@@ -282,6 +282,7 @@ CREATE TABLE `t_db_data_sync_task`
`recent_state` tinyint(1) NOT NULL DEFAULT '0' COMMENT '最近一次状态 0未执行 1成功 2失败',
`task_key` varchar(100) DEFAULT NULL COMMENT '定时任务唯一uuid key',
`running_state` tinyint(1) DEFAULT '2' COMMENT '运行时状态 1运行中、2待运行、3已停止',
`duplicate_strategy`tinyint(1) DEFAULT '-1' COMMENT '唯一键冲突策略 -1：无，1：忽略，2：覆盖',
PRIMARY KEY (`id`)
) COMMENT='数据同步';

45
server/resources/script/sql/v1.7/v1.7.4.sql
View File

@@ -11,68 +11,68 @@ INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight
-- 工单流程相关表
CREATE TABLE `t_flow_procdef` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程定义key',
`name` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '流程名称',
`def_key` varchar(100) NOT NULL COMMENT '流程定义key',
`name` varchar(191) DEFAULT NULL COMMENT '流程名称',
`status` tinyint DEFAULT NULL COMMENT '状态',
`tasks` varchar(3000) COLLATE utf8mb4_bin NOT NULL COMMENT '审批节点任务信息',
`remark` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`remark` varchar(191) DEFAULT NULL,
`create_time` datetime NOT NULL,
`creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`creator` varchar(191) DEFAULT NULL,
`creator_id` bigint NOT NULL,
`update_time` datetime NOT NULL,
`modifier` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`modifier` varchar(191) DEFAULT NULL,
`modifier_id` bigint NOT NULL,
`is_deleted` tinyint DEFAULT '0',
`delete_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程-流程定义';
) COMMENT='流程-流程定义';
CREATE TABLE `t_flow_procinst` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`procdef_id` bigint NOT NULL COMMENT '流程定义id',
`procdef_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程定义名称',
`task_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '当前任务key',
`procdef_name` varchar(64) NOT NULL COMMENT '流程定义名称',
`task_key` varchar(100) DEFAULT NULL COMMENT '当前任务key',
`status` tinyint DEFAULT NULL COMMENT '状态',
`biz_type` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '关联业务类型',
`biz_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '关联业务key',
`biz_key` varchar(64) NOT NULL COMMENT '关联业务key',
`biz_status` tinyint DEFAULT NULL COMMENT '业务状态',
`biz_handle_res` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '关联的业务处理结果',
`remark` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`remark` varchar(191) DEFAULT NULL,
`end_time` datetime DEFAULT NULL COMMENT '结束时间',
`duration` bigint DEFAULT NULL COMMENT '流程持续时间（开始到结束）',
`create_time` datetime NOT NULL COMMENT '流程发起时间',
`creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '流程发起人',
`creator` varchar(191) DEFAULT NULL COMMENT '流程发起人',
`creator_id` bigint NOT NULL,
`update_time` datetime NOT NULL,
`modifier` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`modifier` varchar(191) DEFAULT NULL,
`modifier_id` bigint NOT NULL,
`is_deleted` tinyint DEFAULT '0',
`delete_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_procdef_id` (`procdef_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程-流程实例(根据流程定义开启一个流程)';
) COMMENT='流程-流程实例(根据流程定义开启一个流程)';
CREATE TABLE `t_flow_procinst_task` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`procinst_id` bigint NOT NULL COMMENT '流程实例id',
`task_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '任务key',
`task_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '任务名称',
`assignee` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '分配到该任务的用户',
`task_key` varchar(64) NOT NULL COMMENT '任务key',
`task_name` varchar(64) DEFAULT NULL COMMENT '任务名称',
`assignee` varchar(64) DEFAULT NULL COMMENT '分配到该任务的用户',
`status` tinyint DEFAULT NULL COMMENT '状态',
`remark` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`remark` varchar(191) DEFAULT NULL,
`end_time` datetime DEFAULT NULL COMMENT '结束时间',
`duration` bigint DEFAULT NULL COMMENT '任务持续时间（开始到结束）',
`create_time` datetime NOT NULL COMMENT '任务开始时间',
`creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`creator` varchar(191) DEFAULT NULL,
`creator_id` bigint NOT NULL,
`update_time` datetime NOT NULL,
`modifier` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`modifier` varchar(191) DEFAULT NULL,
`modifier_id` bigint NOT NULL,
`is_deleted` tinyint DEFAULT '0',
`delete_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_procinst_id` (`procinst_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程-流程实例任务';
) COMMENT='流程-流程实例任务';
-- 新增工单流程相关字段
ALTER TABLE t_db_sql_exec ADD status tinyint NULL COMMENT '执行状态';
@@ -82,6 +82,9 @@ ALTER TABLE t_db_sql_exec ADD res varchar(1000) NULL COMMENT '执行结果';
ALTER TABLE t_db ADD flow_procdef_key varchar(64) NULL COMMENT '审批流-流程定义key（有值则说明关键操作需要进行审批执行）';
-- 历史执行记录调整为成功状态
UPDATE t_db_sql_exec SET status = 2
UPDATE t_db_sql_exec SET status = 2;
ALTER TABLE `t_db_data_sync_task`
ADD COLUMN `duplicate_strategy` tinyint(1) NULL DEFAULT -1 comment '冲突策略 -1：无，1：忽略，2：覆盖';
commit;