diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt new file mode 100644 index 0000000..1c36b1e --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt @@ -0,0 +1,23 @@ +-- 菜单 +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) +VALUES ('{FunctionName}', 0, 1, '/{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '{Permission}:list', '#', '', sysdate(), '', NULL, '{ModelTypeDesc}菜单'); + +-- 按钮父菜单id +SELECT @menuId := LAST_INSERT_ID(); + + +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) +VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:query', '', '', sysdate(), '', NULL, ''); + +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) +VALUES ('新增', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:add', '', '', sysdate(), '', NULL, NULL); + +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) +VALUES ('删除', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:delete', '', '', sysdate(), '', NULL, NULL); + +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) +VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', sysdate(), '', NULL, NULL); + + +SELECT * FROM sys_menu WHERE parentId = @menuId; +SELECT * FROM sys_menu WHERE menuId = @menuId; \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt index f6e1aff..3cd128c 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt @@ -1,6 +1,6 @@ -- 菜单 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}', 0, 1, '/{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '', '{Permission}:list', '', GETDATE(), '', NULL, '{ModelTypeDesc}'); +VALUES ('{FunctionName}', 0, 1, '/{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '{Permission}:list', '#', '', GETDATE(), '', NULL, '{ModelTypeDesc}'); -- 按钮父菜单id declare @menuId int = @@identity @@ -17,3 +17,7 @@ VALUES ('删除', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:dele INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL); + +GO +SELECT * FROM sys_menu WHERE parentId = @menuId; +SELECT * FROM sys_menu WHERE menuId = @menuId; \ No newline at end of file diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index d2c6d99..e310ef8 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -62,7 +62,7 @@ namespace ZR.CodeGenerator replaceDto.ModelTypeName = tableInfo.ClassName;//表名对应C# 实体类名 replaceDto.TableName = tableInfo.TableName;//表名 replaceDto.TableDesc = tableInfo.TableComment;//表说明描述 - replaceDto.Permission = tableInfo.ClassName.ToLower();//权限 + replaceDto.Permission = $"{tableInfo.ModuleName}:{tableInfo.ClassName.ToLower()}";//权限 replaceDto.ViewsFileName = FirstLowerCase(replaceDto.ModelTypeName); //循环表字段信息 foreach (GenTableColumn dbFieldInfo in listField) @@ -393,7 +393,19 @@ namespace ZR.CodeGenerator if (File.Exists(fullPath) && !generateDto.coverd) return Tuple.Create(fullPath, ""); - var content = ReadTemplate("SqlTemplate.txt") + var tempName = ""; + switch (generateDto.DbType) + { + case 0: + tempName = "MySqlTemplate"; + break; + case 1: + tempName = "SqlTemplate"; + break; + default: + break; + } + var content = ReadTemplate($"{tempName}.txt") .Replace("{ModelTypeName}", replaceDto.ModelTypeName) .Replace("{Permission}", replaceDto.Permission) .Replace("{ModelTypeDesc}", replaceDto.TableDesc) diff --git a/ZR.CodeGenerator/Model/GenerateDto.cs b/ZR.CodeGenerator/Model/GenerateDto.cs index 4bfe0b0..7c7d599 100644 --- a/ZR.CodeGenerator/Model/GenerateDto.cs +++ b/ZR.CodeGenerator/Model/GenerateDto.cs @@ -20,6 +20,10 @@ namespace ZR.CodeGenerator.Model /// 如果目标文件存在，是否覆盖。默认为false /// public bool coverd { get; set; } = true; + /// + /// 生成代码的数据库类型 0、mysql 1、sqlserver + /// + public int DbType { get; set; } public GenTable GenTable { get; set; } #region 存储路径 //public string ModelPath { get; set; } diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue index f191087..69242cb 100644 --- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue +++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue @@ -11,7 +11,7 @@ - + @@ -76,9 +76,9 @@ 生成代码方式 - + zip压缩包 diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue index 9731d69..14e9b11 100644 --- a/ZR.Vue/src/views/tool/gen/index.vue +++ b/ZR.Vue/src/views/tool/gen/index.vue @@ -63,6 +63,11 @@ 否 + + mySql + sqlServer + +
确 定 @@ -87,21 +92,11 @@ export default { queryParams: { pageNum: 1, pageSize: 20, - dbName: "", tableName: "", - baseSpace: "", - replaceTableNameStr: "", }, showGenerate: false, checkedCodeGenerateForm: [1, 2, 3, 4, 5, 6, 7], - rules: { - dbName: [ - { required: true, message: "请选择数据库名称", trigger: "blur" }, - ], - replaceTableNameStr: [ - { min: 0, max: 50, message: "长度小于50个字符", trigger: "blur" }, - ], - }, + rules: {}, // 表数据 tableData: [], // 是否显示加载 @@ -109,13 +104,12 @@ export default { total: 0, // 选中行的表 currentSelected: {}, - selectedDataBase: [], - // 列信息 - // columnData: [], // 选中的列 checkedQueryColumn: [], //是否覆盖原先代码 coverd: true, + // 生成SQL脚本的数据库类型 + dbType: 0, // 选中的表 tableIds: [], // 非多个禁用 @@ -176,6 +170,7 @@ export default { tableName: this.currentSelected.name, genFiles: this.checkedCodeGenerateForm, coverd: this.coverd, + dbType: this.dbType, queryColumn: this.checkedQueryColumn, }; console.log(JSON.stringify(seachdata));