chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
geht
2026-04-28 10:23:58 +08:00
parent bbe46dcf2d
commit 142a0bdaba
1013 changed files with 41858 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
yy-admin-master/YY.Admin.Services/Service/User/Dto/UserInput.cs Normal file
View File

@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace YY.Admin.Services.Service
{
/// <summary>
/// 获取用户分页列表输入参数
/// </summary>
public class PageUserInput : PagedRequestBase
{
/// <summary>
/// 租户Id
/// </summary>
public long TenantId { get; set; }
/// <summary>
/// 账号
/// </summary>
public string Account { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string RealName { get; set; }
/// <summary>
/// 昵称
/// </summary>
public string NickName { get; set; }
/// <summary>
/// 性别
/// </summary>
public GenderEnum? Sex { get; set; }
/// <summary>
/// 职位名称
/// </summary>
public string PosName { get; set; }
/// <summary>
/// 手机号
/// </summary>
public string Phone { get; set; }
/// <summary>
/// 状态
/// </summary>
public StatusEnum? Status { get; set; }
/// <summary>
/// 查询时所选机构Id
/// </summary>
public long OrgId { get; set; }
public DateTime? BeginTime { get; set; }
public DateTime? EndTime { get; set; }
}
}

154
yy-admin-master/YY.Admin.Services/Service/User/Dto/UserOutput.cs Normal file
View File

@@ -0,0 +1,154 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace YY.Admin.Services.Service
{
public class UserOutput : BindableBase
{
/// <summary>
/// 账号
/// </summary>
[BindDescription("账号", ShowScheme.普通文本, "Auto", 0 )]
public string Account { get; set; }
/// <summary>
/// 姓名
/// </summary>
[BindDescription("姓名", ShowScheme.普通文本, "1", 1)]
public virtual string RealName { get; set; }
/// <summary>
/// 昵称
/// </summary>
[BindDescription("昵称", ShowScheme.普通文本, "Auto", 2)]
public string? NickName { get; set; }
/// <summary>
/// 头像
/// </summary>
public string? Avatar { get; set; }
/// <summary>
/// 性别-男_1、女_2
/// </summary>
public GenderEnum Sex { get; set; }
/// <summary>
/// 出生日期
/// </summary>
public DateTime? Birthday { get; set; }
/// <summary>
/// 年龄
/// </summary>
public int Age { get; set; }
/// <summary>
/// 手机号码
/// </summary>
public string? Phone { get; set; }
/// <summary>
/// 证件类型
/// </summary>
public CardTypeEnum CardType { get; set; }
/// <summary>
/// 身份证号
/// </summary>
public string? IdCardNum { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string? Email { get; set; }
/// <summary>
/// 文化程度
/// </summary>
public CultureLevelEnum CultureLevel { get; set; }
/// <summary>
/// 政治面貌
/// </summary>
public string? PoliticalOutlook { get; set; }
/// <summary>
/// 毕业院校
/// </summary>
public string? College { get; set; }
/// <summary>
/// 办公电话
/// </summary>
public string? OfficePhone { get; set; }
/// <summary>
/// 紧急联系人
/// </summary>
public string? EmergencyContact { get; set; }
/// <summary>
/// 紧急联系人电话
/// </summary>
public string? EmergencyPhone { get; set; }
/// <summary>
/// 状态
/// </summary>
private StatusEnum _status;
public StatusEnum Status { get => _status; set => SetProperty(ref _status, value); }
/// <summary>
/// 账号类型
/// </summary>
public AccountTypeEnum AccountType { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 机构名称
/// </summary>
[BindDescription("机构名称", ShowScheme.普通文本, "Auto", 3)]
public string OrgName { get; set; }
/// <summary>
/// 职位名称
/// </summary>s
[BindDescription("职位名称", ShowScheme.普通文本, "Auto", 4)]
public string PosName { get; set; }
/// <summary>
/// 角色名称
/// </summary>
[BindDescription("角色名称", ShowScheme.普通文本, "Auto", 5)]
public string RoleName { get; set; }
private bool _isSelected;
public bool IsSelected
{
get => _isSelected;
set
{
if (SetProperty(ref _isSelected, value))
{
//SelectionChanged?.Invoke(this, EventArgs.Empty);
}
}
}
// 添加主键ID，用于批量删除
public long Id { get; set; }
//public event EventHandler SelectionChanged;
}
}

18
yy-admin-master/YY.Admin.Services/Service/User/ISysUserRoleService.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace YY.Admin.Services.Service.User
{
public interface ISysUserRoleService
{
/// <summary>
/// 根据用户Id获取角色Id集合
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
Task<List<long>> GetUserRoleIdList(long userId);
}
}

25
yy-admin-master/YY.Admin.Services/Service/User/ISysUserService.cs Normal file
View File

@@ -0,0 +1,25 @@
using YY.Admin.Services.Service.User;
namespace YY.Admin.Services.Service.User
{
public interface ISysUserService
{
Task<List<SysUser>> GetUsersAsync();
Task<SqlSugarPagedList<UserOutput>> PageAsync(PageUserInput input);
Task<int> BatchDeleteAsync(List<long> ids);
Task<int> DeleteAsync(long id);
Task<int> CreateAsync(SysUser sysUser);
Task<int> UpdateAsync(SysUser sysUser);
Task<long> ReadMaxIdAsync();
Task<bool> AccountExistsAsync(string account, long? excludeUserId = null);
Task<int> ToggleStatus(SysUser sysUser);
}
}

27
yy-admin-master/YY.Admin.Services/Service/User/SysUserRoleService.cs Normal file
View File

@@ -0,0 +1,27 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace YY.Admin.Services.Service.User
{
public class SysUserRoleService : ISysUserRoleService, ISingletonDependency
{
private readonly ISqlSugarClient _dbContext;
public SysUserRoleService(ISqlSugarClient context) {
_dbContext=context;
}
/// <summary>
///根据用户Id获取角色Id集合
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<List<long>> GetUserRoleIdList(long userId)
{
return await _dbContext.Queryable<SysUserRole>()
.Where(u => u.UserId == userId).Select(u => u.RoleId).ToListAsync();
}
}
}

239
yy-admin-master/YY.Admin.Services/Service/User/SysUserService.cs Normal file
View File

@@ -0,0 +1,239 @@
using Dm.util;
using SqlSugar;
using System.Globalization;
using YY.Admin.Core;
using YY.Admin.Core.SeedData;
using YY.Admin.Core.Session;
using YY.Admin.Core.Util;
namespace YY.Admin.Services.Service.User
{
public class SysUserService : ISysUserService, ISingletonDependency
{
private readonly ISysOrgService _sysOrgService;
private readonly ISqlSugarClient _dbContext;
public SysUserService(ISysOrgService orgService, ISqlSugarClient dbContext)
{
_sysOrgService = orgService;
_dbContext = dbContext;
}
public async Task<List<SysUser>> GetUsersAsync()
{
await Task.Delay(200);
return new List<SysUser>();
}
public async Task<SqlSugarPagedList<UserOutput>> PageAsync(PageUserInput input)
{
var sexFilter = input.Sex.HasValue ? (int?)input.Sex.Value : null;
var statusFilter = input.Status.HasValue ? (int?)input.Status.Value : null;
// 账号管理查询改为从 Jeecg 同构账号表读取
var query = _dbContext.Queryable<JeecgSysUser>().ClearFilter()
.WhereIF(input.TenantId > 0, u => u.LoginTenantId == input.TenantId)
.WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Username != null && u.Username.Contains(input.Account))
.WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.Realname != null && u.Realname.Contains(input.RealName))
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone != null && u.Phone.Contains(input.Phone))
.WhereIF(input.BeginTime.HasValue, u => u.CreateTime >= input.BeginTime)
.WhereIF(input.EndTime.HasValue, u => u.CreateTime <= input.EndTime)
.OrderBy(u => SqlFunc.Desc(u.CreateTime));
if (sexFilter.HasValue)
{
var sexValue = sexFilter.Value;
query = query.Where(u => u.Sex == sexValue);
}
if (statusFilter.HasValue)
{
var statusValue = statusFilter.Value;
query = query.Where(u => u.Status == statusValue);
}
var pageData = await query.ToPagedListAsync(input.Page, input.PageSize);
var mapped = pageData.Items.Select(u =>
{
long id = 0;
long.TryParse(u.Id, NumberStyles.Integer, CultureInfo.InvariantCulture, out id);
var sex = GenderEnum.Unknown;
if (u.Sex == 1) sex = GenderEnum.Male;
if (u.Sex == 2) sex = GenderEnum.Female;
var status = u.Status == 1 ? StatusEnum.Enable : StatusEnum.Disable;
return new UserOutput
{
Id = id,
Account = u.Username ?? string.Empty,
RealName = u.Realname ?? string.Empty,
// Jeecg 同构表无 nickname 字段，昵称回退为真实姓名，避免页面显示被“清空”
NickName = string.IsNullOrWhiteSpace(u.Realname) ? (u.Username ?? string.Empty) : u.Realname,
Avatar = u.Avatar,
Sex = sex,
Birthday = u.Birthday,
Phone = u.Phone,
Email = u.Email,
OfficePhone = u.Telephone,
Status = status,
CreateTime = u.CreateTime,
OrgName = u.OrgCode ?? string.Empty,
PosName = u.PositionType ?? string.Empty,
RoleName = string.Empty,
AccountType = AccountTypeEnum.NormalUser
};
}).ToList();
return new SqlSugarPagedList<UserOutput>
{
Page = pageData.Page,
PageSize = pageData.PageSize,
Items = mapped,
Total = pageData.Total,
TotalPages = pageData.TotalPages,
HasNextPage = pageData.HasNextPage,
HasPrevPage = pageData.HasPrevPage
};
}
public async Task<int> BatchDeleteAsync(List<long> ids)
{
int count = 0;
if (ids == null || ids.isEmpty())
{
return count;
}
try
{
await _dbContext.AsTenant().BeginTranAsync();
count = await _dbContext.Deleteable<SysUser>().In(ids).ExecuteCommandAsync();
await _dbContext.AsTenant().CommitTranAsync();
}
catch (Exception)
{
await _dbContext.AsTenant().RollbackTranAsync();
}
return count;
}
public async Task<int> DeleteAsync(long id)
{
int count = 0;
try
{
await _dbContext.AsTenant().BeginTranAsync();
count = await _dbContext.Deleteable<SysUser>().In(id).ExecuteCommandAsync();
await _dbContext.AsTenant().CommitTranAsync();
}
catch (Exception)
{
await _dbContext.AsTenant().RollbackTranAsync();
}
return count;
}
public async Task<int> CreateAsync(SysUser sysUser)
{
long maxId = await ReadMaxIdAsync();
sysUser.Id = ++maxId;
sysUser.Password = CryptogramUtil.Encrypt(sysUser.Password);
sysUser.CardType = CardTypeEnum.IdCard;
sysUser.CultureLevel = CultureLevelEnum.Level0;
sysUser.PosId = new SysPosSeedData().HasData().ToList()[0].Id;
sysUser.TenantId = SqlSugarConst.DefaultTenantId;
sysUser.CreateTime = DateTime.Now;
sysUser.CreateUserId = AppSession.UserId;
sysUser.CreateUserName = AppSession.CurrentUser!.Account;
int count = 0;
try
{
await _dbContext.AsTenant().BeginTranAsync();
count = await _dbContext.Insertable(sysUser).ExecuteCommandAsync();
await _dbContext.AsTenant().CommitTranAsync();
}
catch (Exception)
{
await _dbContext.AsTenant().RollbackTranAsync();
}
return count;
}
public async Task<int> UpdateAsync(SysUser sysUser)
{
sysUser.UpdateUserId = AppSession.UserId; ;
sysUser.UpdateUserName = AppSession.CurrentUser!.Account;
sysUser.UpdateTime = DateTime.Now;
int count = 0;
try
{
await _dbContext.AsTenant().BeginTranAsync();
count = await _dbContext.Updateable(sysUser)
.UpdateColumns(it => new { it.RealName, it.NickName, it.Sex, it.Birthday, it.Age, it.Status, it.UpdateUserId, it.UpdateUserName, it.UpdateTime })
.ExecuteCommandAsync();
await _dbContext.AsTenant().CommitTranAsync();
}
catch (Exception)
{
await _dbContext.AsTenant().RollbackTranAsync();
}
return count;
}
public async Task<long> ReadMaxIdAsync()
{
return await _dbContext.Queryable<SysUser>().MaxAsync<long>("Id");
}
public async Task<bool> AccountExistsAsync(string account, long? excludeUserId)
{
var query = _dbContext.Queryable<SysUser>()
. Where(u => u.Account == account);
// excludeUserId不等于null && 不等于 0
if (excludeUserId.HasValue && excludeUserId != 0)
{
query = query.Where(u => u.Id != excludeUserId.Value);
}
return await query.AnyAsync();
}
public async Task<int> ToggleStatus(SysUser sysUser)
{
sysUser.UpdateUserId = AppSession.UserId; ;
sysUser.UpdateUserName = AppSession.CurrentUser!.Account;
sysUser.UpdateTime = DateTime.Now;
int count = 0;
try
{
await _dbContext.AsTenant().BeginTranAsync();
count = await _dbContext.Updateable(sysUser)
.UpdateColumns(it => new { it.Status, it.UpdateUserId, it.UpdateUserName, it.UpdateTime })
.ExecuteCommandAsync();
await _dbContext.AsTenant().CommitTranAsync();
}
catch (Exception)
{
await _dbContext.AsTenant().RollbackTranAsync();
}
return count;
}
}
}