1、数据库操作,生成实体类,清除表数据默认linkid改为单例模式

2、MOM 基础数据-工艺管理-工艺路线模版,左侧树代码调整
This commit is contained in:
DEVICE8\12494
2023-04-06 17:24:16 +08:00
parent f3c8f1cd06
commit 536f11aac1
6 changed files with 150 additions and 112 deletions

View File

@@ -332,21 +332,20 @@ public class DataBaseService : IDynamicApiController, ITransient
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("{linkId}/clean-data")]
[AllowAnonymous]
public async Task<dynamic> CleanTableData(string linkId, DatabaseTableDataCleanInput input)
{
SqlSugarScope sugarClient = null!;
SqlSugarScope? sugarClient = null!;
if (linkId == "0")
{
ConnectionStringsOptions options = App.GetConfig<ConnectionStringsOptions>("ConnectionStrings", true);
var connCfg = options.Adapt<ConnectionConfig>();
sugarClient = new SqlSugarScope(connCfg);
sugarClient = _repository.AsSugarClient() as SqlSugarScope;
}
else
{
var link = await _dbLinkService.GetInfo(linkId);
sugarClient = _dataBaseManager.ChangeDataBase(link);
}
return await sugarClient.Deleteable<object>().AS(input.TableName).ExecuteCommandAsync();
return await sugarClient!.Deleteable<object>().AS(input.TableName).ExecuteCommandAsync();
}
/// <summary>
/// 生成代码
@@ -375,9 +374,7 @@ public class DataBaseService : IDynamicApiController, ITransient
SqlSugarScope sugarClient = null!;
if (linkId == "0") //默认时,使用当前默认数据库配置
{
ConnectionStringsOptions options = App.GetConfig<ConnectionStringsOptions>("ConnectionStrings", true);
var connCfg = options.Adapt<ConnectionConfig>();
sugarClient = new SqlSugarScope(connCfg);
sugarClient = _repository.AsSugarClient() as SqlSugarScope;
}
else
{
@@ -400,7 +397,7 @@ public class DataBaseService : IDynamicApiController, ITransient
}
}
foreach (var item in sugarClient.DbMaintenance.GetTableInfoList().Where(t => t.Name == input.TableName))
foreach (var item in sugarClient!.DbMaintenance.GetTableInfoList().Where(t => t.Name == input.TableName))
{
string entityName = CustomFormatName(item.Name);/*实体名首字母大写*/
sugarClient.MappingTables.Add(entityName, item.Name);
@@ -410,13 +407,6 @@ public class DataBaseService : IDynamicApiController, ITransient
sugarClient.MappingColumns.Add(colName /*类的属性首字母大写*/, col.DbColumnName, entityName);
}
}
var newFileName = "";
var pos = input.TableName.IndexOf("_", StringComparison.Ordinal);
var first = input.TableName.AsSpan().Slice(0, pos).ToString().ToUpperCase();
var second = input.TableName.AsSpan().Slice(pos + 1).ToString().ToUpperCase();
newFileName = $"{first}{second}";
sugarClient.DbFirst.Where(input.TableName)
.FormatFileName(CustomFormatName)
.IsCreateAttribute()