gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎调整实体默认值

Browse Source
This commit is contained in:
zuohuaijun 2024-09-05 00:12:15 +08:00
parent 9c9550a114
commit f595f18b25
28 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -41,7 +41,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.167" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1079" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1080" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

2
Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
View File

@ -81,7 +81,7 @@ public abstract class EntityBase : EntityBaseId, IDeletedFilter
/// 软删除
/// </summary>
[SugarColumn(ColumnDescription = "软删除", DefaultValue = "false")]
public virtual bool IsDelete { get; set; }
public virtual bool IsDelete { get; set; } = false;
}
/// <summary>

8
Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
View File

@ -126,12 +126,12 @@ public partial class SysCodeGen : EntityBase
/// <summary>
/// 是否使用 Api Service
/// </summary>
[SugarColumn(ColumnDescription = "是否使用 Api Service")]
[SugarColumn(ColumnDescription = "是否使用 Api Service", DefaultValue = "false")]
public bool IsApiService { get; set; } = false;
/// <summary>
/// 模板关系
/// 模板关系：SysCodeGenTemplateRelation表中的CodeGenId，注意禁止给CodeGenTemplateRelations手动赋值
/// </summary>
[Navigate(NavigateType.OneToMany, nameof(SysCodeGenTemplateRelation.CodeGenId))]//SysCodeGenTemplateRelation表中的CodeGenId
public List<SysCodeGenTemplateRelation> CodeGenTemplateRelations { get; set; }//注意禁止给CodeGenTemplateRelations手动赋值
[Navigate(NavigateType.OneToMany, nameof(SysCodeGenTemplateRelation.CodeGenId))]
public List<SysCodeGenTemplateRelation> CodeGenTemplateRelations { get; set; }
}

4
Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs
View File

@ -37,7 +37,7 @@ public partial class SysCodeGenConfig : EntityBase
/// 字段数据长度
/// </summary>
[SugarColumn(ColumnDescription = "字段数据长度", DefaultValue = "0")]
public int ColumnLength { get; set; }
public int ColumnLength { get; set; } = 0;
/// <summary>
/// 字段描述
@ -202,7 +202,7 @@ public partial class SysCodeGenConfig : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>

6
Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs
View File

@ -23,13 +23,13 @@ public partial class SysCodeGenTemplate : EntityBase
/// <summary>
/// 代码生成类型
/// </summary>
[SugarColumn(ColumnDescription = "代码生成类型")]
[SugarColumn(ColumnDescription = "代码生成类型", DefaultValue = "2")]
public CodeGenTypeEnum Type { get; set; } = CodeGenTypeEnum.Backend;
/// <summary>
/// 是否是内置模板（Y-是，N-否）
/// </summary>
[SugarColumn(ColumnDescription = "是否是内置模板")]
[SugarColumn(ColumnDescription = "是否是内置模板", DefaultValue = "1")]
public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y;
/// <summary>
@ -55,6 +55,6 @@ public partial class SysCodeGenTemplate : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
}

6
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs
View File

@ -39,8 +39,8 @@ public partial class SysConfig : EntityBase
/// <summary>
/// 是否是内置参数（Y-是，N-否）
/// </summary>
[SugarColumn(ColumnDescription = "是否是内置参数")]
public YesNoEnum SysFlag { get; set; }
[SugarColumn(ColumnDescription = "是否是内置参数", DefaultValue = "1")]
public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y;
/// <summary>
/// 分组编码
@ -52,7 +52,7 @@ public partial class SysConfig : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs
View File

@ -73,7 +73,7 @@ public partial class SysDictData : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
@ -92,6 +92,6 @@ public partial class SysDictData : EntityBase
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
}

4
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs
View File

@ -32,7 +32,7 @@ public partial class SysDictType : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
@ -45,7 +45,7 @@ public partial class SysDictType : EntityBase
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysFile.cs
View File

@ -106,6 +106,6 @@ public partial class SysFile : EntityTenantBaseData
/// 是否公开
/// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看
/// </summary>
[SugarColumn(ColumnDescription = "是否公开")]
[SugarColumn(ColumnDescription = "是否公开", DefaultValue = "false")]
public bool IsPublic { get; set; } = false;
}

4
Admin.NET/Admin.NET.Core/Entity/SysJobCluster.cs
View File

@ -30,8 +30,8 @@ public partial class SysJobCluster : EntityBaseId
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
public ClusterStatus Status { get; set; }
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public ClusterStatus Status { get; set; } = ClusterStatus.Working;
/// <summary>
/// 更新时间

6
Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs
View File

@ -52,13 +52,13 @@ public partial class SysJobDetail : EntityBaseId
/// <summary>
/// 是否并行执行
/// </summary>
[SugarColumn(ColumnDescription = "是否并行执行")]
[SugarColumn(ColumnDescription = "是否并行执行", DefaultValue = "true")]
public bool Concurrent { get; set; } = true;
/// <summary>
/// 是否扫描特性触发器
/// </summary>
[SugarColumn(ColumnDescription = "是否扫描特性触发器", ColumnName = "annotation")]
[SugarColumn(ColumnDescription = "是否扫描特性触发器", ColumnName = "annotation", DefaultValue = "false")]
public bool IncludeAnnotation { get; set; } = false;
/// <summary>
@ -76,7 +76,7 @@ public partial class SysJobDetail : EntityBaseId
/// <summary>
/// 作业创建类型
/// </summary>
[SugarColumn(ColumnDescription = "作业创建类型")]
[SugarColumn(ColumnDescription = "作业创建类型", DefaultValue = "0")]
public JobCreateTypeEnum CreateType { get; set; } = JobCreateTypeEnum.BuiltIn;
/// <summary>

10
Admin.NET/Admin.NET.Core/Entity/SysJobTrigger.cs
View File

@ -58,7 +58,7 @@ public partial class SysJobTrigger : EntityBaseId
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public TriggerStatus Status { get; set; } = TriggerStatus.Ready;
/// <summary>
@ -118,25 +118,25 @@ public partial class SysJobTrigger : EntityBaseId
/// <summary>
/// 重试间隔时间（ms）
/// </summary>
[SugarColumn(ColumnDescription = "重试间隔时间(ms)")]
[SugarColumn(ColumnDescription = "重试间隔时间(ms)", DefaultValue = "1000")]
public int RetryTimeout { get; set; } = 1000;
/// <summary>
/// 是否立即启动
/// </summary>
[SugarColumn(ColumnDescription = "是否立即启动")]
[SugarColumn(ColumnDescription = "是否立即启动", DefaultValue = "true")]
public bool StartNow { get; set; } = true;
/// <summary>
/// 是否启动时执行一次
/// </summary>
[SugarColumn(ColumnDescription = "是否启动时执行一次")]
[SugarColumn(ColumnDescription = "是否启动时执行一次", DefaultValue = "false")]
public bool RunOnStart { get; set; } = false;
/// <summary>
/// 是否在启动时重置最大触发次数等于一次的作业
/// </summary>
[SugarColumn(ColumnDescription = "是否重置触发次数")]
[SugarColumn(ColumnDescription = "是否重置触发次数", DefaultValue = "true")]
public bool ResetOnlyOnce { get; set; } = true;
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs
View File

@ -48,7 +48,7 @@ public partial class SysJobTriggerRecord : EntityBaseId
/// <summary>
/// 触发器状态
/// </summary>
[SugarColumn(ColumnDescription = "触发器状态")]
[SugarColumn(ColumnDescription = "触发器状态", DefaultValue = "1")]
public TriggerStatus Status { get; set; } = TriggerStatus.Ready;
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysLdap.cs
View File

@ -84,6 +84,6 @@ public class SysLdap : EntityTenant
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
}

8
Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
View File

@ -24,8 +24,8 @@ public partial class SysMenu : EntityBase
/// <summary>
/// 菜单类型（1目录 2菜单 3按钮）
/// </summary>
[SugarColumn(ColumnDescription = "菜单类型")]
public MenuTypeEnum Type { get; set; }
[SugarColumn(ColumnDescription = "菜单类型", DefaultValue = "2")]
public MenuTypeEnum Type { get; set; } = MenuTypeEnum.Menu;
/// <summary>
/// 路由名称
@ -110,13 +110,13 @@ public partial class SysMenu : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>

8
Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
View File

@ -33,8 +33,8 @@ public partial class SysNotice : EntityBase
/// <summary>
/// 类型（1通知 2公告）
/// </summary>
[SugarColumn(ColumnDescription = "类型（1通知 2公告）")]
public NoticeTypeEnum Type { get; set; }
[SugarColumn(ColumnDescription = "类型（1通知 2公告）", DefaultValue = "1")]
public NoticeTypeEnum Type { get; set; } = NoticeTypeEnum.NOTICE;
/// <summary>
/// 发布人Id
@ -77,6 +77,6 @@ public partial class SysNotice : EntityBase
/// <summary>
/// 状态（0草稿 1发布 2撤回 3删除）
/// </summary>
[SugarColumn(ColumnDescription = "状态（0草稿 1发布 2撤回 3删除）")]
public NoticeStatusEnum Status { get; set; }
[SugarColumn(ColumnDescription = "状态（0草稿 1发布 2撤回 3删除）", DefaultValue = "0")]
public NoticeStatusEnum Status { get; set; } = NoticeStatusEnum.DRAFT;
}

2
Admin.NET/Admin.NET.Core/Entity/SysNoticeUser.cs
View File

@ -40,6 +40,6 @@ public partial class SysNoticeUser : EntityBaseId
/// <summary>
/// 状态（0未读 1已读）
/// </summary>
[SugarColumn(ColumnDescription = "状态（0未读 1已读）")]
[SugarColumn(ColumnDescription = "状态（0未读 1已读）", DefaultValue = "0")]
public NoticeUserStatusEnum ReadStatus { get; set; } = NoticeUserStatusEnum.UNREAD;
}

2
Admin.NET/Admin.NET.Core/Entity/SysOAuthUser.cs
View File

@ -32,7 +32,7 @@ public partial class SysOAuthUser : EntityBase
/// <summary>
/// 平台类型
/// </summary>
[SugarColumn(ColumnDescription = "平台类型")]
[SugarColumn(ColumnDescription = "平台类型", DefaultValue = "1")]
public PlatformTypeEnum PlatformType { get; set; } = PlatformTypeEnum.微信公众号;
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysOnlineUser.cs
View File

@ -69,8 +69,8 @@ public partial class SysOnlineUser : EntityTenantId
/// <summary>
/// 登录模式
/// </summary>
[SugarColumn(ColumnDescription = "登录模式")]
public LoginModeEnum? LoginMode { get; set; }
[SugarColumn(ColumnDescription = "登录模式", DefaultValue = "1")]
public LoginModeEnum? LoginMode { get; set; } = LoginModeEnum.PC;
/// <summary>
/// 登录设备

2
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs
View File

@ -72,7 +72,7 @@ public partial class SysOrg : EntityTenant
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysPlugin.cs
View File

@ -38,13 +38,13 @@ public partial class SysPlugin : EntityTenant
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysPos.cs
View File

@ -32,7 +32,7 @@ public partial class SysPos : EntityTenant
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
@ -45,6 +45,6 @@ public partial class SysPos : EntityTenant
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
}

8
Admin.NET/Admin.NET.Core/Entity/SysPrint.cs
View File

@ -31,9 +31,9 @@ public partial class SysPrint : EntityTenant
/// <summary>
/// 打印类型
/// </summary>
[SugarColumn(ColumnDescription = "打印类型")]
[SugarColumn(ColumnDescription = "打印类型", DefaultValue = "1")]
[Required]
public virtual PrintTypeEnum? PrintType { get; set; }
public virtual PrintTypeEnum? PrintType { get; set; } = PrintTypeEnum.Browser;
/// <summary>
/// 客户端服务地址
@ -51,13 +51,13 @@ public partial class SysPrint : EntityTenant
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysRegion.cs
View File

@ -98,7 +98,7 @@ public partial class SysRegion : EntityBaseId
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>

10
Admin.NET/Admin.NET.Core/Entity/SysRole.cs
View File

@ -32,20 +32,20 @@ public partial class SysRole : EntityTenant
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
/// 数据范围（1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据）
/// </summary>
[SugarColumn(ColumnDescription = "数据范围")]
[SugarColumn(ColumnDescription = "数据范围", DefaultValue = "4")]
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.Self;
/// <summary>
/// 是否是内置（Y-是，N-否）
/// </summary>
[SugarColumn(ColumnDescription = "是否是内置")]
public YesNoEnum SysFlag { get; set; }
[SugarColumn(ColumnDescription = "是否是内置", DefaultValue = "1")]
public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y;
/// <summary>
/// 备注
@ -57,6 +57,6 @@ public partial class SysRole : EntityTenant
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
}

2
Admin.NET/Admin.NET.Core/Entity/SysSchedule.cs
View File

@ -47,6 +47,6 @@ public class SysSchedule : EntityTenant
/// <summary>
/// 完成状态
/// </summary>
[SugarColumn(ColumnDescription = "完成状态")]
[SugarColumn(ColumnDescription = "完成状态", DefaultValue = "0")]
public FinishStatusEnum Status { get; set; } = FinishStatusEnum.UnFinish;
}

12
Admin.NET/Admin.NET.Core/Entity/SysTenant.cs
View File

@ -35,14 +35,14 @@ public partial class SysTenant : EntityBase
/// <summary>
/// 租户类型
/// </summary>
[SugarColumn(ColumnDescription = "租户类型")]
public TenantTypeEnum TenantType { get; set; }
[SugarColumn(ColumnDescription = "租户类型", DefaultValue = "0")]
public TenantTypeEnum TenantType { get; set; } = TenantTypeEnum.Id;
/// <summary>
/// 数据库类型
/// </summary>
[SugarColumn(ColumnDescription = "数据库类型")]
public SqlSugar.DbType DbType { get; set; }
[SugarColumn(ColumnDescription = "数据库类型", DefaultValue = "4")]
public SqlSugar.DbType DbType { get; set; } = SqlSugar.DbType.PostgreSQL;
/// <summary>
/// 数据库连接
@ -67,7 +67,7 @@ public partial class SysTenant : EntityBase
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnDescription = "排序")]
[SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
public int OrderNo { get; set; } = 100;
/// <summary>
@ -80,6 +80,6 @@ public partial class SysTenant : EntityBase
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
}

16
Admin.NET/Admin.NET.Core/Entity/SysUser.cs
View File

@ -55,7 +55,7 @@ public partial class SysUser : EntityTenant
/// <summary>
/// 性别-男_1、女_2
/// </summary>
[SugarColumn(ColumnDescription = "性别")]
[SugarColumn(ColumnDescription = "性别", DefaultValue = "1")]
public GenderEnum Sex { get; set; } = GenderEnum.Male;
/// <summary>
@ -87,8 +87,8 @@ public partial class SysUser : EntityTenant
/// <summary>
/// 证件类型
/// </summary>
[SugarColumn(ColumnDescription = "证件类型")]
public CardTypeEnum CardType { get; set; }
[SugarColumn(ColumnDescription = "证件类型", DefaultValue = "0")]
public CardTypeEnum CardType { get; set; } = CardTypeEnum.IdCard;
/// <summary>
/// 身份证号
@ -114,8 +114,8 @@ public partial class SysUser : EntityTenant
/// <summary>
/// 文化程度
/// </summary>
[SugarColumn(ColumnDescription = "文化程度")]
public CultureLevelEnum CultureLevel { get; set; }
[SugarColumn(ColumnDescription = "文化程度", DefaultValue = "10")]
public CultureLevelEnum CultureLevel { get; set; } = CultureLevelEnum.Level10;
/// <summary>
/// 政治面貌
@ -175,7 +175,7 @@ public partial class SysUser : EntityTenant
/// <summary>
/// 状态
/// </summary>
[SugarColumn(ColumnDescription = "状态")]
[SugarColumn(ColumnDescription = "状态", DefaultValue = "1")]
public StatusEnum Status { get; set; } = StatusEnum.Enable;
/// <summary>
@ -188,7 +188,7 @@ public partial class SysUser : EntityTenant
/// <summary>
/// 账号类型
/// </summary>
[SugarColumn(ColumnDescription = "账号类型")]
[SugarColumn(ColumnDescription = "账号类型", DefaultValue = "777")]
public AccountTypeEnum AccountType { get; set; } = AccountTypeEnum.NormalUser;
/// <summary>
@ -317,7 +317,7 @@ public partial class SysUser : EntityTenant
/// Token版本号
/// </summary>
[SugarColumn(ColumnDescription = "Token版本号", DefaultValue = "1")]
public int TokenVersion { get; set; }
public int TokenVersion { get; set; } = 1;
/// <summary>
/// 最新密码修改时间