huangsucan/IOT_API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 网关管理模块 + RBAC权限认证 + 组织架构 + 审计日志

Browse Source 
- 网关管理：GatewayEntity/Service/Controller CRUD + 测试连接；设备 GatewayId 外键关联
- JWT 认证：登录签发 Token（权限编码写入 Claims）、RequirePermission 权限过滤器、CurrentUser 上下文
- RBAC：用户/角色/权限实体与 CRUD，预定义 4 角色 + 6 权限种子（admin/admin123）
- 组织架构：sys_org 固定层级树（公司/实验室/部门/班组白夜班），层级校验，用户挂 OrgId/岗位/技能标签
- 数据权限：角色 DataScope（全部/本组织及下级），用户列表按组织子树过滤
- 防锁死保护：禁止删/禁自己，保证至少一名活跃管理员，角色摘除 user:manage 前校验
- 审计日志：AuditRecorder 接入设备增删改/指令下发/登录登出/组织变更，AuditController 查询
- 设备指令下发按网关表取连接参数；设备列表支持 gatewayId/productId 筛选

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
dengboling
2026-09-10 17:31:39 +08:00
co-authored by Claude Sonnet 4.6
parent 3059befcf5
commit 6aca0297bb
48 changed files with 3583 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Model/Dto/Config/GatewayDto.cs
+56
View File
@@ -0,0 +1,56 @@
namespace Model.Dto.Config
{
/// <summary>
/// 网关 DTO
/// </summary>
public class GatewayDto
{
public string Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
public int ProtocolType { get; set; }
// TCP
public string? Host { get; set; }
public int? Port { get; set; }
// 串口
public string? ComPort { get; set; }
public int? BaudRate { get; set; }
public byte? DataBits { get; set; }
public byte? StopBits { get; set; }
public byte? Parity { get; set; }
// S7
public string? CpuType { get; set; }
public byte? Rack { get; set; }
public byte? Slot { get; set; }
// 状态
public bool IsEnabled { get; set; }
public byte OnlineStatus { get; set; }
public DateTime? LastConnectedTime { get; set; }
public string? LastError { get; set; }
public string? Remark { get; set; }
public DateTime? CreateTime { get; set; }
}
/// <summary>
/// 网关下拉选项 DTO（设备表单选用）
/// </summary>
public class GatewayOptionDto
{
public string Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
}
/// <summary>
/// 测试连接结果 DTO
/// </summary>
public class GatewayTestResultDto
{
public bool Success { get; set; }
public string Message { get; set; }
}
}
Model/Dto/Config/IotDeviceDto.cs
+5 -2
View File
@@ -25,8 +25,11 @@ namespace Model.Dto.Config
/// <summary>所属产品型号/名称（只读展示）</summary>
public string? ProductName { get; set; }
/// <summary>所属网关Code</summary>
public string GatewayCode { get; set; }
/// <summary>所属网关Id（string，0=未分配）</summary>
public string GatewayId { get; set; }
/// <summary>所属网关名称（只读展示）</summary>
public string? GatewayName { get; set; }
/// <summary>从站地址</summary>
public byte SlaveId { get; set; }
Model/Dto/System/OrgDto.cs
+56
View File
@@ -0,0 +1,56 @@
namespace Model.Dto.System
{
/// <summary>
/// 组织架构树节点 DTO（嵌套子级；含数据权限摘要）
/// </summary>
public class OrgTreeDto
{
public string Id { get; set; }
public string ParentId { get; set; }
public string Name { get; set; }
public string Code { get; set; }
public int OrgType { get; set; }
public int ShiftType { get; set; }
public string? Leader { get; set; }
public string? Phone { get; set; }
public int Sort { get; set; }
public string? Remark { get; set; }
public List<OrgTreeDto> Children { get; set; } = new();
/// <summary>直接挂靠用户数</summary>
public int UserCount { get; set; }
/// <summary>本组织及下级用户总数</summary>
public int TotalUserCount { get; set; }
/// <summary>数据权限摘要：本组织及下级用户的角色+数据范围（去重，如「实验室管理员·本组织及下级」）</summary>
public List<string> ScopeSummary { get; set; } = new();
}
/// <summary>
/// 组织架构编辑 DTO（新增/修改用）
/// </summary>
public class OrgDto
{
public string Id { get; set; }
public string ParentId { get; set; }
public string Name { get; set; }
public string Code { get; set; }
public int OrgType { get; set; }
public int ShiftType { get; set; }
public string? Leader { get; set; }
public string? Phone { get; set; }
public int Sort { get; set; }
public string? Remark { get; set; }
}
/// <summary>
/// 组织下拉选项 DTO（用户表单选组织用）
/// </summary>
public class OrgOptionDto
{
public string Id { get; set; }
public string Name { get; set; }
public int OrgType { get; set; }
}
}
Model/Dto/System/PermissionDto.cs
+37
View File
@@ -0,0 +1,37 @@
namespace Model.Dto.System
{
/// <summary>
/// 权限 DTO
/// </summary>
public class PermissionDto
{
public string Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
public string? Group { get; set; }
public byte IsSystem { get; set; }
public int Sort { get; set; }
}
/// <summary>
/// 审计日志 DTO
/// </summary>
public class AuditLogDto
{
public string Id { get; set; }
public string UserId { get; set; }
public string? UserName { get; set; }
public string RoleId { get; set; }
public string? RoleName { get; set; }
public string OperationType { get; set; }
public string OperationTarget { get; set; }
public string TargetId { get; set; }
public string DeviceId { get; set; }
public string? OldValue { get; set; }
public string? NewValue { get; set; }
public string? Ip { get; set; }
public string? Description { get; set; }
public DateTime OperateTime { get; set; }
public DateTime? CreateTime { get; set; }
}
}
Model/Dto/System/RoleDto.cs
+31
View File
@@ -0,0 +1,31 @@
namespace Model.Dto.System
{
/// <summary>
/// 角色 DTO
/// </summary>
public class RoleDto
{
public string Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
public byte DataScope { get; set; }
public byte IsSystem { get; set; }
public int Sort { get; set; }
public string? Remark { get; set; }
public DateTime? CreateTime { get; set; }
/// <summary>角色的权限Id列表（分配权限用）</summary>
public List<string>? PermissionIds { get; set; }
/// <summary>角色的权限编码列表（展示用）</summary>
public List<string>? PermissionCodes { get; set; }
}
/// <summary>
/// 角色下拉选项 DTO
/// </summary>
public class RoleOptionDto
{
public string Id { get; set; }
public string Code { get; set; }
public string Name { get; set; }
}
}
Model/Dto/System/UserDto.cs
+68
View File
@@ -0,0 +1,68 @@
namespace Model.Dto.System
{
/// <summary>
/// 用户 DTO
/// </summary>
public class UserDto
{
public string Id { get; set; }
public string UserName { get; set; }
public string? RealName { get; set; }
public string? Email { get; set; }
public string? Phone { get; set; }
public string OrgId { get; set; }
public string? OrgName { get; set; }
public string? Position { get; set; }
public string? SkillTags { get; set; }
public byte IsEnabled { get; set; }
public DateTime? LastLoginTime { get; set; }
public string? Avatar { get; set; }
public string? Remark { get; set; }
public DateTime? CreateTime { get; set; }
/// <summary>用户的角色Id列表（分配角色用）</summary>
public List<string>? RoleIds { get; set; }
/// <summary>用户的角色名称（展示用，逗号分隔）</summary>
public string? RoleNames { get; set; }
/// <summary>初始密码（仅新增用户时传入，不回显）</summary>
public string? InitialPassword { get; set; }
}
/// <summary>
/// 登录请求 DTO
/// </summary>
public class LoginDto
{
public string UserName { get; set; }
public string Password { get; set; }
}
/// <summary>
/// 登录结果 DTO
/// </summary>
public class LoginResultDto
{
public string Token { get; set; }
public string RefreshToken { get; set; }
public UserDto User { get; set; }
public List<string> Permissions { get; set; } = new();
}
/// <summary>
/// 修改密码 DTO
/// </summary>
public class ChangePasswordDto
{
public string OldPassword { get; set; }
public string NewPassword { get; set; }
}
/// <summary>
/// 用户下拉选项 DTO
/// </summary>
public class UserOptionDto
{
public string Id { get; set; }
public string UserName { get; set; }
public string? RealName { get; set; }
}
}