From ae15be5357d6be24d486c860a4ae2ea27800f570 Mon Sep 17 00:00:00 2001 From: lbw Date: Thu, 27 Apr 2023 21:16:21 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=85=A8=E9=80=89=E5=90=8E=E5=8F=96=E6=B6=88=E5=85=A8=E6=98=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/8pigxx_codegen.sql | 69 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql index f0ed9f4cc..214f213f3 100644 --- a/db/8pigxx_codegen.sql +++ b/db/8pigxx_codegen.sql @@ -38,14 +38,14 @@ COMMIT; DROP TABLE IF EXISTS `gen_field_type`; CREATE TABLE `gen_field_type` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `column_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段类型', - `attr_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性类型', - `package_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性包名', + `column_type` varchar(200) DEFAULT NULL COMMENT '字段类型', + `attr_type` varchar(200) DEFAULT NULL COMMENT '属性类型', + `package_name` varchar(200) DEFAULT NULL COMMENT '属性包名', `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `create_by` varchar(64) DEFAULT NULL COMMENT '创建人', `update_time` datetime DEFAULT NULL COMMENT '修改时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + `update_by` varchar(64) DEFAULT NULL COMMENT '修改人', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', PRIMARY KEY (`id`), UNIQUE KEY `column_type` (`column_type`) ) ENGINE=InnoDB AUTO_INCREMENT=1634915190321451010 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='字段类型管理'; @@ -124,7 +124,7 @@ CREATE TABLE `gen_group` ( `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ' ' COMMENT '修改人', `create_time` datetime DEFAULT NULL COMMENT '创建人', `update_time` datetime DEFAULT NULL COMMENT '修改人', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + `del_flag` char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='模板分组'; @@ -144,28 +144,28 @@ COMMIT; DROP TABLE IF EXISTS `gen_table`; CREATE TABLE `gen_table` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '表名', - `class_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类名', + `table_name` varchar(200) DEFAULT NULL COMMENT '表名', + `class_name` varchar(200) DEFAULT NULL COMMENT '类名', `db_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据库类型', - `table_comment` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '说明', - `author` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '作者', - `email` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '邮箱', - `package_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目包名', - `version` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目版本号', + `table_comment` varchar(200) DEFAULT NULL COMMENT '说明', + `author` varchar(200) DEFAULT NULL COMMENT '作者', + `email` varchar(200) DEFAULT NULL COMMENT '邮箱', + `package_name` varchar(200) DEFAULT NULL COMMENT '项目包名', + `version` varchar(200) DEFAULT NULL COMMENT '项目版本号', `i18n` tinyint(4) DEFAULT '1' COMMENT '是否生成带有i18n 0 不带有 1带有', `style` bigint(20) DEFAULT '0' COMMENT '代码风格', `generator_type` tinyint(4) DEFAULT NULL COMMENT '生成方式 0:zip压缩包 1:自定义目录', - `backend_path` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '后端生成路径', - `frontend_path` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '前端生成路径', - `module_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '模块名', - `function_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '功能名', + `backend_path` varchar(500) DEFAULT NULL COMMENT '后端生成路径', + `frontend_path` varchar(500) DEFAULT NULL COMMENT '前端生成路径', + `module_name` varchar(200) DEFAULT NULL COMMENT '模块名', + `function_name` varchar(200) DEFAULT NULL COMMENT '功能名', `form_layout` tinyint(4) DEFAULT NULL COMMENT '表单布局 1:一列 2:两列', - `ds_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据源ID', + `ds_name` varchar(200) DEFAULT NULL COMMENT '数据源ID', `baseclass_id` bigint(20) DEFAULT NULL COMMENT '基类ID', `create_time` datetime DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`), UNIQUE KEY `table_name` (`table_name`,`ds_name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='代码生成表'; +) ENGINE=InnoDB AUTO_INCREMENT=1642522692257112067 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='代码生成表'; -- ---------------------------- -- Records of gen_table @@ -180,26 +180,26 @@ DROP TABLE IF EXISTS `gen_table_column`; CREATE TABLE `gen_table_column` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `ds_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据源名称', - `table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '表名称', - `field_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段名称', - `field_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段类型', - `field_comment` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段说明', - `attr_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性名', - `attr_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性类型', - `package_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性包名', + `table_name` varchar(200) DEFAULT NULL COMMENT '表名称', + `field_name` varchar(200) DEFAULT NULL COMMENT '字段名称', + `field_type` varchar(200) DEFAULT NULL COMMENT '字段类型', + `field_comment` varchar(200) DEFAULT NULL COMMENT '字段说明', + `attr_name` varchar(200) DEFAULT NULL COMMENT '属性名', + `attr_type` varchar(200) DEFAULT NULL COMMENT '属性类型', + `package_name` varchar(200) DEFAULT NULL COMMENT '属性包名', `sort` int(11) DEFAULT NULL COMMENT '排序', - `auto_fill` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '自动填充 DEFAULT、INSERT、UPDATE、INSERT_UPDATE', + `auto_fill` varchar(20) DEFAULT NULL COMMENT '自动填充 DEFAULT、INSERT、UPDATE、INSERT_UPDATE', `primary_pk` tinyint(4) DEFAULT NULL COMMENT '主键 0:否 1:是', `base_field` tinyint(4) DEFAULT NULL COMMENT '基类字段 0:否 1:是', `form_item` tinyint(4) DEFAULT NULL COMMENT '表单项 0:否 1:是', `form_required` tinyint(4) DEFAULT NULL COMMENT '表单必填 0:否 1:是', - `form_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '表单类型', - `form_validator` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '表单效验', + `form_type` varchar(200) DEFAULT NULL COMMENT '表单类型', + `form_validator` varchar(200) DEFAULT NULL COMMENT '表单效验', `grid_item` tinyint(4) DEFAULT NULL COMMENT '列表项 0:否 1:是', `grid_sort` tinyint(4) DEFAULT NULL COMMENT '列表排序 0:否 1:是', `query_item` tinyint(4) DEFAULT NULL COMMENT '查询项 0:否 1:是', - `query_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '查询方式', - `query_form_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '查询表单类型', + `query_type` varchar(200) DEFAULT NULL COMMENT '查询方式', + `query_form_type` varchar(200) DEFAULT NULL COMMENT '查询表单类型', `field_dict` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字典类型', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='代码生成表字段'; @@ -243,9 +243,9 @@ INSERT INTO `gen_template` VALUES (7, 'template/Mapper.java.vm', '${backendPath} INSERT INTO `gen_template` VALUES (8, 'template/Mapper.xml.vm', '${backendPath}/src/main/resources/mapper/${ClassName}Mapper.xml', 'Mapper.xml', '\n\n\n\n\n \n#foreach ($field in $fieldList)\n #if($field.primaryPk)\n \n #end\n #if(!$field.primaryPk)\n \n #end\n#end\n \n', '2023-02-23 01:18:35', '2023-02-23 12:13:44', '0', 1, ' ', ' '); INSERT INTO `gen_template` VALUES (9, 'template/menu.sql.vm', '${backendPath}/menu/${functionName}_menu.sql', 'menu.sql', '-- 该脚本不要直接执行, 注意维护菜单的父节点ID 默认 父节点-1 , 默认租户 1\n#set($menuId=${dateTool.getSystemTime()})\n\n -- 菜单SQL\n insert into `sys_menu` ( `menu_id`,`parent_id`, `path`, `permission`, `menu_type`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${menuId}, \'-1\', \'/${moduleName}/${functionName}/index\', \'\', \'0\', \'icon-bangzhushouji\', \'0\', null , \'8\', null , \'${tableComment}管理\', 1);\n\n-- 按钮父菜单ID\n set @parentId = @@identity;\n\n-- 菜单对应按钮SQL\n insert into `sys_menu` ( `menu_id`,`parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,1)},${menuId}, \'${moduleName}_${functionName}_view\', \'1\', null, \'1\', \'0\', null, \'0\', null, \'${tableComment}查看\', 1);\n\n insert into `sys_menu` ( `menu_id`,`parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,2)},${menuId}, \'${moduleName}_${functionName}_add\', \'1\', null, \'1\', \'0\', null, \'1\', null, \'${tableComment}新增\', 1);\n\n insert into `sys_menu` (`menu_id`, `parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,3)},${menuId}, \'${moduleName}_${functionName}_edit\', \'1\', null, \'1\', \'0\', null, \'2\', null, \'${tableComment}修改\', 1);\n\n insert into `sys_menu` (`menu_id`, `parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,4)},${menuId}, \'${moduleName}_${functionName}_del\', \'1\', null, \'1\', \'0\', null, \'3\', null, \'${tableComment}删除\', 1);\n\n insert into `sys_menu` ( `menu_id`,`parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,5)},${menuId}, \'${moduleName}_${functionName}_export\', \'1\', null, \'1\', \'0\', null, \'3\', null, \'导入导出\', 1);', '2023-02-23 01:19:08', '2023-02-23 12:13:47', '0', 1, ' ', ' '); INSERT INTO `gen_template` VALUES (10, 'template/plus/api.ts.vm', '${frontendPath}/src/api/${moduleName}/${functionName}.ts', 'vue3 版本api.ts', 'import request from \"/@/utils/request\"\n\nexport function fetchList(query?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}/page\',\n method: \'get\',\n params: query\n })\n}\n\nexport function addObj(obj?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}\',\n method: \'post\',\n data: obj\n })\n}\n\nexport function getObj(id?: string) {\n return request({\n url: \'/${moduleName}/${functionName}/\' + id,\n method: \'get\'\n })\n}\n\nexport function delObjs(ids?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}\',\n method: \'delete\',\n data: ids\n })\n}\n\nexport function putObj(obj?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}\',\n method: \'put\',\n data: obj\n })\n}', '2023-02-23 01:19:23', '2023-02-23 12:13:49', '0', 1, ' ', ' '); -INSERT INTO `gen_template` VALUES (11, 'template/plus/index.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', 'vue3版本页面不含i18n', '\n\n', '2023-02-23 01:19:35', '2023-04-03 18:21:24', '0', 1, '', 'admin'); +INSERT INTO `gen_template` VALUES (11, 'template/plus/index.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', 'vue3版本页面不含i18n', '\n\n', '2023-02-23 01:19:35', '2023-04-27 21:02:59', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (12, 'template/plus/form.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3版本表单弹窗不含i18n', '\n\n', '2023-02-23 01:19:48', '2023-04-10 22:57:27', '0', 1, '', 'admin'); -INSERT INTO `gen_template` VALUES (13, 'template/plus/i18n/index.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', 'vue3列表页面含i18n', '\n\n', '2023-02-23 01:20:01', '2023-04-03 18:21:02', '0', 1, '', 'admin'); +INSERT INTO `gen_template` VALUES (13, 'template/plus/i18n/index.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', 'vue3列表页面含i18n', '\n\n', '2023-02-23 01:20:01', '2023-04-27 21:02:24', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (14, 'template/plus/i18n/form.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单弹窗页面含i18n', '\n\n', '2023-02-23 01:20:13', '2023-04-10 22:56:03', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (15, 'template/plus/i18n/en.ts.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/i18n/en.ts', 'i18n英文模板', 'export default {\n ${functionName}: {\n index: \'#\',\n import${className}Tip: \'import ${ClassName}\',\n#foreach($field in $fieldList)\n ${field.attrName}: \'${field.attrName}\',\n#end\n#foreach($field in $fieldList)\n input$str.pascalCase(${field.attrName})Tip: \'input ${field.attrName}\',\n#end\n }\n}', '2023-02-23 01:20:25', '2023-04-03 18:21:30', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (16, 'template/plus/i18n/zh-cn.ts.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/i18n/zh-cn.ts', 'i18n中文模板', 'export default {\n ${functionName}: {\n index: \'#\',\n import${className}Tip: \'导入${tableComment}\',\n#foreach($field in $fieldList)\n ${field.attrName}: \'#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\',\n#end\n#foreach($field in $fieldList)\n input$str.pascalCase(${field.attrName})Tip: \'请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\',\n#end\n }\n}', '2023-02-23 01:20:40', '2023-04-03 18:21:42', '0', 1, '', 'admin'); @@ -253,7 +253,6 @@ INSERT INTO `gen_template` VALUES (17, 'template/plus/i18n/form-drawer.vue.vm', INSERT INTO `gen_template` VALUES (18, 'template/plus/form-drawer.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单抽屉页面不含i18n', '\n\n', '2023-02-23 12:17:00', '2023-04-10 23:03:31', '0', 1, '', 'admin'); COMMIT; - -- ---------------------------- -- Table structure for gen_template_group -- ----------------------------