From 1937c1a5da70c4c0c10176c5928356f27f3d0698 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sun, 11 Jan 2026 01:02:40 +0800 Subject: [PATCH 1/3] fix. --- .../Constant/ConsumptionConstant.cs | 2 +- .../Constant/SpendTypeConstant.cs | 2 +- .../Constant/SystemConstant.cs | 2 +- .../EOM.TSHotelManagement.Common.csproj | 6 +++--- EOM.TSHotelManagement.Common/Enums/AdminRole.cs | 15 +++++++++++++++ .../Permission/AssignUserPermissionsInputDto.cs | 2 +- .../Dto/Permission/UserRolePermissionOutputDto.cs | 2 +- .../{ConstantBase.cs => CodeConstantBase.cs} | 4 ++-- .../Administrator/AdminService.cs | 3 +-- .../Administrator/IAdminService.cs | 4 ++-- EOM.TSHotelManagement.Web.sln | 12 ++++++------ 11 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 EOM.TSHotelManagement.Common/Enums/AdminRole.cs rename EOM.TSHotelManagement.Infrastructure/Constant/{ConstantBase.cs => CodeConstantBase.cs} (88%) diff --git a/EOM.TSHotelManagement.Common/Constant/ConsumptionConstant.cs b/EOM.TSHotelManagement.Common/Constant/ConsumptionConstant.cs index 0efbcae..0e02f77 100644 --- a/EOM.TSHotelManagement.Common/Constant/ConsumptionConstant.cs +++ b/EOM.TSHotelManagement.Common/Constant/ConsumptionConstant.cs @@ -29,7 +29,7 @@ namespace EOM.TSHotelManagement.Common /// /// 结算状态常量 /// - public class ConsumptionConstant : ConstantBase + public class ConsumptionConstant : CodeConstantBase { public static readonly ConsumptionConstant Settled = new ConsumptionConstant("Settled", "已结算"); public static readonly ConsumptionConstant UnSettle = new ConsumptionConstant("UnSettle", "未结算"); diff --git a/EOM.TSHotelManagement.Common/Constant/SpendTypeConstant.cs b/EOM.TSHotelManagement.Common/Constant/SpendTypeConstant.cs index c6c22d1..c03aee1 100644 --- a/EOM.TSHotelManagement.Common/Constant/SpendTypeConstant.cs +++ b/EOM.TSHotelManagement.Common/Constant/SpendTypeConstant.cs @@ -2,7 +2,7 @@ namespace EOM.TSHotelManagement.Common { - public class SpendTypeConstant : ConstantBase + public class SpendTypeConstant : CodeConstantBase { public static readonly SpendTypeConstant Product = new SpendTypeConstant("Product", "商品"); public static readonly SpendTypeConstant Room = new SpendTypeConstant("Room", "房间"); diff --git a/EOM.TSHotelManagement.Common/Constant/SystemConstant.cs b/EOM.TSHotelManagement.Common/Constant/SystemConstant.cs index e1fcceb..afeb5e4 100644 --- a/EOM.TSHotelManagement.Common/Constant/SystemConstant.cs +++ b/EOM.TSHotelManagement.Common/Constant/SystemConstant.cs @@ -2,7 +2,7 @@ namespace EOM.TSHotelManagement.Common { - public class SystemConstant : ConstantBase + public class SystemConstant : CodeConstantBase { public static readonly SystemConstant MariaDB = new SystemConstant("MariaDB", "Maria DB"); public static readonly SystemConstant PgSql = new SystemConstant("PgSql", "Postgres SQL"); diff --git a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj index 326cce3..ae99230 100644 --- a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj +++ b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj @@ -43,9 +43,9 @@ - diff --git a/EOM.TSHotelManagement.Common/Enums/AdminRole.cs b/EOM.TSHotelManagement.Common/Enums/AdminRole.cs new file mode 100644 index 0000000..07d4855 --- /dev/null +++ b/EOM.TSHotelManagement.Common/Enums/AdminRole.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Text; + +namespace EOM.TSHotelManagement.Common +{ + public enum AdminRole + { + [Description("超级管理员")] + SuperAdmin = 1, + [Description("管理员")] + Admin = 0, + } +} diff --git a/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/AssignUserPermissionsInputDto.cs b/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/AssignUserPermissionsInputDto.cs index 491b478..d750f0a 100644 --- a/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/AssignUserPermissionsInputDto.cs +++ b/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/AssignUserPermissionsInputDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace EOM.TSHotelManagement.Contract.SystemManagement.Dto.Permission +namespace EOM.TSHotelManagement.Contract { public class AssignUserPermissionsInputDto : BaseInputDto { diff --git a/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/UserRolePermissionOutputDto.cs b/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/UserRolePermissionOutputDto.cs index bc9aa1e..2e22503 100644 --- a/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/UserRolePermissionOutputDto.cs +++ b/EOM.TSHotelManagement.Contract/SystemManagement/Dto/Permission/UserRolePermissionOutputDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace EOM.TSHotelManagement.Contract.SystemManagement.Dto.Permission +namespace EOM.TSHotelManagement.Contract { public class UserRolePermissionOutputDto : BaseOutputDto { diff --git a/EOM.TSHotelManagement.Infrastructure/Constant/ConstantBase.cs b/EOM.TSHotelManagement.Infrastructure/Constant/CodeConstantBase.cs similarity index 88% rename from EOM.TSHotelManagement.Infrastructure/Constant/ConstantBase.cs rename to EOM.TSHotelManagement.Infrastructure/Constant/CodeConstantBase.cs index 2a3f91b..9da8006 100644 --- a/EOM.TSHotelManagement.Infrastructure/Constant/ConstantBase.cs +++ b/EOM.TSHotelManagement.Infrastructure/Constant/CodeConstantBase.cs @@ -1,13 +1,13 @@ namespace EOM.TSHotelManagement.Infrastructure { - public class ConstantBase where T : ConstantBase + public class CodeConstantBase where T : CodeConstantBase { public string Code { get; } public string Description { get; } private static List _constants = new List(); - protected ConstantBase(string code, string description) + protected CodeConstantBase(string code, string description) { Code = code; Description = description; diff --git a/EOM.TSHotelManagement.Service/SystemManagement/Administrator/AdminService.cs b/EOM.TSHotelManagement.Service/SystemManagement/Administrator/AdminService.cs index 3388b62..a87ae27 100644 --- a/EOM.TSHotelManagement.Service/SystemManagement/Administrator/AdminService.cs +++ b/EOM.TSHotelManagement.Service/SystemManagement/Administrator/AdminService.cs @@ -23,7 +23,6 @@ */ using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Contract; -using EOM.TSHotelManagement.Contract.SystemManagement.Dto.Permission; using EOM.TSHotelManagement.Data; using EOM.TSHotelManagement.Domain; using jvncorelib.EncryptorLib; @@ -228,7 +227,7 @@ namespace EOM.TSHotelManagement.Service { try { - if (createAdministratorInputDto.IsSuperAdmin == 1) + if (createAdministratorInputDto.IsSuperAdmin == (int)AdminRole.SuperAdmin) { var haveSuperAdmin = adminRepository.IsAny(a => a.IsSuperAdmin == 1 && a.IsDelete != 1); if (haveSuperAdmin) diff --git a/EOM.TSHotelManagement.Service/SystemManagement/Administrator/IAdminService.cs b/EOM.TSHotelManagement.Service/SystemManagement/Administrator/IAdminService.cs index b173230..ddb36d5 100644 --- a/EOM.TSHotelManagement.Service/SystemManagement/Administrator/IAdminService.cs +++ b/EOM.TSHotelManagement.Service/SystemManagement/Administrator/IAdminService.cs @@ -110,14 +110,14 @@ namespace EOM.TSHotelManagement.Service /// /// 用户编码 /// 明细列表（包含 RoleNumber、PermissionNumber、PermissionName、MenuKey） - ListOutputDto ReadUserRolePermissions(string userNumber); + ListOutputDto ReadUserRolePermissions(string userNumber); /// /// 为指定用户分配“直接权限”（通过专属角色 R-USER-{UserNumber} 写入 RolePermission，全量覆盖） /// /// 用户编号与权限编码集合 /// - BaseResponse AssignUserPermissions(Contract.SystemManagement.Dto.Permission.AssignUserPermissionsInputDto input); + BaseResponse AssignUserPermissions(AssignUserPermissionsInputDto input); /// /// 读取指定用户的“直接权限”（仅来自专属角色 R-USER-{UserNumber} 的权限编码列表） diff --git a/EOM.TSHotelManagement.Web.sln b/EOM.TSHotelManagement.Web.sln index cebdc1a..b3628c4 100644 --- a/EOM.TSHotelManagement.Web.sln +++ b/EOM.TSHotelManagement.Web.sln @@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Commo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Migration", "EOM.TSHotelManagement.Migration\EOM.TSHotelManagement.Migration.csproj", "{A1A986E0-E59D-4913-B63E-D965453B8CC0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EOM.TSHotelManagement.Contract", "EOM.TSHotelManagement.Contract\EOM.TSHotelManagement.Contract.csproj", "{B83A545B-9FFA-784F-3486-87BB3B50F46D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Contract", "EOM.TSHotelManagement.Contract\EOM.TSHotelManagement.Contract.csproj", "{B83A545B-9FFA-784F-3486-87BB3B50F46D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EOM.TSHotelManagement.Infrastructure", "EOM.TSHotelManagement.Infrastructure\EOM.TSHotelManagement.Infrastructure.csproj", "{C390E995-B01C-4C4A-9335-3AD14CCFFA2C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Infrastructure", "EOM.TSHotelManagement.Infrastructure\EOM.TSHotelManagement.Infrastructure.csproj", "{C390E995-B01C-4C4A-9335-3AD14CCFFA2C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -53,10 +53,10 @@ Global {B83A545B-9FFA-784F-3486-87BB3B50F46D}.Debug|x64.Build.0 = Debug|x64 {B83A545B-9FFA-784F-3486-87BB3B50F46D}.Release|x64.ActiveCfg = Release|x64 {B83A545B-9FFA-784F-3486-87BB3B50F46D}.Release|x64.Build.0 = Release|x64 - {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Debug|x64.ActiveCfg = Debug|Any CPU - {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Debug|x64.Build.0 = Debug|Any CPU - {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Release|x64.ActiveCfg = Release|Any CPU - {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Release|x64.Build.0 = Release|Any CPU + {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Debug|x64.ActiveCfg = Debug|x64 + {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Debug|x64.Build.0 = Debug|x64 + {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Release|x64.ActiveCfg = Release|x64 + {C390E995-B01C-4C4A-9335-3AD14CCFFA2C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- Gitee From 5775986b2348781292716105c99c80a04962a894 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sun, 11 Jan 2026 01:52:17 +0800 Subject: [PATCH 2/3] add employee login api. --- .../Controllers/Employee/EmployeeController.cs | 4 ++-- .../Employee/Dto/Employee/EmployeeLoginDto.cs | 13 +++++++++++++ .../Employee/EmployeeService.cs | 12 ++++++------ .../Employee/IEmployeeService.cs | 6 +++--- 4 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 EOM.TSHotelManagement.Contract/Employee/Dto/Employee/EmployeeLoginDto.cs diff --git a/EOM.TSHotelManagement.API/Controllers/Employee/EmployeeController.cs b/EOM.TSHotelManagement.API/Controllers/Employee/EmployeeController.cs index 08b9d8b..64a0bad 100644 --- a/EOM.TSHotelManagement.API/Controllers/Employee/EmployeeController.cs +++ b/EOM.TSHotelManagement.API/Controllers/Employee/EmployeeController.cs @@ -86,9 +86,9 @@ namespace EOM.TSHotelManagement.WebApi.Controllers [HttpPost] [AllowAnonymous] [IgnoreAntiforgeryToken] - public SingleOutputDto SelectEmployeeInfoByEmployeeIdAndEmployeePwd([FromBody] ReadEmployeeInputDto inputDto) + public SingleOutputDto EmployeeLogin([FromBody] EmployeeLoginDto inputDto) { - return workerService.SelectEmployeeInfoByEmployeeIdAndEmployeePwd(inputDto); + return workerService.EmployeeLogin(inputDto); } /// diff --git a/EOM.TSHotelManagement.Contract/Employee/Dto/Employee/EmployeeLoginDto.cs b/EOM.TSHotelManagement.Contract/Employee/Dto/Employee/EmployeeLoginDto.cs new file mode 100644 index 0000000..e679724 --- /dev/null +++ b/EOM.TSHotelManagement.Contract/Employee/Dto/Employee/EmployeeLoginDto.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace EOM.TSHotelManagement.Contract +{ + public class EmployeeLoginDto: BaseDto + { + public string EmployeeId { get; set; } + public string Password { get; set; } + public string EmailAddress { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Service/Employee/EmployeeService.cs b/EOM.TSHotelManagement.Service/Employee/EmployeeService.cs index 7065b1a..3794b80 100644 --- a/EOM.TSHotelManagement.Service/Employee/EmployeeService.cs +++ b/EOM.TSHotelManagement.Service/Employee/EmployeeService.cs @@ -352,11 +352,11 @@ namespace EOM.TSHotelManagement.Service } /// - /// 根据登录名称、密码查询员工信息 + /// 员工端登录 /// - /// + /// /// - public SingleOutputDto SelectEmployeeInfoByEmployeeIdAndEmployeePwd(ReadEmployeeInputDto readEmployeeInputDto) + public SingleOutputDto EmployeeLogin(EmployeeLoginDto employeeLoginDto) { Employee w = new Employee(); var helper = new EnumHelper(); @@ -369,7 +369,7 @@ namespace EOM.TSHotelManagement.Service Description = helper.GetEnumDescription(e) }) .ToList(); - w = workerRepository.GetFirst(a => a.EmployeeId == readEmployeeInputDto.EmployeeId || a.EmailAddress == readEmployeeInputDto.EmailAddress); + w = workerRepository.GetFirst(a => a.EmployeeId == employeeLoginDto.EmployeeId || a.EmailAddress == employeeLoginDto.EmailAddress); if (w == null) { w = null; @@ -379,11 +379,11 @@ namespace EOM.TSHotelManagement.Service try { - correctPassword = dataProtector.EncryptLibCompareEmployeeData(w.Password, readEmployeeInputDto.Password); + correctPassword = dataProtector.EncryptLibCompareEmployeeData(w.Password, employeeLoginDto.Password); } catch (Exception) { - correctPassword = dataProtector.CompareEmployeeData(w.Password, readEmployeeInputDto.Password); + correctPassword = dataProtector.CompareEmployeeData(w.Password, employeeLoginDto.Password); } if (!correctPassword) diff --git a/EOM.TSHotelManagement.Service/Employee/IEmployeeService.cs b/EOM.TSHotelManagement.Service/Employee/IEmployeeService.cs index a0aa980..0caeb10 100644 --- a/EOM.TSHotelManagement.Service/Employee/IEmployeeService.cs +++ b/EOM.TSHotelManagement.Service/Employee/IEmployeeService.cs @@ -65,11 +65,11 @@ namespace EOM.TSHotelManagement.Service SingleOutputDto SelectEmployeeInfoByEmployeeId(ReadEmployeeInputDto readEmployeeInputDto); /// - /// 根据登录名称、密码查询员工信息 + /// 员工端登录 /// - /// + /// /// - SingleOutputDto SelectEmployeeInfoByEmployeeIdAndEmployeePwd(ReadEmployeeInputDto readEmployeeInputDto); + SingleOutputDto EmployeeLogin(EmployeeLoginDto employeeLoginDto); /// /// 修改员工账号密码 -- Gitee From 73cfccf0aed699ee7b6600af06144b18155c44c1 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sun, 11 Jan 2026 02:17:19 +0800 Subject: [PATCH 3/3] update version. --- version.txt | Bin 18 -> 18 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/version.txt b/version.txt index 5dd7646c1621f86363ec6a00d00c5d3965f488fd..f96eaa82dab2fdf85cb4dde18b9e2e6069c90a11 100644 GIT binary patch literal 18 WcmezW&xk>f0fY@1Oc;0>xEKI0t^+y% literal 18 WcmezW&xk>f0fY@1j2U