wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨代码生成添加方法新增可以生成雪花id列

Browse Source
This commit is contained in:
不做码农 2023-11-20 17:46:44 +08:00
parent a8fbf4e156
commit e8812787ad
6 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
View File

@ -66,7 +66,7 @@ $end
{
var response = _${replaceDto.ModelTypeName}Service.GetInfo(${replaceDto.PKName});
var info = response.Adapt<${replaceDto.ModelTypeName}>();
var info = response.Adapt<${replaceDto.ModelTypeName}Dto>();
return SUCCESS(info);
}

7
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -117,7 +117,12 @@ $end
$if(null != genTable.SubTableName && "" != genTable.SubTableName)
return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
$else
return Context.Insertable(model).ExecuteReturnEntity();
$if(replaceDto.useSnowflakeId)
model.${replaceDto.PKName} = Insertable(model).ExecuteReturnSnowflakeId();
return model;
$else
return Insertable(model).ExecuteReturnEntity();
$end
$end
}

6
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
View File

@ -267,7 +267,7 @@ $if(column.CsharpType == "int" || column.CsharpType == "long")
$end
$if(column.IsPK || column.IsIncrement)
$if(column.IsPK && column.IsIncrement == false)
$if(column.IsPK && column.IsIncrement == false && replaceDto.useSnowflakeId == false)
<el-col :lg="${options.ColNum}">
<el-form-item label="${labelName}" prop="${columnName}">
<el-input v-model${number}="form.${columnName}" placeholder="请输入${labelName}" :disabled="opertype != 1"/>
@ -635,7 +635,9 @@ const state = reactive({
form: {},
rules: {
$foreach(column in genTable.Columns)
$if(column.IsRequired && column.IsIncrement == false)
$if(column.IsRequired && column.IsPk && replaceDto.useSnowflakeId)
${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end }],
$elseif(column.IsRequired && column.IsIncrement == false)
${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number" $end }],
$end

3
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -53,7 +53,8 @@ namespace ZR.CodeGenerator
ShowBtnMultiDel = dto.GenTable.Options.CheckedBtn.Any(f => f == 7),
ShowBtnImport = dto.GenTable.Options.CheckedBtn.Any(f => f == 8),
ViewFileName = dto.GenTable.BusinessName.FirstUpperCase(),
OperBtnStyle = dto.GenTable.Options.OperBtnStyle
OperBtnStyle = dto.GenTable.Options.OperBtnStyle,
UseSnowflakeId = dto.GenTable.Options.UseSnowflakeId
};
var columns = dto.GenTable.Columns;

4
ZR.CodeGenerator/Model/ReplaceDto.cs
View File

@ -74,5 +74,9 @@ namespace ZR.CodeGenerator.Model
/// 操作按钮样式
/// </summary>
public int OperBtnStyle { get; set; }
/// <summary>
/// 是否使用雪花id
/// </summary>
public bool UseSnowflakeId { get; set; }
}
}

4
ZR.ServiceCore/Model/Generate/GenTable.cs
View File

@ -132,5 +132,9 @@ namespace ZR.Model.System.Generate
/// 操作按钮样式
/// </summary>
public int OperBtnStyle { get; set; } = 1;
/// <summary>
/// 是否使用雪花id
/// </summary>
public bool UseSnowflakeId { get; set; } = false;
}
}