更新项目配置，新增设备同步模块，优化WebSocket和Swagger配置，增强SCADA系统的免登录接口，支持数据字典项和登录日志的免登录查询与记录。调整Java编译设置，确保更好的开发体验。

2026-04-28 10:23:58 +08:00
parent bbe46dcf2d
commit 142a0bdaba
1013 changed files with 41858 additions and 28 deletions
--- a/yy-admin-master/YY.Admin.Core/Entity/EntityBase.cs
+++ b/yy-admin-master/YY.Admin.Core/Entity/EntityBase.cs
@@ -0,0 +1,192 @@
+
+
+namespace YY.Admin.Core;
+
+/// <summary>
+/// 框架实体基类Id
+/// </summary>
+public abstract class EntityBaseId
+{
+    /// <summary>
+    /// 雪花Id
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", ColumnDescription = "主键Id", IsPrimaryKey = true, IsIdentity = false)]
+    public virtual long Id { get; set; }
+}
+
+/// <summary>
+/// 框架实体基类
+/// </summary>
+[SugarIndex("index_{table}_CT", nameof(CreateTime), OrderByType.Asc)]
+public abstract class EntityBase : EntityBaseId
+{
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建时间", IsNullable = true, IsOnlyIgnoreUpdate = true)]
+    public virtual DateTime CreateTime { get; set; }
+
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "更新时间")]
+    public virtual DateTime? UpdateTime { get; set; }
+
+    /// <summary>
+    /// 创建者Id
+    /// </summary>
+    [OwnerUser]
+    [SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? CreateUserId { get; set; }
+
+    ///// <summary>
+    ///// 创建者
+    ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
+    //[Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
+    //public virtual SysUser CreateUser { get; set; }
+
+    /// <summary>
+    /// 创建者姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者姓名", Length = 64, IsOnlyIgnoreUpdate = true)]
+    public virtual string? CreateUserName { get; set; }
+
+    /// <summary>
+    /// 修改者Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者Id")]
+    public virtual long? UpdateUserId { get; set; }
+
+    ///// <summary>
+    ///// 修改者
+    ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
+    //[Navigate(NavigateType.OneToOne, nameof(UpdateUserId))]
+    //public virtual SysUser UpdateUser { get; set; }
+
+    /// <summary>
+    /// 修改者姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者姓名", Length = 64)]
+    public virtual string? UpdateUserName { get; set; }
+}
+
+/// <summary>
+/// 框架实体基类（删除标志）
+/// </summary>
+[SugarIndex("index_{table}_D", nameof(IsDelete), OrderByType.Asc)]
+public abstract class EntityBaseDel : EntityBase, IDeletedFilter
+{
+    /// <summary>
+    /// 软删除
+    /// </summary>
+    [SugarColumn(ColumnDescription = "软删除")]
+    public virtual bool IsDelete { get; set; } = false;
+}
+
+/// <summary>
+/// 机构实体基类（数据权限）
+/// </summary>
+public abstract class EntityBaseOrg : EntityBase, IOrgIdFilter
+{
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id", IsNullable = true)]
+    public virtual long OrgId { get; set; }
+
+    ///// <summary>
+    ///// 创建者部门Id
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "创建者部门Id", IsOnlyIgnoreUpdate = true)]
+    //public virtual long? CreateOrgId { get; set; }
+
+    ///// <summary>
+    ///// 创建者部门
+    ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
+    //[Navigate(NavigateType.OneToOne, nameof(CreateOrgId))]
+    //public virtual SysOrg CreateOrg { get; set; }
+
+    ///// <summary>
+    ///// 创建者部门名称
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "创建者部门名称", Length = 64, IsOnlyIgnoreUpdate = true)]
+    //public virtual string? CreateOrgName { get; set; }
+}
+
+/// <summary>
+/// 机构实体基类（数据权限、删除标志）
+/// </summary>
+public abstract class EntityBaseOrgDel : EntityBaseDel, IOrgIdFilter
+{
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id", IsNullable = true)]
+    public virtual long OrgId { get; set; }
+}
+
+/// <summary>
+/// 租户实体基类
+/// </summary>
+public abstract class EntityBaseTenant : EntityBase, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 租户实体基类（删除标志）
+/// </summary>
+public abstract class EntityBaseTenantDel : EntityBaseDel, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 租户实体基类Id
+/// </summary>
+public abstract class EntityBaseTenantId : EntityBaseId, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 租户机构实体基类（数据权限）
+/// </summary>
+public abstract class EntityBaseTenantOrg : EntityBaseOrg, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 租户机构实体基类（数据权限、删除标志）
+/// </summary>
+public abstract class EntityBaseTenantOrgDel : EntityBaseOrgDel, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}