wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门接口加上扩展属性

Browse Source
This commit is contained in:
潘飞
2023-04-23 16:43:22 +08:00
parent db3aca5590
commit 3657f83184
7 changed files with 994 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1880
common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs
View File

File diff suppressed because it is too large Load Diff

6
system/Tnb.Systems.Entitys/Dto/Permission/Department/DepartmentCrInput.cs
View File

@@ -1,4 +1,5 @@
using JNPF.DependencyInjection;
using JNPF.Systems.Entitys.Model.Organize;
namespace JNPF.Systems.Entitys.Dto.Department;
@@ -38,6 +39,11 @@ public class DepartmentCrInput
/// </summary>
public string description { get; set; }
/// <summary>
/// 扩展属性.
/// </summary>
public string propertyJson { get; set; }
/// <summary>
/// 排序码.
/// </summary>

5
system/Tnb.Systems.Entitys/Dto/Permission/Department/DepartmentInfoOutput.cs
View File

@@ -43,6 +43,11 @@ public class DepartmentInfoOutput
/// </summary>
public string managerId { get; set; }
/// <summary>
/// 部门详情.
/// </summary>
public string propertyJson { get; set; }
/// <summary>
/// 排序码.
/// </summary>

20
system/Tnb.Systems.Entitys/Mapper/SystemMapper.cs
View File

@@ -44,16 +44,16 @@ public class SystemMapper : IRegister
.Map(dest => dest.IsPrimarykey, src => src.primaryKey)
.Map(dest => dest.IsNullable, src => src.allowNull == 1)
.Map(dest => dest.DefaultValue, src => src.defaults);
config.ForType<DynamicDbTableModel, DbTableModel>()
.Map(dest => dest.table, src => src.F_TABLE)
.Map(dest => dest.tableName, src => src.F_TABLENAME)
.Map(dest => dest.size, src => src.F_SIZE)
.Map(dest => dest.sum, src => int.Parse(src.F_SUM))
.Map(dest => dest.primaryKey, src => src.F_PRIMARYKEY);
config.ForType<DynamicDbTableModel, DatabaseTableListOutput>()
.Map(dest => dest.table, src => src.F_TABLE.IsNullOrEmpty() ? string.Empty : src.F_TABLE)
.Map(dest => dest.tableName, src => src.F_TABLENAME.IsNullOrEmpty() ? string.Empty : src.F_TABLENAME)
.Map(dest => dest.sum, src => int.Parse(src.F_SUM));
//config.ForType<DynamicDbTableModel, DbTableModel>()
// .Map(dest => dest.table, src => src.F_TABLE)
// .Map(dest => dest.tableName, src => src.F_TABLENAME)
// .Map(dest => dest.size, src => src.F_SIZE)
// .Map(dest => dest.sum, src => int.Parse(src.F_SUM))
// .Map(dest => dest.primaryKey, src => src.F_PRIMARYKEY);
//config.ForType<DynamicDbTableModel, DatabaseTableListOutput>()
// .Map(dest => dest.table, src => src.F_TABLE.IsNullOrEmpty() ? string.Empty : src.F_TABLE)
// .Map(dest => dest.tableName, src => src.F_TABLENAME.IsNullOrEmpty() ? string.Empty : src.F_TABLENAME)
// .Map(dest => dest.sum, src => int.Parse(src.F_SUM));
config.ForType<DbTableInfo, DatabaseTableListOutput>()
.Map(dest => dest.table, src => src.Name)
.Map(dest => dest.tableName, src => src.Description);

54
system/Tnb.Systems.Entitys/Model/System/DataBase/DynamicDbTableModel.cs
View File

@@ -2,34 +2,34 @@
namespace JNPF.Systems.Entitys.Model.DataBase;
/// <summary>
/// 表列表实体.
/// </summary>
[SuppressSniffer]
public class DynamicDbTableModel
{
/// <summary>
/// 表名.
/// </summary>
public string? F_TABLE { get; set; }
///// <summary>
///// 表列表实体.
///// </summary>
//[SuppressSniffer]
//public class DynamicDbTableModel
//{
// /// <summary>
// /// 表名.
// /// </summary>
// public string? F_TABLE { get; set; }
/// <summary>
/// 表说明.
/// </summary>
public string? F_TABLENAME { get; set; }
// /// <summary>
// /// 表说明.
// /// </summary>
// public string? F_TABLENAME { get; set; }
/// <summary>
/// 大小.
/// </summary>
public string? F_SIZE { get; set; }
// /// <summary>
// /// 大小.
// /// </summary>
// public string? F_SIZE { get; set; }
/// <summary>
/// 总数.
/// </summary>
public string? F_SUM { get; set; }
// /// <summary>
// /// 总数.
// /// </summary>
// public string? F_SUM { get; set; }
/// <summary>
/// 主键.
/// </summary>
public string? F_PRIMARYKEY { get; set; }
}
// /// <summary>
// /// 主键.
// /// </summary>
// public string? F_PRIMARYKEY { get; set; }
//}

5
system/Tnb.Systems/System/DataBaseService.cs
View File

@@ -95,7 +95,10 @@ public class DataBaseService : IDynamicApiController, ITransient
//tables = tables.Where((x, i) => tables.FindIndex(z => z.Name == x.Name) == i).ToList();
//var output = tables.Adapt<List<DatabaseTableListOutput>>();
if (!string.IsNullOrEmpty(input.keyword))
tables = tables.FindAll(d => d.table.ToLower().Contains(input.keyword.ToLower()) || (d.tableName.IsNotEmptyOrNull() && d.tableName.ToLower().Contains(input.keyword.ToLower())));
{
var keyword = input.keyword.ToLower();
tables = tables.FindAll(d => d.table.ToLower().Contains(keyword) || (d.tableName.IsNotEmptyOrNull() && d.tableName.ToLower().Contains(keyword)));
}
if (tenantLink.DbType.ToLower().Equals("dm"))
{
GetTableCount(tables, tenantLink);

2
system/Tnb.Systems/System/DbLinkService.cs
View File

@@ -318,7 +318,7 @@ public class DbLinkService : IDbLinkService, IDynamicApiController, ITransient
[NonAction]
public async Task<DbLinkEntity> GetInfo(string id)
{
return await _repository.AsSugarClient().CopyNew().Queryable<DbLinkEntity>().FirstAsync(m => m.Id == id && m.DeleteMark == null);
return await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(m => m.Id == id && m.DeleteMark == null);
}
#endregion
}