代码生成加上外部数据源支持

This commit is contained in:
yubaolee
2025-03-17 13:52:49 +08:00
parent 44d5b286aa
commit 093be9500e
6 changed files with 155 additions and 128 deletions

View File

@@ -7,23 +7,17 @@ using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
using SqlSugar;
namespace OpenAuth.App
{
public class BuilderTableColumnApp : BaseStringApp<BuilderTableColumn,OpenAuthDBContext>
public class BuilderTableColumnApp : SqlSugarBaseApp<BuilderTableColumn>
{
private DbExtension _dbExtension;
public BuilderTableColumnApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<BuilderTableColumn,OpenAuthDBContext> repository,
IAuth auth, DbExtension dbExtension) : base(unitWork, repository,auth)
public BuilderTableColumnApp(ISqlSugarClient client, IAuth auth, DbExtension dbExtension) : base(client, auth)
{
_dbExtension = dbExtension;
}
/// <summary>
/// 加载列表
/// </summary>
@@ -34,25 +28,23 @@ namespace OpenAuth.App
throw new Exception($"缺少必要的参数BuilderTableId");
}
var result = new TableResp<BuilderTableColumn>();
var objs = UnitWork.Find<BuilderTableColumn>(u =>u.TableId == request.BuilderTableId);
var objs = Repository.AsQueryable().Where(u => u.TableId == request.BuilderTableId);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.ColumnName.Contains(request.key));
}
result.data =await objs.OrderByDescending(u => u.IsList)
.ThenBy(u=>u.Sort)
.ThenBy(u =>u.ColumnName)
result.data = await objs.OrderByDescending(u => u.IsList)
.OrderBy(u => u.Sort)
.OrderBy(u => u.ColumnName)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
result.count = await objs.CountAsync();
return result;
}
public void Update(AddOrUpdateBuilderTableColumnReq obj)
{
var user = _auth.GetCurrentUser().User;
UnitWork.Update<BuilderTableColumn>(u => u.Id == obj.Id, u => new BuilderTableColumn
Repository.Update(u => new BuilderTableColumn
{
TableId = obj.TableId,
TableName = obj.TableName,
@@ -82,28 +74,34 @@ namespace OpenAuth.App
UpdateTime = DateTime.Now,
UpdateUserId = user.Id,
UpdateUserName = user.Name
//todo:补充或调整自己需要的字段
});
}, u => u.Id == obj.Id);
}
/// <summary>
/// 同步数据结构
/// <para>读取数据库结构与当前结构的差异,如果数据库有新增的字段,则自动加入</para>
/// </summary>
public void Sync(SyncStructureReq req)
{
var builderTable = SugarClient.Queryable<BuilderTable>().First(u => u.Id == req.BuilderTableId);
if (builderTable != null)
{
//如果代码生成器配置了外部数据库连接,则使用外部数据库连接
var connection = SugarClient.Queryable<ExternalDataSource>().First(u => u.Id == builderTable.ExternalDataSourceId);
if (connection != null)
{
var dbType = connection.Dbtype;
_dbExtension.SetConnection(connection.Connectionstring, dbType);
}
}
var columns = _dbExtension.GetDbTableStructure(req.TableName);
if (!columns.Any())
{
throw new Exception($"未能找到{req.TableName}表结构定义");
}
var exists = Find(req.Id).Select(u=>u.ColumnName);
var exists = Find(req.Id).Select(u => u.ColumnName.ToLower());
foreach (var column in columns)
{
if(exists.Contains(column.ColumnName)) continue;
if (exists.Contains(column.ColumnName.ToLower())) continue; //列名转化为小写对比
var builderColumn = new BuilderTableColumn
{
ColumnName = column.ColumnName,
@@ -111,7 +109,6 @@ namespace OpenAuth.App
ColumnType = column.ColumnType,
EntityType = column.EntityType,
EntityName = column.ColumnName,
IsKey = column.IsKey == 1,
IsRequired = column.IsNull != 1,
IsEdit = true,
@@ -120,21 +117,14 @@ namespace OpenAuth.App
MaxLength = column.MaxLength,
TableName = req.TableName,
TableId = req.Id,
CreateTime = DateTime.Now
};
UnitWork.Add(builderColumn);
Repository.Insert(builderColumn);
}
UnitWork.Save();
}
public List<BuilderTableColumn> Find(string tableId)
{
return Repository.Find(u => u.TableId == tableId).ToList();
return Repository.AsQueryable().Where(u => u.TableId == tableId).ToList();
}
}
}