BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 18b6dfa068e6151ba986a5e220d07f26ee565d8b

Authored by YunaiV
1 parent 528d2a9b

同步最新的 sql 脚本 

编写 mapper 的代码模板
Inline Side-by-side
Showing 7 changed files with 212 additions and 334 deletions
sql/ruoyi-vue-pro.sql
  View file @18b6dfa
... ... @@ -11,149 +11,13 @@
11 11 Target Server Version : 50718
12 12 File Encoding : 65001
13 13  
14   - Date: 28/01/2021 01:32:22
  14 + Date: 02/02/2021 22:52:40
15 15 */
16 16  
17 17 SET NAMES utf8mb4;
18 18 SET FOREIGN_KEY_CHECKS = 0;
19 19  
20 20 -- ----------------------------
21   --- Table structure for gen_table
22   --- ----------------------------
23   -DROP TABLE IF EXISTS `gen_table`;
24   -CREATE TABLE `gen_table` (
25   - `table_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
26   - `table_name` varchar(200) DEFAULT '' COMMENT '表名称',
27   - `table_comment` varchar(500) DEFAULT '' COMMENT '表描述',
28   - `class_name` varchar(100) DEFAULT '' COMMENT '实体类名称',
29   - `tpl_category` varchar(200) DEFAULT 'crud' COMMENT '使用的模板（crud单表操作 tree树表操作）',
30   - `package_name` varchar(100) DEFAULT NULL COMMENT '生成包路径',
31   - `module_name` varchar(30) DEFAULT NULL COMMENT '生成模块名',
32   - `business_name` varchar(30) DEFAULT NULL COMMENT '生成业务名',
33   - `function_name` varchar(50) DEFAULT NULL COMMENT '生成功能名',
34   - `function_author` varchar(50) DEFAULT NULL COMMENT '生成功能作者',
35   - `gen_type` char(1) DEFAULT '0' COMMENT '生成代码方式（0zip压缩包 1自定义路径）',
36   - `gen_path` varchar(200) DEFAULT '/' COMMENT '生成路径（不填默认项目路径）',
37   - `options` varchar(1000) DEFAULT NULL COMMENT '其它生成选项',
38   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
39   - `create_time` datetime DEFAULT NULL COMMENT '创建时间',
40   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
41   - `update_time` datetime DEFAULT NULL COMMENT '更新时间',
42   - `remark` varchar(500) DEFAULT NULL COMMENT '备注',
43   - PRIMARY KEY (`table_id`)
44   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代码生成业务表';
45   -
46   --- ----------------------------
47   --- Records of gen_table
48   --- ----------------------------
49   -BEGIN;
50   -COMMIT;
51   -
52   --- ----------------------------
53   --- Table structure for gen_table_column
54   --- ----------------------------
55   -DROP TABLE IF EXISTS `gen_table_column`;
56   -CREATE TABLE `gen_table_column` (
57   - `column_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
58   - `table_id` varchar(64) DEFAULT NULL COMMENT '归属表编号',
59   - `column_name` varchar(200) DEFAULT NULL COMMENT '列名称',
60   - `column_comment` varchar(500) DEFAULT NULL COMMENT '列描述',
61   - `column_type` varchar(100) DEFAULT NULL COMMENT '列类型',
62   - `java_type` varchar(500) DEFAULT NULL COMMENT 'JAVA类型',
63   - `java_field` varchar(200) DEFAULT NULL COMMENT 'JAVA字段名',
64   - `is_pk` char(1) DEFAULT NULL COMMENT '是否主键（1是）',
65   - `is_increment` char(1) DEFAULT NULL COMMENT '是否自增（1是）',
66   - `is_required` char(1) DEFAULT NULL COMMENT '是否必填（1是）',
67   - `is_insert` char(1) DEFAULT NULL COMMENT '是否为插入字段（1是）',
68   - `is_edit` char(1) DEFAULT NULL COMMENT '是否编辑字段（1是）',
69   - `is_list` char(1) DEFAULT NULL COMMENT '是否列表字段（1是）',
70   - `is_query` char(1) DEFAULT NULL COMMENT '是否查询字段（1是）',
71   - `query_type` varchar(200) DEFAULT 'EQ' COMMENT '查询方式（等于、不等于、大于、小于、范围）',
72   - `html_type` varchar(200) DEFAULT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
73   - `dict_type` varchar(200) DEFAULT '' COMMENT '字典类型',
74   - `sort` int(11) DEFAULT NULL COMMENT '排序',
75   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
76   - `create_time` datetime DEFAULT NULL COMMENT '创建时间',
77   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
78   - `update_time` datetime DEFAULT NULL COMMENT '更新时间',
79   - PRIMARY KEY (`column_id`)
80   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代码生成业务表字段';
81   -
82   --- ----------------------------
83   --- Records of gen_table_column
84   --- ----------------------------
85   -BEGIN;
86   -COMMIT;
87   -
88   --- ----------------------------
89   --- Table structure for gen_table_column_copy1
90   --- ----------------------------
91   -DROP TABLE IF EXISTS `gen_table_column_copy1`;
92   -CREATE TABLE `gen_table_column_copy1` (
93   - `column_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
94   - `table_id` varchar(64) DEFAULT NULL COMMENT '归属表编号',
95   - `column_name` varchar(200) DEFAULT NULL COMMENT '列名称',
96   - `column_comment` varchar(500) DEFAULT NULL COMMENT '列描述',
97   - `column_type` varchar(100) DEFAULT NULL COMMENT '列类型',
98   - `java_type` varchar(500) DEFAULT NULL COMMENT 'JAVA类型',
99   - `java_field` varchar(200) DEFAULT NULL COMMENT 'JAVA字段名',
100   - `is_pk` char(1) DEFAULT NULL COMMENT '是否主键（1是）',
101   - `is_increment` char(1) DEFAULT NULL COMMENT '是否自增（1是）',
102   - `is_required` char(1) DEFAULT NULL COMMENT '是否必填（1是）',
103   - `is_insert` char(1) DEFAULT NULL COMMENT '是否为插入字段（1是）',
104   - `is_edit` char(1) DEFAULT NULL COMMENT '是否编辑字段（1是）',
105   - `is_list` char(1) DEFAULT NULL COMMENT '是否列表字段（1是）',
106   - `is_query` char(1) DEFAULT NULL COMMENT '是否查询字段（1是）',
107   - `query_type` varchar(200) DEFAULT 'EQ' COMMENT '查询方式（等于、不等于、大于、小于、范围）',
108   - `html_type` varchar(200) DEFAULT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
109   - `dict_type` varchar(200) DEFAULT '' COMMENT '字典类型',
110   - `sort` int(11) DEFAULT NULL COMMENT '排序',
111   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
112   - `create_time` datetime DEFAULT NULL COMMENT '创建时间',
113   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
114   - `update_time` datetime DEFAULT NULL COMMENT '更新时间',
115   - PRIMARY KEY (`column_id`)
116   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代码生成业务表字段';
117   -
118   --- ----------------------------
119   --- Records of gen_table_column_copy1
120   --- ----------------------------
121   -BEGIN;
122   -COMMIT;
123   -
124   --- ----------------------------
125   --- Table structure for gen_table_copy1
126   --- ----------------------------
127   -DROP TABLE IF EXISTS `gen_table_copy1`;
128   -CREATE TABLE `gen_table_copy1` (
129   - `table_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
130   - `table_name` varchar(200) DEFAULT '' COMMENT '表名称',
131   - `table_comment` varchar(500) DEFAULT '' COMMENT '表描述',
132   - `class_name` varchar(100) DEFAULT '' COMMENT '实体类名称',
133   - `tpl_category` varchar(200) DEFAULT 'crud' COMMENT '使用的模板（crud单表操作 tree树表操作）',
134   - `package_name` varchar(100) DEFAULT NULL COMMENT '生成包路径',
135   - `module_name` varchar(30) DEFAULT NULL COMMENT '生成模块名',
136   - `business_name` varchar(30) DEFAULT NULL COMMENT '生成业务名',
137   - `function_name` varchar(50) DEFAULT NULL COMMENT '生成功能名',
138   - `function_author` varchar(50) DEFAULT NULL COMMENT '生成功能作者',
139   - `gen_type` char(1) DEFAULT '0' COMMENT '生成代码方式（0zip压缩包 1自定义路径）',
140   - `gen_path` varchar(200) DEFAULT '/' COMMENT '生成路径（不填默认项目路径）',
141   - `options` varchar(1000) DEFAULT NULL COMMENT '其它生成选项',
142   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
143   - `create_time` datetime DEFAULT NULL COMMENT '创建时间',
144   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
145   - `update_time` datetime DEFAULT NULL COMMENT '更新时间',
146   - `remark` varchar(500) DEFAULT NULL COMMENT '备注',
147   - PRIMARY KEY (`table_id`)
148   -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代码生成业务表';
149   -
150   --- ----------------------------
151   --- Records of gen_table_copy1
152   --- ----------------------------
153   -BEGIN;
154   -COMMIT;
155   -
156   --- ----------------------------
157 21 -- Table structure for inf_config
158 22 -- ----------------------------
159 23 DROP TABLE IF EXISTS `inf_config`;
... ... @@ -185,37 +49,6 @@ INSERT INTO `inf_config` VALUES (4, '1', 2, 'xxx', 'demo.test', '10', b'0', '5',
185 49 COMMIT;
186 50  
187 51 -- ----------------------------
188   --- Table structure for inf_config_copy1
189   --- ----------------------------
190   -DROP TABLE IF EXISTS `inf_config_copy1`;
191   -CREATE TABLE `inf_config_copy1` (
192   - `id` int(5) NOT NULL AUTO_INCREMENT COMMENT '参数主键',
193   - `group` varchar(50) NOT NULL COMMENT '参数分组',
194   - `type` tinyint(4) NOT NULL COMMENT '参数类型',
195   - `name` varchar(100) NOT NULL DEFAULT '' COMMENT '参数名称',
196   - `key` varchar(100) NOT NULL DEFAULT '' COMMENT '参数键名',
197   - `value` varchar(500) NOT NULL DEFAULT '' COMMENT '参数键值',
198   - `sensitive` bit(1) NOT NULL COMMENT '是否敏感',
199   - `remark` varchar(500) DEFAULT NULL COMMENT '备注',
200   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
201   - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
202   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
203   - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
204   - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
205   - PRIMARY KEY (`id`) USING BTREE
206   -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='参数配置表';
207   -
208   --- ----------------------------
209   --- Records of inf_config_copy1
210   --- ----------------------------
211   -BEGIN;
212   -INSERT INTO `inf_config_copy1` VALUES (1, 'ui', 1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', b'0', '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow', 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
213   -INSERT INTO `inf_config_copy1` VALUES (2, 'biz', 1, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', b'0', '初始化密码 123456', 'admin', '2021-01-05 17:03:48', '', '2021-01-21 02:13:02', b'0');
214   -INSERT INTO `inf_config_copy1` VALUES (3, 'ui', 1, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', b'0', '深色主题theme-dark，浅色主题theme-light', 'admin', '2021-01-05 17:03:48', '', '2021-01-19 03:05:21', b'0');
215   -INSERT INTO `inf_config_copy1` VALUES (4, '1', 2, 'xxx', 'demo.test', '10', b'0', '5', '', '2021-01-19 03:10:26', '', '2021-01-20 09:25:55', b'0');
216   -COMMIT;
217   -
218   --- ----------------------------
219 52 -- Table structure for sys_dept
220 53 -- ----------------------------
221 54 DROP TABLE IF EXISTS `sys_dept`;
... ... @@ -253,43 +86,6 @@ INSERT INTO `sys_dept` VALUES (109, '财务部门', 102, 2, '若依', '158888888
253 86 COMMIT;
254 87  
255 88 -- ----------------------------
256   --- Table structure for sys_dept_copy1
257   --- ----------------------------
258   -DROP TABLE IF EXISTS `sys_dept_copy1`;
259   -CREATE TABLE `sys_dept_copy1` (
260   - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门id',
261   - `name` varchar(30) NOT NULL DEFAULT '' COMMENT '部门名称',
262   - `parent_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '父部门id',
263   - `sort` int(4) NOT NULL DEFAULT '0' COMMENT '显示顺序',
264   - `leader` varchar(20) DEFAULT NULL COMMENT '负责人',
265   - `phone` varchar(11) DEFAULT NULL COMMENT '联系电话',
266   - `email` varchar(50) DEFAULT NULL COMMENT '邮箱',
267   - `status` tinyint(4) NOT NULL COMMENT '部门状态（0正常 1停用）',
268   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
269   - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
270   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
271   - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
272   - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
273   - PRIMARY KEY (`id`) USING BTREE
274   -) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8mb4 COMMENT='部门表';
275   -
276   --- ----------------------------
277   --- Records of sys_dept_copy1
278   --- ----------------------------
279   -BEGIN;
280   -INSERT INTO `sys_dept_copy1` VALUES (100, '芋道源码', 0, 0, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-06 19:45:52', b'0');
281   -INSERT INTO `sys_dept_copy1` VALUES (101, '深圳总公司', 100, 1, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
282   -INSERT INTO `sys_dept_copy1` VALUES (102, '长沙分公司', 100, 2, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
283   -INSERT INTO `sys_dept_copy1` VALUES (103, '研发部门', 101, 1, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
284   -INSERT INTO `sys_dept_copy1` VALUES (104, '市场部门', 101, 2, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
285   -INSERT INTO `sys_dept_copy1` VALUES (105, '测试部门', 101, 3, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
286   -INSERT INTO `sys_dept_copy1` VALUES (106, '财务部门', 101, 4, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
287   -INSERT INTO `sys_dept_copy1` VALUES (107, '运维部门', 101, 5, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
288   -INSERT INTO `sys_dept_copy1` VALUES (108, '市场部门', 102, 1, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
289   -INSERT INTO `sys_dept_copy1` VALUES (109, '财务部门', 102, 2, '若依', '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-01-05 17:03:47', b'0');
290   -COMMIT;
291   -
292   --- ----------------------------
293 89 -- Table structure for sys_dict_data
294 90 -- ----------------------------
295 91 DROP TABLE IF EXISTS `sys_dict_data`;
... ... @@ -356,72 +152,6 @@ INSERT INTO `sys_dict_data` VALUES (49, 3, '固定超时', '3', 'inf_redis_timeo
356 152 COMMIT;
357 153  
358 154 -- ----------------------------
359   --- Table structure for sys_dict_data_copy1
360   --- ----------------------------
361   -DROP TABLE IF EXISTS `sys_dict_data_copy1`;
362   -CREATE TABLE `sys_dict_data_copy1` (
363   - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '字典编码',
364   - `sort` int(4) NOT NULL DEFAULT '0' COMMENT '字典排序',
365   - `label` varchar(100) NOT NULL DEFAULT '' COMMENT '字典标签',
366   - `value` varchar(100) NOT NULL DEFAULT '' COMMENT '字典键值',
367   - `dict_type` varchar(100) NOT NULL DEFAULT '' COMMENT '字典类型',
368   - `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
369   - `remark` varchar(500) DEFAULT NULL COMMENT '备注',
370   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
371   - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
372   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
373   - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
374   - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
375   - PRIMARY KEY (`id`) USING BTREE
376   -) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8mb4 COMMENT='字典数据表';
377   -
378   --- ----------------------------
379   --- Records of sys_dict_data_copy1
380   --- ----------------------------
381   -BEGIN;
382   -INSERT INTO `sys_dict_data_copy1` VALUES (1, 1, '男', '1', 'sys_user_sex', 0, '性别男', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 05:48:53', b'0');
383   -INSERT INTO `sys_dict_data_copy1` VALUES (2, 2, '女', '2', 'sys_user_sex', 0, '性别女', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 05:48:55', b'0');
384   -INSERT INTO `sys_dict_data_copy1` VALUES (8, 1, '正常', '0', 'sys_job_status', 0, '正常状态', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 00:02:28', b'0');
385   -INSERT INTO `sys_dict_data_copy1` VALUES (9, 2, '暂停', '1', 'sys_job_status', 0, '停用状态', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 00:02:28', b'0');
386   -INSERT INTO `sys_dict_data_copy1` VALUES (10, 1, '默认', 'DEFAULT', 'sys_job_group', 0, '默认分组', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 00:02:28', b'0');
387   -INSERT INTO `sys_dict_data_copy1` VALUES (11, 2, '系统', 'SYSTEM', 'sys_job_group', 0, '系统分组', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 00:02:28', b'0');
388   -INSERT INTO `sys_dict_data_copy1` VALUES (12, 1, '系统内置', '1', 'sys_config_type', 0, '参数类型 - 系统内置', 'admin', '2021-01-05 17:03:48', '', '2021-01-18 07:41:59', b'0');
389   -INSERT INTO `sys_dict_data_copy1` VALUES (13, 2, '自定义', '2', 'sys_config_type', 0, '参数类型 - 自定义', 'admin', '2021-01-05 17:03:48', '', '2021-01-18 07:41:51', b'0');
390   -INSERT INTO `sys_dict_data_copy1` VALUES (14, 1, '通知', '1', 'sys_notice_type', 0, '通知', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 00:02:28', b'0');
391   -INSERT INTO `sys_dict_data_copy1` VALUES (15, 2, '公告', '2', 'sys_notice_type', 0, '公告', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 00:02:28', b'0');
392   -INSERT INTO `sys_dict_data_copy1` VALUES (16, 0, '其它', '0', 'sys_operate_type', 0, '其它操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:51:12', b'0');
393   -INSERT INTO `sys_dict_data_copy1` VALUES (17, 1, '查询', '1', 'sys_operate_type', 0, '查询操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:51:10', b'0');
394   -INSERT INTO `sys_dict_data_copy1` VALUES (18, 2, '新增', '2', 'sys_operate_type', 0, '新增操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:51:17', b'0');
395   -INSERT INTO `sys_dict_data_copy1` VALUES (19, 3, '修改', '3', 'sys_operate_type', 0, '修改操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:51:20', b'0');
396   -INSERT INTO `sys_dict_data_copy1` VALUES (20, 4, '删除', '4', 'sys_operate_type', 0, '删除操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:51:24', b'0');
397   -INSERT INTO `sys_dict_data_copy1` VALUES (22, 5, '导出', '5', 'sys_operate_type', 0, '导出操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:49:20', b'0');
398   -INSERT INTO `sys_dict_data_copy1` VALUES (23, 6, '导入', '6', 'sys_operate_type', 0, '导入操作', 'admin', '2021-01-05 17:03:48', '', '2021-01-16 13:49:24', b'0');
399   -INSERT INTO `sys_dict_data_copy1` VALUES (27, 1, '开启', '0', 'sys_common_status', 0, '开启状态', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 02:57:12', b'0');
400   -INSERT INTO `sys_dict_data_copy1` VALUES (28, 2, '关闭', '1', 'sys_common_status', 0, '关闭状态', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 05:48:32', b'0');
401   -INSERT INTO `sys_dict_data_copy1` VALUES (29, 1, '目录', '1', 'sys_menu_type', 0, '目录', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 13:33:30', b'0');
402   -INSERT INTO `sys_dict_data_copy1` VALUES (30, 2, '菜单', '2', 'sys_menu_type', 0, '菜单', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 13:33:35', b'0');
403   -INSERT INTO `sys_dict_data_copy1` VALUES (31, 3, '按钮', '3', 'sys_menu_type', 0, '按钮', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 13:33:38', b'0');
404   -INSERT INTO `sys_dict_data_copy1` VALUES (32, 1, '内置', '1', 'sys_role_type', 0, '内置角色', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 13:34:22', b'0');
405   -INSERT INTO `sys_dict_data_copy1` VALUES (33, 2, '自定义', '2', 'sys_role_type', 0, '自定义角色', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 13:34:26', b'0');
406   -INSERT INTO `sys_dict_data_copy1` VALUES (34, 1, '全部数据权限', '1', 'sys_data_scope', 0, '全部数据权限', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 19:38:02', b'0');
407   -INSERT INTO `sys_dict_data_copy1` VALUES (35, 2, '指定部门数据权限', '2', 'sys_data_scope', 0, '指定部门数据权限', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 19:38:20', b'0');
408   -INSERT INTO `sys_dict_data_copy1` VALUES (36, 3, '本部门数据权限', '3', 'sys_data_scope', 0, '本部门数据权限', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 19:38:29', b'0');
409   -INSERT INTO `sys_dict_data_copy1` VALUES (37, 4, '本部门及以下数据权限', '4', 'sys_data_scope', 0, '本部门及以下数据权限', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 19:38:32', b'0');
410   -INSERT INTO `sys_dict_data_copy1` VALUES (38, 5, '仅本人数据权限', '5', 'sys_data_scope', 0, '仅本人数据权限', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 19:38:38', b'0');
411   -INSERT INTO `sys_dict_data_copy1` VALUES (39, 0, '成功', '0', 'sys_login_result', 0, '登陆结果 - 成功', '', '2021-01-18 06:17:36', '', '2021-01-18 06:17:36', b'0');
412   -INSERT INTO `sys_dict_data_copy1` VALUES (40, 10, '账号或密码不正确', '10', 'sys_login_result', 0, '登陆结果 - 账号或密码不正确', '', '2021-01-18 06:17:54', '', '2021-01-18 06:17:54', b'0');
413   -INSERT INTO `sys_dict_data_copy1` VALUES (41, 20, '用户被禁用', '20', 'sys_login_result', 0, '登陆结果 - 用户被禁用', '', '2021-01-18 06:17:54', '', '2021-01-18 06:19:02', b'0');
414   -INSERT INTO `sys_dict_data_copy1` VALUES (42, 30, '验证码不存在', '30', 'sys_login_result', 0, '登陆结果 - 验证码不存在', '', '2021-01-18 06:17:54', '', '2021-01-18 06:19:24', b'0');
415   -INSERT INTO `sys_dict_data_copy1` VALUES (43, 31, '验证码不正确', '31', 'sys_login_result', 0, '登陆结果 - 验证码不正确', '', '2021-01-18 06:17:54', '', '2021-01-18 06:19:33', b'0');
416   -INSERT INTO `sys_dict_data_copy1` VALUES (44, 100, '未知异常', '100', 'sys_login_result', 0, '登陆结果 - 未知异常', '', '2021-01-18 06:17:54', '', '2021-01-18 06:19:57', b'0');
417   -INSERT INTO `sys_dict_data_copy1` VALUES (45, 1, '是', 'true', 'sys_boolean_string', 0, 'Boolean 是否类型 - 是', '', '2021-01-19 03:20:55', '', '2021-01-19 03:21:08', b'0');
418   -INSERT INTO `sys_dict_data_copy1` VALUES (46, 1, '否', 'false', 'sys_boolean_string', 0, 'Boolean 是否类型 - 否', '', '2021-01-19 03:20:55', '', '2021-01-19 03:21:39', b'0');
419   -INSERT INTO `sys_dict_data_copy1` VALUES (47, 1, '永不超时', '1', 'inf_redis_timeout_type', 0, 'Redis 未设置超时的情况', '', '2021-01-26 00:53:17', '', '2021-01-26 00:53:17', b'0');
420   -INSERT INTO `sys_dict_data_copy1` VALUES (48, 1, '动态超时', '2', 'inf_redis_timeout_type', 0, '程序里动态传入超时时间，无法固定', '', '2021-01-26 00:55:00', '', '2021-01-26 00:55:00', b'0');
421   -INSERT INTO `sys_dict_data_copy1` VALUES (49, 3, '固定超时', '3', 'inf_redis_timeout_type', 0, 'Redis 设置了过期时间', '', '2021-01-26 00:55:26', '', '2021-01-26 00:55:26', b'0');
422   -COMMIT;
423   -
424   --- ----------------------------
425 155 -- Table structure for sys_dict_type
426 156 -- ----------------------------
427 157 DROP TABLE IF EXISTS `sys_dict_type`;
... ... @@ -459,43 +189,6 @@ INSERT INTO `sys_dict_type` VALUES (105, 'Redis 超时类型', 'inf_redis_timeou
459 189 COMMIT;
460 190  
461 191 -- ----------------------------
462   --- Table structure for sys_dict_type_copy1
463   --- ----------------------------
464   -DROP TABLE IF EXISTS `sys_dict_type_copy1`;
465   -CREATE TABLE `sys_dict_type_copy1` (
466   - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '字典主键',
467   - `name` varchar(100) NOT NULL DEFAULT '' COMMENT '字典名称',
468   - `dict_type` varchar(100) NOT NULL DEFAULT '' COMMENT '字典类型',
469   - `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
470   - `remark` varchar(500) DEFAULT NULL COMMENT '备注',
471   - `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
472   - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
473   - `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
474   - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
475   - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
476   - PRIMARY KEY (`id`) USING BTREE,
477   - UNIQUE KEY `dict_type` (`dict_type`)
478   -) ENGINE=InnoDB AUTO_INCREMENT=106 DEFAULT CHARSET=utf8mb4 COMMENT='字典类型表';
479   -
480   --- ----------------------------
481   --- Records of sys_dict_type_copy1
482   --- ----------------------------
483   -BEGIN;
484   -INSERT INTO `sys_dict_type_copy1` VALUES (1, '用户性别', 'sys_user_sex', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
485   -INSERT INTO `sys_dict_type_copy1` VALUES (3, '系统开关', 'sys_normal_disable', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-07 19:47:48', b'1');
486   -INSERT INTO `sys_dict_type_copy1` VALUES (4, '任务状态', 'sys_job_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
487   -INSERT INTO `sys_dict_type_copy1` VALUES (5, '任务分组', 'sys_job_group', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
488   -INSERT INTO `sys_dict_type_copy1` VALUES (6, '参数类型', 'sys_config_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-18 07:41:04', b'0');
489   -INSERT INTO `sys_dict_type_copy1` VALUES (7, '通知类型', 'sys_notice_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
490   -INSERT INTO `sys_dict_type_copy1` VALUES (8, '通知状态', 'sys_notice_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
491   -INSERT INTO `sys_dict_type_copy1` VALUES (9, '操作类型', 'sys_oper_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
492   -INSERT INTO `sys_dict_type_copy1` VALUES (10, '系统状态', 'sys_common_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
493   -INSERT INTO `sys_dict_type_copy1` VALUES (11, 'Boolean 是否类型', 'sys_boolean_string', 0, 'boolean 转是否', '', '2021-01-19 03:20:08', '', '2021-01-19 03:20:08', b'0');
494   -INSERT INTO `sys_dict_type_copy1` VALUES (104, '登陆结果', 'sys_login_result', 0, '登陆结果', '', '2021-01-18 06:17:11', '', '2021-01-18 06:17:11', b'0');
495   -INSERT INTO `sys_dict_type_copy1` VALUES (105, 'Redis 超时类型', 'inf_redis_timeout_type', 0, 'RedisKeyDefine.TimeoutTypeEnum', '', '2021-01-26 00:52:50', '', '2021-01-26 00:52:50', b'0');
496   -COMMIT;
497   -
498   --- ----------------------------
499 192 -- Table structure for sys_file
500 193 -- ----------------------------
501 194 DROP TABLE IF EXISTS `sys_file`;
... ... @@ -587,7 +280,7 @@ CREATE TABLE `sys_login_log` (
587 280 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
588 281 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
589 282 PRIMARY KEY (`id`) USING BTREE
590   -) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8mb4 COMMENT='系统访问记录';
  283 +) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COMMENT='系统访问记录';
591 284  
592 285 -- ----------------------------
593 286 -- Records of sys_login_log
... ... @@ -625,6 +318,14 @@ INSERT INTO `sys_login_log` VALUES (29, 1, 'ad9e244f-4c88-4762-b280-2d46d16081ac
625 318 INSERT INTO `sys_login_log` VALUES (30, 1, '5032fac5-c6dc-41e4-882b-2dbea01ef1f6', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-21 09:57:18', '', '2021-01-21 09:57:18', b'0');
626 319 INSERT INTO `sys_login_log` VALUES (31, 1, '802ca4eb-ac96-4c6b-91de-0e445dc46e78', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-25 21:29:41', '', '2021-01-25 21:29:41', b'0');
627 320 INSERT INTO `sys_login_log` VALUES (32, 1, '3aeafd34-af33-4329-8b47-8972ecc72635', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-25 23:59:57', '', '2021-01-25 23:59:57', b'0');
  321 +INSERT INTO `sys_login_log` VALUES (33, 1, '2829acdd-ac0e-40e4-847c-5ef160bded8f', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 05:17:41', '', '2021-01-26 05:17:41', b'0');
  322 +INSERT INTO `sys_login_log` VALUES (34, 1, 'ed9e0038-854a-48d1-8d1a-0ca2faa51635', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 07:55:34', '', '2021-01-26 07:55:34', b'0');
  323 +INSERT INTO `sys_login_log` VALUES (35, 1, 'abb350a3-5cac-49a6-9cce-37e9a675840c', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:26:02', '', '2021-01-26 08:26:02', b'0');
  324 +INSERT INTO `sys_login_log` VALUES (36, 1, '82ba6974-5279-4e7b-8151-569a01b4d666', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:26:25', '', '2021-01-26 08:26:25', b'0');
  325 +INSERT INTO `sys_login_log` VALUES (37, 1, '71c36cd2-23de-4788-af29-d1eaa658fb95', 'admin', 31, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:27:29', '', '2021-01-26 08:27:29', b'0');
  326 +INSERT INTO `sys_login_log` VALUES (38, 1, '8d595ab5-da9c-473b-94c5-8a6efe3bc50e', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:27:33', '', '2021-01-26 08:27:33', b'0');
  327 +INSERT INTO `sys_login_log` VALUES (39, 1, 'b56f5bf7-01c5-43e5-bfc6-b43052518b20', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:29:27', '', '2021-01-26 08:29:27', b'0');
  328 +INSERT INTO `sys_login_log` VALUES (40, 1, '0d22b1ad-9254-490e-a4cc-43c928f293dd', 'admin', 0, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:30:01', '', '2021-01-26 08:30:01', b'0');
628 329 COMMIT;
629 330  
630 331 -- ----------------------------
... ... @@ -667,7 +368,7 @@ INSERT INTO `sys_menu` VALUES (105, '字典管理', 'system:dict:list', 2, 6, 1,
667 368 INSERT INTO `sys_menu` VALUES (106, '配置管理', 'infra:config:list', 2, 7, 2, 'config', 'edit', 'infra/config/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-20 14:35:39', b'0');
668 369 INSERT INTO `sys_menu` VALUES (107, '通知公告', 'system:notice:list', 2, 8, 1, 'notice', 'message', 'system/notice/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:45', b'0');
669 370 INSERT INTO `sys_menu` VALUES (108, '日志管理', '', 1, 9, 1, 'log', 'log', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:34:28', b'0');
670   -INSERT INTO `sys_menu` VALUES (109, '在线用户', 'monitor:online:list', 2, 1, 2, 'online', 'online', 'monitor/online/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:45', b'0');
  371 +INSERT INTO `sys_menu` VALUES (109, '在线用户', 'system:user-session:list', 2, 10, 1, 'user-session', 'online', 'system/session/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-26 08:21:20', b'0');
671 372 INSERT INTO `sys_menu` VALUES (110, '定时任务', 'monitor:job:list', 2, 2, 2, 'job', 'job', 'monitor/job/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:45', b'0');
672 373 INSERT INTO `sys_menu` VALUES (111, '数据监控', 'monitor:druid:list', 2, 3, 2, 'druid', 'druid', 'monitor/druid/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:45', b'0');
673 374 INSERT INTO `sys_menu` VALUES (112, '服务监控', 'monitor:server:list', 2, 4, 2, 'http://127.0.0.1:8080/admin', 'server', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-21 04:58:59', b'0');
... ... @@ -720,9 +421,9 @@ INSERT INTO `sys_menu` VALUES (1040, '操作查询', 'system:operate-log:query',
720 421 INSERT INTO `sys_menu` VALUES (1042, '日志导出', 'system:operate-log:export', 3, 2, 500, '', '', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-16 18:28:23', b'0');
721 422 INSERT INTO `sys_menu` VALUES (1043, '登录查询', 'system:login-log:query', 3, 1, 501, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-18 05:29:26', b'0');
722 423 INSERT INTO `sys_menu` VALUES (1045, '日志导出', 'system:login-log:export', 3, 3, 501, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-18 05:29:30', b'0');
723   -INSERT INTO `sys_menu` VALUES (1046, '在线查询', 'monitor:online:query', 3, 1, 109, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:55', b'0');
724   -INSERT INTO `sys_menu` VALUES (1047, '批量强退', 'monitor:online:batchLogout', 3, 2, 109, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:55', b'0');
725   -INSERT INTO `sys_menu` VALUES (1048, '单条强退', 'monitor:online:forceLogout', 3, 3, 109, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:55', b'0');
  424 +INSERT INTO `sys_menu` VALUES (1046, '在线查询', 'system:user-session:list', 3, 1, 109, '', '', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-26 08:22:37', b'0');
  425 +INSERT INTO `sys_menu` VALUES (1047, '批量强退', 'monitor:online:batchLogout', 3, 2, 109, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-26 08:21:46', b'1');
  426 +INSERT INTO `sys_menu` VALUES (1048, '单条强退', 'system:user-session:delete', 3, 3, 109, '', '', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-26 08:22:54', b'0');
726 427 INSERT INTO `sys_menu` VALUES (1049, '任务查询', 'monitor:job:query', 3, 1, 110, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:55', b'0');
727 428 INSERT INTO `sys_menu` VALUES (1050, '任务新增', 'monitor:job:add', 3, 2, 110, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:55', b'0');
728 429 INSERT INTO `sys_menu` VALUES (1051, '任务修改', 'monitor:job:edit', 3, 3, 110, '#', '#', '', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:55', b'0');
... ... @@ -799,7 +500,7 @@ CREATE TABLE `sys_operate_log` (
799 500 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
800 501 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
801 502 PRIMARY KEY (`id`) USING BTREE
802   -) ENGINE=InnoDB AUTO_INCREMENT=85 DEFAULT CHARSET=utf8mb4 COMMENT='操作日志记录';
  503 +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COMMENT='操作日志记录';
803 504  
804 505 -- ----------------------------
805 506 -- Records of sys_operate_log
... ... @@ -886,6 +587,12 @@ INSERT INTO `sys_operate_log` VALUES (81, '78c517c7-191d-46d8-bdc3-5dbeb06be26d'
886 587 INSERT INTO `sys_operate_log` VALUES (82, 'b8c971f3-fd22-4ed3-b5f9-ffc9a8d34859', 1, '菜单 API', '修改菜单', 2, '', '', 'POST', '/api/system/menu/update', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.updateMenu(SysMenuUpdateReqVO)', '{\"reqVO\":{\"name\":\"Redis 监控\",\"permission\":\"\",\"type\":2,\"sort\":\"5\",\"parentId\":2,\"path\":\"redis\",\"icon\":\"redis\",\"component\":\"infra/redis/index\",\"id\":113}}', '2021-01-28 01:23:21', 29, 0, '', 'true', '', '2021-01-26 00:56:30', '', '2021-01-26 00:56:30', b'0');
887 588 INSERT INTO `sys_operate_log` VALUES (83, 'e0922d52-0007-4105-a487-692d00d091c3', 1, '菜单 API', '创建菜单', 2, '', '', 'POST', '/api/system/menu/create', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.createMenu(SysMenuCreateReqVO)', '{\"reqVO\":{\"name\":\"获得 Redis 监控信息\",\"permission\":\"infra:redis:get-monitor-info\",\"type\":3,\"sort\":\"1\",\"parentId\":113,\"path\":null,\"icon\":null,\"component\":null}}', '2021-01-28 01:29:22', 14, 0, '', '1066', '', '2021-01-26 01:02:31', '', '2021-01-26 01:02:31', b'0');
888 589 INSERT INTO `sys_operate_log` VALUES (84, 'f44a431b-395e-45d9-9e6c-3fbdf7617155', 1, '菜单 API', '创建菜单', 2, '', '', 'POST', '/api/system/menu/create', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.createMenu(SysMenuCreateReqVO)', '{\"reqVO\":{\"name\":\"获得 Redis Key 列表\",\"permission\":\"infra:redis:get-key-list\",\"type\":3,\"sort\":\"2\",\"parentId\":113,\"path\":null,\"icon\":null,\"component\":null}}', '2021-01-28 01:29:42', 11, 0, '', '1067', '', '2021-01-26 01:02:52', '', '2021-01-26 01:02:52', b'0');
  590 +INSERT INTO `sys_operate_log` VALUES (85, 'a46dce1a-6ced-4aa5-90f6-8ea979d038a5', 1, '菜单 API', '修改菜单', 2, '', '', 'POST', '/api/system/menu/update', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.updateMenu(SysMenuUpdateReqVO)', '{\"reqVO\":{\"name\":\"在线用户\",\"permission\":\"system:user-session:list\",\"type\":2,\"sort\":\"1\",\"parentId\":2,\"path\":\"user-session\",\"icon\":\"online\",\"component\":\"system/session/index\",\"id\":109}}', '2021-01-30 01:08:01', 49, 0, '', 'true', '', '2021-01-26 08:20:55', '', '2021-01-26 08:20:55', b'0');
  591 +INSERT INTO `sys_operate_log` VALUES (86, 'f2092546-cbd3-485e-b54b-95a1448b9985', 1, '菜单 API', '修改菜单', 2, '', '', 'POST', '/api/system/menu/update', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.updateMenu(SysMenuUpdateReqVO)', '{\"reqVO\":{\"name\":\"在线用户\",\"permission\":\"system:user-session:list\",\"type\":2,\"sort\":\"10\",\"parentId\":1,\"path\":\"user-session\",\"icon\":\"online\",\"component\":\"system/session/index\",\"id\":109}}', '2021-01-30 01:08:26', 16, 0, '', 'true', '', '2021-01-26 08:21:20', '', '2021-01-26 08:21:20', b'0');
  592 +INSERT INTO `sys_operate_log` VALUES (87, 'c2b446cc-c49e-477f-93de-bf2f900d6483', 1, '菜单 API', '删除菜单', 2, '', '', 'POST', '/api/system/menu/delete', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.deleteMenu(Long)', '{\"id\":1047}', '2021-01-30 01:08:51', 48, 0, '', 'true', '', '2021-01-26 08:21:46', '', '2021-01-26 08:21:46', b'0');
  593 +INSERT INTO `sys_operate_log` VALUES (88, '1597d596-7be2-4af1-b50a-bc169974a4fb', 1, '菜单 API', '修改菜单', 2, '', '', 'POST', '/api/system/menu/update', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.updateMenu(SysMenuUpdateReqVO)', '{\"reqVO\":{\"name\":\"在线查询\",\"permission\":\"system:user-session:list\",\"type\":3,\"sort\":\"1\",\"parentId\":109,\"path\":\"#\",\"icon\":\"#\",\"component\":\"\",\"id\":1046}}', '2021-01-30 01:09:43', 16, 0, '', 'true', '', '2021-01-26 08:22:37', '', '2021-01-26 08:22:37', b'0');
  594 +INSERT INTO `sys_operate_log` VALUES (89, 'd8afad81-a738-4b8f-a7f0-bbf4515540e9', 1, '菜单 API', '修改菜单', 2, '', '', 'POST', '/api/system/menu/update', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.permission.SysMenuController.updateMenu(SysMenuUpdateReqVO)', '{\"reqVO\":{\"name\":\"单条强退\",\"permission\":\"system:user-session:delete\",\"type\":3,\"sort\":\"3\",\"parentId\":109,\"path\":\"#\",\"icon\":\"#\",\"component\":\"\",\"id\":1048}}', '2021-01-30 01:10:00', 19, 0, '', 'true', '', '2021-01-26 08:22:54', '', '2021-01-26 08:22:54', b'0');
  595 +INSERT INTO `sys_operate_log` VALUES (90, '28d257d8-d578-4bbe-b671-09d3ce94bda6', 1, '用户 Session API', '删除 Session', 4, '', '', 'DELETE', '/api/system/user-session/delete', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', 'CommonResult cn.iocoder.dashboard.modules.system.controller.auth.SysUserSessionController.delete(String)', '{\"id\":\"73cc914671034f3190f09f520d1b39e9\"}', '2021-01-30 01:16:55', 11, 0, '', 'true', '', '2021-01-26 08:29:50', '', '2021-01-26 08:29:50', b'0');
889 596 COMMIT;
890 597  
891 598 -- ----------------------------
... ... @@ -1192,4 +899,110 @@ INSERT INTO `sys_user_role` VALUES (6, 100, 2, '', NULL, '', NULL, b'0');
1192 899 INSERT INTO `sys_user_role` VALUES (7, 104, 101, '', NULL, '', NULL, b'0');
1193 900 COMMIT;
1194 901  
  902 +-- ----------------------------
  903 +-- Table structure for sys_user_session
  904 +-- ----------------------------
  905 +DROP TABLE IF EXISTS `sys_user_session`;
  906 +CREATE TABLE `sys_user_session` (
  907 + `id` varchar(32) NOT NULL COMMENT '会话编号',
  908 + `user_id` bigint(20) NOT NULL COMMENT '用户编号',
  909 + `user_ip` varchar(50) NOT NULL COMMENT '用户 IP',
  910 + `user_agent` varchar(200) NOT NULL COMMENT '浏览器 UA',
  911 + `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
  912 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  913 + `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
  914 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  915 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  916 + PRIMARY KEY (`id`) USING BTREE
  917 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户在线 Session';
  918 +
  919 +-- ----------------------------
  920 +-- Records of sys_user_session
  921 +-- ----------------------------
  922 +BEGIN;
  923 +INSERT INTO `sys_user_session` VALUES ('73cc914671034f3190f09f520d1b39e9', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:29:27', '', '2021-01-26 08:29:50', b'1');
  924 +INSERT INTO `sys_user_session` VALUES ('9cc71dc2d7a24b978db1bfe0e4bae349', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', '', '2021-01-26 08:30:01', '', '2021-01-26 08:30:01', b'0');
  925 +COMMIT;
  926 +
  927 +-- ----------------------------
  928 +-- Table structure for tool_codegen_table
  929 +-- ----------------------------
  930 +DROP TABLE IF EXISTS `tool_codegen_table`;
  931 +CREATE TABLE `tool_codegen_table` (
  932 + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
  933 + `table_name` varchar(200) NOT NULL DEFAULT '' COMMENT '表名称',
  934 + `table_comment` varchar(500) NOT NULL DEFAULT '' COMMENT '表描述',
  935 + `remark` varchar(500) DEFAULT NULL COMMENT '备注',
  936 + `module_name` varchar(30) NOT NULL COMMENT '生成模块名',
  937 + `business_name` varchar(30) NOT NULL COMMENT '生成业务名',
  938 + `class_name` varchar(100) NOT NULL DEFAULT '' COMMENT '实体类名称',
  939 + `class_comment` varchar(50) NOT NULL COMMENT '生成功能名',
  940 + `author` varchar(50) NOT NULL COMMENT '生成作者',
  941 + `template_type` tinyint(4) NOT NULL COMMENT '使用的模板（crud单表操作 tree树表操作）',
  942 + `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
  943 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  944 + `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
  945 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  946 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  947 + `package_name` varchar(100) DEFAULT NULL COMMENT '生成包路径',
  948 + `sub_table_name` varchar(64) DEFAULT NULL COMMENT '关联子表的表名',
  949 + `sub_table_fk_name` varchar(64) DEFAULT NULL COMMENT '子表关联的外键名',
  950 + `options` varchar(1000) DEFAULT NULL COMMENT '其它生成选项',
  951 + PRIMARY KEY (`id`) USING BTREE
  952 +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COMMENT='代码生成表定义';
  953 +
  954 +-- ----------------------------
  955 +-- Records of tool_codegen_table
  956 +-- ----------------------------
  957 +BEGIN;
  958 +INSERT INTO `tool_codegen_table` VALUES (8, 'sys_dict_type', '字典类型表', NULL, 'system', 'test', 'SysDictType', '字典类型', '芋艿', 1, '', '2021-01-31 00:24:41', '', '2021-01-31 05:47:01', b'0', NULL, NULL, NULL, NULL);
  959 +COMMIT;
  960 +
  961 +-- ----------------------------
  962 +-- Table structure for tool_codegen_table_column
  963 +-- ----------------------------
  964 +DROP TABLE IF EXISTS `tool_codegen_table_column`;
  965 +CREATE TABLE `tool_codegen_table_column` (
  966 + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
  967 + `table_id` bigint(20) NOT NULL COMMENT '归属表编号',
  968 + `column_name` varchar(200) NOT NULL COMMENT '列名称',
  969 + `column_type` varchar(100) NOT NULL COMMENT '列类型',
  970 + `column_comment` varchar(500) NOT NULL COMMENT '列描述',
  971 + `nullable` bit(1) NOT NULL COMMENT '是否必填（1是）',
  972 + `primary_key` bit(1) NOT NULL COMMENT '是否主键（1是）',
  973 + `auto_Increment` char(1) NOT NULL COMMENT '是否自增（1是）',
  974 + `ordinal_position` int(11) NOT NULL COMMENT '排序',
  975 + `java_type` varchar(32) NOT NULL COMMENT 'JAVA类型',
  976 + `java_field` varchar(64) NOT NULL COMMENT 'JAVA字段名',
  977 + `dict_type` varchar(200) DEFAULT '' COMMENT '字典类型',
  978 + `create_operation` bit(1) NOT NULL COMMENT '是否为 Create 创建操作的字段',
  979 + `update_operation` bit(1) NOT NULL COMMENT '是否为 Update 更新操作的字段',
  980 + `list_operation` bit(1) NOT NULL COMMENT '是否为 List 查询操作的字段',
  981 + `list_operation_condition` varchar(32) NOT NULL DEFAULT 'EQ' COMMENT 'List 查询操作的条件类型',
  982 + `list_operation_result` bit(1) NOT NULL COMMENT '是否为 List 查询操作的返回字段',
  983 + `html_type` varchar(32) NOT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
  984 + `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
  985 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  986 + `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
  987 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  988 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  989 + PRIMARY KEY (`id`) USING BTREE
  990 +) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COMMENT='代码生成表字段定义';
  991 +
  992 +-- ----------------------------
  993 +-- Records of tool_codegen_table_column
  994 +-- ----------------------------
  995 +BEGIN;
  996 +INSERT INTO `tool_codegen_table_column` VALUES (31, 8, 'id', 'bigint(20)', '字典主键', b'0', b'1', '1', 1, 'Long', 'id', '', b'0', b'1', b'0', '=', b'1', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  997 +INSERT INTO `tool_codegen_table_column` VALUES (32, 8, 'name', 'varchar(100)', '字典名称', b'0', b'0', '0', 2, 'String', 'name', '', b'1', b'1', b'1', 'LIKE', b'1', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  998 +INSERT INTO `tool_codegen_table_column` VALUES (33, 8, 'dict_type', 'varchar(100)', '字典类型', b'0', b'0', '0', 3, 'String', 'dictType', '', b'1', b'1', b'1', '=', b'1', 'select', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  999 +INSERT INTO `tool_codegen_table_column` VALUES (34, 8, 'status', 'tinyint(4)', '状态', b'0', b'0', '0', 4, 'Integer', 'status', 'sys_common_status', b'1', b'1', b'1', '=', b'1', 'radio', '', '2021-01-31 00:24:42', '', '2021-01-31 04:38:58', b'0');
  1000 +INSERT INTO `tool_codegen_table_column` VALUES (35, 8, 'remark', 'varchar(500)', '备注', b'1', b'0', '0', 5, 'String', 'remark', '', b'1', b'1', b'1', '=', b'1', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  1001 +INSERT INTO `tool_codegen_table_column` VALUES (36, 8, 'create_by', 'varchar(64)', '创建者', b'1', b'0', '0', 6, 'String', 'createBy', '', b'0', b'0', b'0', '=', b'0', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  1002 +INSERT INTO `tool_codegen_table_column` VALUES (37, 8, 'create_time', 'datetime', '创建时间', b'0', b'0', '0', 7, 'Date', 'createTime', '', b'0', b'0', b'0', 'BETWEEN', b'0', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  1003 +INSERT INTO `tool_codegen_table_column` VALUES (38, 8, 'update_by', 'varchar(64)', '更新者', b'1', b'0', '0', 8, 'String', 'updateBy', '', b'0', b'0', b'0', '=', b'0', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  1004 +INSERT INTO `tool_codegen_table_column` VALUES (39, 8, 'update_time', 'datetime', '更新时间', b'0', b'0', '0', 9, 'Date', 'updateTime', '', b'0', b'0', b'0', 'BETWEEN', b'0', 'input', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  1005 +INSERT INTO `tool_codegen_table_column` VALUES (40, 8, 'deleted', 'bit(1)', '是否删除', b'0', b'0', '0', 10, 'Boolean', 'deleted', '', b'0', b'0', b'0', '=', b'0', 'radio', '', '2021-01-31 00:24:42', '', '2021-01-31 00:24:42', b'0');
  1006 +COMMIT;
  1007 +
1195 1008 SET FOREIGN_KEY_CHECKS = 1;
... ...
src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java
  View file @18b6dfa
... ... @@ -44,6 +44,13 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
44 44 return this;
45 45 }
46 46  
  47 + public QueryWrapperX<T> neIfPresent(String column, Object val) {
  48 + if (val != null) {
  49 + return (QueryWrapperX<T>) super.ne(column, val);
  50 + }
  51 + return this;
  52 + }
  53 +
47 54 public QueryWrapperX<T> gtIfPresent(String column, Object val) {
48 55 if (val != null) {
49 56 return (QueryWrapperX<T>) super.gt(column, val);
... ... @@ -51,6 +58,13 @@ public class QueryWrapperX&lt;T&gt; extends QueryWrapper&lt;T&gt; {
51 58 return this;
52 59 }
53 60  
  61 + public QueryWrapperX<T> geIfPresent(String column, Object val) {
  62 + if (val != null) {
  63 + return (QueryWrapperX<T>) super.ge(column, val);
  64 + }
  65 + return this;
  66 + }
  67 +
54 68 public QueryWrapperX<T> betweenIfPresent(String column, Object val1, Object val2) {
55 69 if (val1 != null && val2 != null) {
56 70 return (QueryWrapperX<T>) super.between(column, val1, val2);
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dept/SysDeptMapper.java
  View file @18b6dfa
1 1 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept;
2 2  
  3 +import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
3 4 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
4 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
5 6 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
6 7 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
10 10 import java.util.Date;
11 11 import java.util.List;
12 12  
13 13 @Mapper
14   -public interface SysDeptMapper extends BaseMapper<SysDeptDO> {
15   -
16   - default List<SysDeptDO> selectList() {
17   - return selectList(new QueryWrapper<>());
18   - }
  14 +public interface SysDeptMapper extends BaseMapperX<SysDeptDO> {
19 15  
20 16 default List<SysDeptDO> selectList(SysDeptListReqVO reqVO) {
21 17 return selectList(new QueryWrapperX<SysDeptDO>().likeIfPresent("name", reqVO.getName())
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictDataMapper.java
  View file @18b6dfa
... ... @@ -31,10 +31,6 @@ public interface SysDictDataMapper extends BaseMapperX&lt;SysDictDataDO&gt; {
31 31 .orderByAsc("dict_type", "sort"));
32 32 }
33 33  
34   - default List<SysDictDataDO> selectList() {
35   - return selectList(new QueryWrapper<>());
36   - }
37   -
38 34 default List<SysDictDataDO> selectList(SysDictDataExportReqVO reqVO) {
39 35 return selectList(new QueryWrapperX<SysDictDataDO>().likeIfPresent("label", reqVO.getLabel())
40 36 .likeIfPresent("dict_type", reqVO.getDictType())
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictTypeMapper.java
  View file @18b6dfa
... ... @@ -6,7 +6,6 @@ import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
8 8 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
9   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 9 import org.apache.ibatis.annotations.Mapper;
11 10  
12 11 import java.util.List;
... ... @@ -37,8 +36,4 @@ public interface SysDictTypeMapper extends BaseMapperX&lt;SysDictTypeDO&gt; {
37 36 return selectOne(new QueryWrapperX<SysDictTypeDO>().eq("name", name));
38 37 }
39 38  
40   - default List<SysDictTypeDO> selectList() {
41   - return selectList(new QueryWrapper<>());
42   - }
43   -
44 39 }
... ...
src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java
  View file @18b6dfa
... ... @@ -3,9 +3,12 @@ package cn.iocoder.dashboard.modules.tool.service.codegen.impl;
3 3 import cn.hutool.extra.template.TemplateConfig;
4 4 import cn.hutool.extra.template.TemplateEngine;
5 5 import cn.hutool.extra.template.TemplateUtil;
  6 +import cn.iocoder.dashboard.common.pojo.PageResult;
6 7 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
  8 +import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
7 9 import cn.iocoder.dashboard.modules.tool.dal.mysql.dataobject.codegen.ToolCodegenColumnDO;
8 10 import cn.iocoder.dashboard.modules.tool.dal.mysql.dataobject.codegen.ToolCodegenTableDO;
  11 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
9 12 import org.springframework.stereotype.Component;
10 13  
11 14 import java.util.HashMap;
... ... @@ -27,22 +30,41 @@ public class ToolCodegenEngine {
27 30 * 模板引擎，由 hutool 实现
28 31 */
29 32 private final TemplateEngine templateEngine;
  33 + /**
  34 + * 全局通用变量映射
  35 + */
  36 + private final Map<String, Object> globalBindingMap = new HashMap<>();
30 37  
31 38 public ToolCodegenEngine() {
  39 + // 初始化 TemplateEngine 属性
32 40 TemplateConfig config = new TemplateConfig();
33 41 config.setResourceMode(TemplateConfig.ResourceMode.CLASSPATH);
34 42 this.templateEngine = TemplateUtil.createEngine(config);
  43 + // 初始化基础 bindingMap
  44 + initGlobalBindingMap();
  45 + }
  46 +
  47 + private void initGlobalBindingMap() {
  48 + // 全局配置
  49 + globalBindingMap.put("basePackage", "cn.iocoder.dashboard.modules"); // TODO 基础包
  50 + // 全局 Java Bean
  51 + globalBindingMap.put("pageResultClassName", PageResult.class.getName());
  52 + // DO 类，独有字段
  53 + globalBindingMap.put("baseDOFields", ToolCodegenBuilder.BASE_DO_FIELDS);
  54 + globalBindingMap.put("baseDOClassName", BaseDO.class.getName());
  55 + globalBindingMap.put("QueryWrapperClassName", QueryWrapperX.class.getName());
  56 + globalBindingMap.put("BaseMapperClassName", BaseMapper.class.getName());
35 57 }
36 58  
37 59 public void execute(ToolCodegenTableDO table, List<ToolCodegenColumnDO> columns) {
  60 + // 创建 bindingMap
38 61 Map<String, Object> bindingMap = new HashMap<>();
39 62 bindingMap.put("table", table);
40 63 bindingMap.put("columns", columns);
41   - bindingMap.put("basePackage", "cn.iocoder.dashboard.modules"); // TODO 基础包
42   - // DO 类，独有字段
43   - bindingMap.put("baseDOFields", ToolCodegenBuilder.BASE_DO_FIELDS);
44   - bindingMap.put("baseDOClassName", BaseDO.class.getName());
45   - String result = templateEngine.getTemplate("codegen/dal/do.vm").render(bindingMap);
  64 + bindingMap.putAll(globalBindingMap);
  65 + // 执行生成
  66 +// String result = templateEngine.getTemplate("codegen/dal/do.vm").render(bindingMap);
  67 + String result = templateEngine.getTemplate("codegen/dal/mapper.vm").render(bindingMap);
46 68 System.out.println(result);
47 69 }
48 70  
... ...
src/main/resources/codegen/dal/mapper.vm 0 → 100644
  View file @18b6dfa
  1 +package ${basePackage}.${table.moduleName}.dal.mysql.dao.${table.businessName};
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +
  5 +import ${pageResultClassName};
  6 +import ${QueryWrapperClassName};
  7 +import ${BaseMapperClassName};
  8 +import ${basePackage}.${table.moduleName}.dal.mysql.dataobject.${table.businessName}DO;
  9 +import org.apache.ibatis.annotations.Mapper;
  10 +
  11 +@Mapper
  12 +public interface ${table.className}Mapper extends BaseMapperX<${table.className}DO> {
  13 +
  14 + default PageResult<${table.className}DO> selectPage(${table.className}PageReqVO reqVO) {
  15 + return selectPage(reqVO, new QueryWrapperX<${table.className}DO>()
  16 +#foreach ($column in $columns)
  17 +#if (${column.listOperation})
  18 +#set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写
  19 +#if (${column.listOperationCondition} == "=")##情况一，= 的时候
  20 + .eqIfPresent("${column.column_name}", reqVO.get${JavaField}())
  21 +#end
  22 +#if (${column.listOperationCondition} == "!=")##情况二，!= 的时候
  23 + .neIfPresent("${column.column_name}", reqVO.get${JavaField}())
  24 +#end
  25 +#if (${column.listOperationCondition} == ">")##情况三，> 的时候
  26 + .gtIfPresent("${column.column_name}", reqVO.get${JavaField}())
  27 +#end
  28 +#if (${column.listOperationCondition} == ">=")##情况四，>= 的时候
  29 + .geIfPresent("${column.column_name}", reqVO.get${JavaField}())
  30 +#end
  31 +#if (${column.listOperationCondition} == "<")##情况五，< 的时候
  32 + .gtIfPresent("${column.column_name}", reqVO.get${JavaField}())
  33 +#end
  34 +#if (${column.listOperationCondition} == "<=")##情况六，<= 的时候
  35 + .geIfPresent("${column.column_name}", reqVO.get${JavaField}())
  36 +#end
  37 +#end
  38 +#end
  39 + );
  40 + }
  41 +
  42 +}
... ...