更新项目配置，新增设备同步模块，优化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/SysUser.cs
+++ b/yy-admin-master/YY.Admin.Core/Entity/SysUser.cs
@@ -0,0 +1,390 @@
+
+
+
+namespace YY.Admin.Core;
+
+/// <summary>
+/// 系统用户表
+/// </summary>
+[SugarTable("sys_user", "系统用户表")]
+[SysTable]
+[SugarIndex("index_{table}_A", nameof(Account), OrderByType.Asc)]
+[SugarIndex("index_{table}_P", nameof(Phone), OrderByType.Asc)]
+public partial class SysUser : EntityBaseTenantOrg
+{
+    /// <summary>
+    /// 账号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号", Length = 32)]
+    [Required, MaxLength(32)]
+    public virtual string Account { get; set; }
+
+    /// <summary>
+    /// 密码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "密码", Length = 512)]
+    [MaxLength(512)]
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    public virtual string Password { get; set; }
+
+    /// <summary>
+    /// Jeecg 用户表中的 salt，用于 PBEWithMD5AndDES 与后台密码字段一致；从 Jeecg 同步时写入
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Jeecg密码盐", Length = 64, IsNullable = true)]
+    [MaxLength(64)]
+    public string? JeecgPasswordSalt { get; set; }
+
+    /// <summary>
+    /// 真实姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
+    [MaxLength(32)]
+    public virtual string RealName { get; set; }
+
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "昵称", Length = 32)]
+    [MaxLength(32)]
+    public string? NickName { get; set; }
+
+    /// <summary>
+    /// 头像
+    /// </summary>
+    [SugarColumn(ColumnDescription = "头像", Length = 512)]
+    [MaxLength(512)]
+    public string? Avatar { get; set; }
+
+    /// <summary>
+    /// Jeecg 侧用户更新时间（用于增量同步时跳过未变化记录）
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Jeecg更新时间", IsNullable = true)]
+    public DateTime? JeecgUpdateTime { get; set; }
+
+    /// <summary>
+    /// Jeecg/业务后台用户主键（雪花 ID 等，以字符串保存避免溢出）
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Jeecg用户ID", Length = 64, IsNullable = true)]
+    [MaxLength(64)]
+    public string? JeecgBizUserId { get; set; }
+
+    /// <summary>
+    /// Jeecg 机构编码 orgCode
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Jeecg机构编码", Length = 64, IsNullable = true)]
+    [MaxLength(64)]
+    public string? JeecgOrgCode { get; set; }
+
+    /// <summary>
+    /// Jeecg 部门 id 列表（逗号分隔的 departIds）
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Jeecg部门IDs", Length = 512, IsNullable = true)]
+    [MaxLength(512)]
+    public string? JeecgDepartIds { get; set; }
+
+    /// <summary>
+    /// 性别-男_1、女_2
+    /// </summary>
+    [SugarColumn(ColumnDescription = "性别")]
+    public GenderEnum? Sex { get; set; }
+
+    /// <summary>
+    /// 年龄
+    /// </summary>
+    [SugarColumn(ColumnDescription = "年龄")]
+    public int Age { get; set; }
+
+    /// <summary>
+    /// 出生日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "出生日期")]
+    public DateTime? Birthday { get; set; }
+
+    /// <summary>
+    /// 民族
+    /// </summary>
+    [SugarColumn(ColumnDescription = "民族", Length = 32)]
+    [MaxLength(32)]
+    public string? Nation { get; set; }
+
+    /// <summary>
+    /// 手机号码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "手机号码", Length = 16)]
+    [MaxLength(16)]
+    public string? Phone { get; set; }
+
+    /// <summary>
+    /// 证件类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "证件类型")]
+    public CardTypeEnum CardType { get; set; }
+
+    /// <summary>
+    /// 身份证号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "身份证号", Length = 32)]
+    [MaxLength(32)]
+    public string? IdCardNum { get; set; }
+
+    /// <summary>
+    /// 邮箱
+    /// </summary>
+    [SugarColumn(ColumnDescription = "邮箱", Length = 64)]
+    [MaxLength(64)]
+    public string? Email { get; set; }
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "地址", Length = 256)]
+    [MaxLength(256)]
+    public string? Address { get; set; }
+
+    /// <summary>
+    /// 文化程度
+    /// </summary>
+    [SugarColumn(ColumnDescription = "文化程度")]
+    public CultureLevelEnum CultureLevel { get; set; }
+
+    /// <summary>
+    /// 政治面貌
+    /// </summary>
+    [SugarColumn(ColumnDescription = "政治面貌", Length = 16)]
+    [MaxLength(16)]
+    public string? PoliticalOutlook { get; set; }
+
+    /// <summary>
+    /// 毕业院校
+    /// </summary>
+    [SugarColumn(ColumnDescription = "毕业院校", Length = 128)]
+    [MaxLength(128)]
+    public string? College { get; set; }
+
+    /// <summary>
+    /// 办公电话
+    /// </summary>
+    [SugarColumn(ColumnDescription = "办公电话", Length = 16)]
+    [MaxLength(16)]
+    public string? OfficePhone { get; set; }
+
+    /// <summary>
+    /// 紧急联系人
+    /// </summary>
+    [SugarColumn(ColumnDescription = "紧急联系人", Length = 32)]
+    [MaxLength(32)]
+    public string? EmergencyContact { get; set; }
+
+    /// <summary>
+    /// 紧急联系人电话
+    /// </summary>
+    [SugarColumn(ColumnDescription = "紧急联系人电话", Length = 16)]
+    [MaxLength(16)]
+    public string? EmergencyPhone { get; set; }
+
+    /// <summary>
+    /// 紧急联系人地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "紧急联系人地址", Length = 256)]
+    [MaxLength(256)]
+    public string? EmergencyAddress { get; set; }
+
+    /// <summary>
+    /// 个人简介
+    /// </summary>
+    [SugarColumn(ColumnDescription = "个人简介", Length = 512)]
+    [MaxLength(512)]
+    public string? Introduction { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [SugarColumn(ColumnDescription = "排序")]
+    public int OrderNo { get; set; } = 100;
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 256)]
+    [MaxLength(256)]
+    public string? Remark { get; set; }
+
+    /// <summary>
+    /// 账号类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "账号类型")]
+    public AccountTypeEnum AccountType { get; set; } = AccountTypeEnum.NormalUser;
+
+    ///// <summary>
+    ///// 直属机构Id
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "直属机构Id")]
+    //public long OrgId { get; set; }
+
+    /// <summary>
+    /// 直属机构
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(OrgId))]
+    public SysOrg SysOrg { get; set; }
+
+    /// <summary>
+    /// 直属主管Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "直属主管Id")]
+    public long? ManagerUserId { get; set; }
+
+    /// <summary>
+    /// 直属主管
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Navigate(NavigateType.OneToOne, nameof(ManagerUserId))]
+    public SysUser ManagerUser { get; set; }
+
+    /// <summary>
+    /// 职位Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "职位Id")]
+    public long PosId { get; set; }
+
+    /// <summary>
+    /// 职位
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Navigate(NavigateType.OneToOne, nameof(PosId))]
+    public SysPos SysPos { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "工号", Length = 32)]
+    [MaxLength(32)]
+    public string? JobNum { get; set; }
+
+    /// <summary>
+    /// 职级
+    /// </summary>
+    [SugarColumn(ColumnDescription = "职级", Length = 32)]
+    [MaxLength(32)]
+    public string? PosLevel { get; set; }
+
+    /// <summary>
+    /// 职称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "职称", Length = 32)]
+    [MaxLength(32)]
+    public string? PosTitle { get; set; }
+
+    /// <summary>
+    /// 擅长领域
+    /// </summary>
+    [SugarColumn(ColumnDescription = "擅长领域", Length = 32)]
+    [MaxLength(32)]
+    public string? Expertise { get; set; }
+
+    /// <summary>
+    /// 办公区域
+    /// </summary>
+    [SugarColumn(ColumnDescription = "办公区域", Length = 32)]
+    [MaxLength(32)]
+    public string? OfficeZone { get; set; }
+
+    /// <summary>
+    /// 办公室
+    /// </summary>
+    [SugarColumn(ColumnDescription = "办公室", Length = 32)]
+    [MaxLength(32)]
+    public string? Office { get; set; }
+
+    /// <summary>
+    /// 入职日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "入职日期")]
+    public DateTime? JoinDate { get; set; }
+
+    /// <summary>
+    /// 最新登录Ip
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最新登录Ip", Length = 256)]
+    [MaxLength(256)]
+    public string? LastLoginIp { get; set; }
+
+    /// <summary>
+    /// 最新登录地点
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最新登录地点", Length = 128)]
+    [MaxLength(128)]
+    public string? LastLoginAddress { get; set; }
+
+    /// <summary>
+    /// 最新登录时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最新登录时间")]
+    public DateTime? LastLoginTime { get; set; }
+
+    /// <summary>
+    /// 最新登录设备
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最新登录设备", Length = 128)]
+    [MaxLength(128)]
+    public string? LastLoginDevice { get; set; }
+
+    /// <summary>
+    /// 电子签名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "电子签名", Length = 512)]
+    [MaxLength(512)]
+    public string? Signature { get; set; }
+    [SugarColumn(IsIgnore = true)]
+    public string? AccountTypeZh { get {
+            return this.AccountType.GetDescription();
+        } }
+    [SugarColumn(IsIgnore = true)]
+    public bool IsSuperAdmin
+    {
+        get
+        {
+            return this.AccountType== AccountTypeEnum.SuperAdmin;
+        }
+    }
+    [SugarColumn(IsIgnore = true)]
+    public bool IsSysAdmin
+    {
+        get
+        {
+            return this.AccountType == AccountTypeEnum.SysAdmin;
+        }
+    }
+    /// <summary>
+    /// 验证超级管理员类型，若账号类型为超级管理员则报错
+    /// </summary>
+    /// <param name="errorMsg">自定义错误消息</param>
+    public void ValidateIsSuperAdminAccountType(ErrorCodeEnum? errorMsg = ErrorCodeEnum.D1014)
+    {
+        if (AccountType == AccountTypeEnum.SuperAdmin)
+        {
+            throw new Exception(errorMsg.GetDescription());
+        }
+    }
+
+    /// <summary>
+    /// 验证用户Id是否相同，若用户Id相同则报错
+    /// </summary>
+    /// <param name="userId">用户Id</param>
+    /// <param name="errorMsg">自定义错误消息</param>
+    public void ValidateIsUserId(long userId, ErrorCodeEnum? errorMsg = ErrorCodeEnum.D1001)
+    {
+        if (Id == userId)
+        {
+            throw new Exception(errorMsg.GetDescription());
+        }
+    }
+}