From 098cfc135e781a0cf172cd1289e5e871c7a76419 Mon Sep 17 00:00:00 2001 From: tk Date: Thu, 12 Dec 2024 10:05:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E6=A1=86=E6=9E=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/RepositoryService.cs | 3 ++- .../Services/Tpl/ExampleService.cs | 9 +++---- .../Attributes/IndicatorAttribute.cs | 7 +++++- .../Dto/Sys/Api/CreateApiReq.cs | 2 -- .../NetAdmin.Domain/Dto/Sys/Api/EditApiReq.cs | 2 -- .../Dto/Sys/Api/QueryApiReq.cs | 2 -- .../Dto/Sys/Api/QueryApiRsp.cs | 2 -- .../Dto/Sys/Config/CreateConfigReq.cs | 2 -- .../Dto/Sys/Config/ExportConfigRsp.cs | 1 - .../Dto/Sys/Config/QueryConfigReq.cs | 2 -- .../Dto/Sys/Config/QueryConfigRsp.cs | 1 - .../Dto/Sys/Config/SetConfigEnabledReq.cs | 2 -- .../Dto/Sys/Dept/CreateDeptReq.cs | 2 -- .../Dto/Sys/Dept/QueryDeptReq.cs | 2 -- .../Dto/Sys/Dept/QueryDeptRsp.cs | 2 -- .../Dto/Sys/Dept/SetDeptEnabledReq.cs | 2 -- .../Sys/Dic/Catalog/CreateDicCatalogReq.cs | 2 -- .../Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs | 2 -- .../Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs | 2 -- .../Sys/Dic/Content/CreateDicContentReq.cs | 2 -- .../Dto/Sys/Dic/Content/GetDicValueReq.cs | 2 -- .../Dto/Sys/Dic/Content/QueryDicContentReq.cs | 2 -- .../Dto/Sys/Dic/Content/QueryDicContentRsp.cs | 2 -- .../Dic/Content/SetDicContentEnabledReq.cs | 2 -- .../Sys/Doc/Catalog/CreateDocCatalogReq.cs | 2 -- .../Dto/Sys/Doc/Catalog/QueryDocCatalogReq.cs | 2 -- .../Dto/Sys/Doc/Catalog/QueryDocCatalogRsp.cs | 2 -- .../Sys/Doc/Content/CreateDocContentReq.cs | 1 - .../Dto/Sys/Doc/Content/QueryDocContentReq.cs | 2 -- .../Dto/Sys/Doc/Content/QueryDocContentRsp.cs | 1 - .../Doc/Content/SetDocContentEnabledReq.cs | 2 -- .../Dto/Sys/Job/CreateJobReq.cs | 1 - .../Dto/Sys/Job/FinishJobReq.cs | 2 -- .../Dto/Sys/Job/QueryJobReq.cs | 2 -- .../Dto/Sys/Job/QueryJobRsp.cs | 1 - .../Dto/Sys/Job/SetJobEnabledReq.cs | 2 -- .../Dto/Sys/JobRecord/CreateJobRecordReq.cs | 2 -- .../Dto/Sys/JobRecord/ExportJobRecordRsp.cs | 1 - .../Dto/Sys/JobRecord/QueryJobRecordReq.cs | 2 -- .../Dto/Sys/JobRecord/QueryJobRecordRsp.cs | 1 - .../Dto/Sys/LoginLog/CreateLoginLogReq.cs | 1 - .../Dto/Sys/LoginLog/QueryLoginLogReq.cs | 2 -- .../Dto/Sys/LoginLog/QueryLoginLogRsp.cs | 1 - .../Dto/Sys/Menu/CreateMenuReq.cs | 1 - .../Dto/Sys/Menu/QueryMenuReq.cs | 2 -- .../Dto/Sys/Menu/QueryMenuRsp.cs | 2 -- .../Dto/Sys/RequestLog/CreateRequestLogReq.cs | 1 - .../Dto/Sys/RequestLog/QueryRequestLogReq.cs | 2 -- .../Dto/Sys/RequestLog/QueryRequestLogRsp.cs | 1 - .../CreateRequestLogDetailReq.cs | 2 -- .../QueryRequestLogDetailReq.cs | 2 -- .../QueryRequestLogDetailRsp.cs | 1 - .../Dto/Sys/Role/CreateRoleReq.cs | 1 - .../Dto/Sys/Role/GetMenusRsp.cs | 2 -- .../Dto/Sys/Role/QueryRoleReq.cs | 2 -- .../Dto/Sys/Role/QueryRoleRsp.cs | 1 - .../Dto/Sys/Role/SetDisplayDashboardReq.cs | 2 -- .../Sys/Role/SetIgnorePermissionControlReq.cs | 2 -- .../Dto/Sys/Role/SetRoleEnabledReq.cs | 2 -- .../Dto/Sys/SiteMsg/CreateSiteMsgReq.cs | 1 - .../Dto/Sys/SiteMsg/QuerySiteMsgReq.cs | 2 -- .../Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs | 1 - .../Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs | 2 -- .../Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs | 2 -- .../Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs | 2 -- .../Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs | 1 - .../Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs | 2 -- .../Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs | 1 - .../Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs | 2 -- .../Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs | 2 -- .../Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs | 2 -- .../Sys/SiteMsgUser/CreateSiteMsgUserReq.cs | 2 -- .../Sys/SiteMsgUser/QuerySiteMsgUserReq.cs | 2 -- .../Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs | 2 -- .../Dto/Sys/User/CheckMobileAvailableReq.cs | 2 -- .../Dto/Sys/User/CheckUserNameAvailableReq.cs | 2 -- .../Dto/Sys/User/CreateEditUserReq.cs | 2 -- .../Dto/Sys/User/CreateUserReq.cs | 1 - .../Dto/Sys/User/EditUserReq.cs | 1 - .../Dto/Sys/User/ExportUserRsp.cs | 1 - .../Dto/Sys/User/LoginByPwdReq.cs | 2 -- .../Dto/Sys/User/QueryUserReq.cs | 2 -- .../Dto/Sys/User/QueryUserRsp.cs | 1 - .../Dto/Sys/User/RegisterUserReq.cs | 1 - .../Dto/Sys/User/SetAvatarReq.cs | 2 -- .../Dto/Sys/User/SetUserEnabledReq.cs | 2 -- .../Dto/Sys/User/UserInfoRsp.cs | 1 - .../Sys/UserProfile/CreateUserProfileReq.cs | 1 - .../Dto/Sys/UserProfile/EditUserProfileReq.cs | 2 -- .../UserProfile/GetSessionUserAppConfigRsp.cs | 2 -- .../Sys/UserProfile/QueryUserProfileReq.cs | 2 -- .../Sys/UserProfile/QueryUserProfileRsp.cs | 1 - .../UserProfile/SetSessionUserAppConfigReq.cs | 2 -- .../Dto/Sys/UserRole/CreateUserRoleReq.cs | 2 -- .../Dto/Sys/UserRole/QueryUserRoleReq.cs | 2 -- .../Dto/Sys/UserRole/QueryUserRoleRsp.cs | 2 -- .../Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs | 2 -- .../Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs | 2 -- .../Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs | 2 -- .../Dto/Sys/VerifyCode/SendVerifyCodeReq.cs | 1 - .../Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs | 2 -- .../Dto/Sys/VerifyCode/VerifyCodeReq.cs | 2 -- .../Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs | 1 - .../Dto/Sys/VerifyCode/VerifySmsCodeReq.cs | 1 - .../NetAdmin.Domain/Enums/Sys/JobStatues.cs | 4 ++-- .../Extensions/ISelectExtensions.cs | 24 +++++++++++++------ .../NetAdmin/NetAdmin.Domain/ProjectUsings.cs | 1 + .../Services/Sys/ApiService.cs | 6 ++--- .../Services/Sys/ConfigService.cs | 9 +++---- .../Services/Sys/ConstantService.cs | 4 ++-- .../Services/Sys/DeptService.cs | 5 ++-- .../Services/Sys/DicCatalogService.cs | 3 ++- .../Services/Sys/DicContentService.cs | 11 ++++----- .../Services/Sys/DocCatalogService.cs | 3 ++- .../Services/Sys/DocContentService.cs | 9 +++---- .../Services/Sys/JobRecordService.cs | 9 +++---- .../Services/Sys/JobService.cs | 9 +++---- .../Services/Sys/LoginLogService.cs | 7 ++---- .../Services/Sys/MenuService.cs | 1 + .../Services/Sys/RequestLogDetailService.cs | 9 +++---- .../Services/Sys/RequestLogService.cs | 7 ++---- .../Services/Sys/RoleService.cs | 9 +++---- .../Services/Sys/SiteMsgDeptService.cs | 9 +++---- .../Services/Sys/SiteMsgFlagService.cs | 9 +++---- .../Services/Sys/SiteMsgRoleService.cs | 9 +++---- .../Services/Sys/SiteMsgService.cs | 7 ++---- .../Services/Sys/SiteMsgUserService.cs | 9 +++---- .../Services/Sys/UserProfileService.cs | 1 + .../Services/Sys/UserRoleService.cs | 9 +++---- .../Services/Sys/UserService.cs | 5 ++-- .../Services/Sys/VerifyCodeService.cs | 9 +++---- src/frontend/admin/src/App.vue | 6 +++-- .../src/components/scSelectFilter/index.vue | 2 +- .../admin/src/components/scTable/index.vue | 5 ++-- .../admin/src/layout/components/tags.vue | 10 ++++++++ .../admin/src/views/sys/dic/list/index.vue | 4 ++-- .../admin/src/views/sys/doc/list/index.vue | 6 ++--- .../admin/src/views/sys/job/all/index.vue | 6 ++--- .../admin/src/views/sys/job/record/index.vue | 8 +++---- .../admin/src/views/sys/log/login/index.vue | 2 +- .../admin/src/views/sys/msg/index.vue | 4 ++-- .../admin/src/views/sys/role/index.vue | 2 +- .../admin/src/views/sys/user/index.vue | 2 +- 143 files changed, 130 insertions(+), 314 deletions(-) rename src/backend/NetAdmin/{NetAdmin.Infrastructure => NetAdmin.Domain}/Extensions/ISelectExtensions.cs (80%) diff --git a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs index c5871793..e9aa66e8 100644 --- a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs +++ b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs @@ -5,6 +5,7 @@ using NetAdmin.Domain; using NetAdmin.Domain.DbMaps.Dependency; using NetAdmin.Domain.DbMaps.Dependency.Fields; using NetAdmin.Domain.Dto.Dependency; +using NetAdmin.Domain.Extensions; namespace NetAdmin.Application.Services; @@ -53,7 +54,7 @@ public abstract class RepositoryService(BasicReposit var select = selector(query).WithNoLockNoWait().Take(Numbers.MAX_LIMIT_EXPORT); object list = listExp == null - ? await select.ToListAsync(a => a).ConfigureAwait(false) + ? await select.ToListAsync().ConfigureAwait(false) : await select.ToListAsync(listExp).ConfigureAwait(false); return await GetExportFileStreamAsync(fileName, list).ConfigureAwait(false); diff --git a/src/backend/NetAdmin/NetAdmin.Application/Services/Tpl/ExampleService.cs b/src/backend/NetAdmin/NetAdmin.Application/Services/Tpl/ExampleService.cs index 8827f7ae..884b6406 100644 --- a/src/backend/NetAdmin/NetAdmin.Application/Services/Tpl/ExampleService.cs +++ b/src/backend/NetAdmin/NetAdmin.Application/Services/Tpl/ExampleService.cs @@ -3,6 +3,7 @@ using NetAdmin.Application.Services.Tpl.Dependency; using NetAdmin.Domain.DbMaps.Tpl; using NetAdmin.Domain.Dto.Dependency; using NetAdmin.Domain.Dto.Tpl.Example; +using NetAdmin.Domain.Extensions; namespace NetAdmin.Application.Services.Tpl; @@ -95,7 +96,7 @@ public sealed class ExampleService(BasicRepository rpo) // .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -105,11 +106,7 @@ public sealed class ExampleService(BasicRepository rpo) // public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs index f489eb59..e3332ea7 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs @@ -5,10 +5,15 @@ namespace NetAdmin.Domain.Attributes; /// /// [AttributeUsage(AttributeTargets.Field | AttributeTargets.Enum)] -public sealed class IndicatorAttribute(string indicate) : Attribute +public sealed class IndicatorAttribute(string indicate, bool pulse) : Attribute { /// /// 状态指示 /// public string Indicate { get; } = indicate; + + /// + /// 脉动 + /// + public bool Pulse { get; } = pulse; } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs index 7c600097..ca86afe8 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Api; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/EditApiReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/EditApiReq.cs index 21fb3203..99724c39 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/EditApiReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/EditApiReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Api; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs index fb0e1310..92b07f7b 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Api; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs index 52b8a965..3ada91ac 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Api; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs index 4496e15e..134a6d3a 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Config; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs index 02a3e100..1ac80f88 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; using NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs index 53f0a5f0..96008bb5 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Config; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs index 0dbdda5f..4224a6c0 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; using NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs index 586e0662..cf77c779 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Config; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs index ee7033a8..5ba80ce9 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs index e55b4065..54225d4f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs index e112ba2f..a3cdb87a 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs index ccf161b0..aac2dfe5 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs index 08da6f19..f66af602 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs index 7109e016..0d2081a9 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs index c9ac5cb1..f538d310 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs index a1d4bb3b..cc7bafee 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs index 6be897c4..1489eed0 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs index 542721db..8e6f3c52 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs index 6be53609..802fe7e2 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs index 2e00ccbe..e5cb5926 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/CreateDocCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/CreateDocCatalogReq.cs index 7d6d3031..9d45d10e 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/CreateDocCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/CreateDocCatalogReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Doc.Catalog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogReq.cs index 40fe3ee8..145ca029 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Doc.Catalog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogRsp.cs index a51f2f3c..84140a48 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Catalog/QueryDocCatalogRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Doc.Catalog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/CreateDocContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/CreateDocContentReq.cs index 9a2132be..09600919 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/CreateDocContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/CreateDocContentReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.Doc.Content; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentReq.cs index 1d8319bd..083fc26b 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Doc.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentRsp.cs index 378a01f0..d5413b9d 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/QueryDocContentRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.Doc.Content; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/SetDocContentEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/SetDocContentEnabledReq.cs index 4ddfde06..fad7c28d 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/SetDocContentEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Doc/Content/SetDocContentEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Doc.Content; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs index 54c2df2f..fc760b39 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.Job; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs index 21ba8801..21384c0a 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Job; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs index d3869bf9..6cb1ff1f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Job; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs index 871d7908..0a4f8bcf 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs @@ -1,5 +1,4 @@ using CronExpressionDescriptor; -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.User; using NetAdmin.Domain.Enums.Sys; using Options = CronExpressionDescriptor.Options; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs index 5099cc17..0ec6f97c 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Job; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs index c9e6d53d..df6c3b8f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs index 7624099d..3c2963d1 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Job; namespace NetAdmin.Domain.Dto.Sys.JobRecord; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs index 031c62e9..6c21476f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs index 2919356f..a65e19a2 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Job; namespace NetAdmin.Domain.Dto.Sys.JobRecord; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs index 37b8ced6..fee1abca 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs @@ -1,5 +1,4 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.RequestLog; using NetAdmin.Domain.Dto.Sys.User; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs index 53d00182..4daf06ee 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.LoginLog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs index e8725e9f..c7cf3f0d 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.User; namespace NetAdmin.Domain.Dto.Sys.LoginLog; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs index fd6bb29a..5f506b5b 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.Menu; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs index 67b10329..4a0c612f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Menu; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs index 8c61d6ab..0a51f482 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Menu; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs index 9d9a1975..2b32e575 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.Domain.Dto.Sys.RequestLog; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs index c6937605..0a2ee62d 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.RequestLog; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs index bd2e893a..2da6dc7b 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Api; using NetAdmin.Domain.Dto.Sys.RequestLogDetail; using NetAdmin.Domain.Dto.Sys.User; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs index 27b15c31..dfe5c113 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs index 0b5981b0..6010cf48 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs index 79e8634b..eaaf33c4 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.User; namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs index d124170b..b9332e93 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs index 64c8153f..e7ab6c9d 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Role; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs index 502ea0c1..9010121b 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Role; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs index ef796c96..8a223b94 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs index 90e45a05..56642969 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Role; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs index 820404d2..02367a3a 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Role; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs index 17cd6efb..94b20278 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.Role; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs index 721e4720..bd70fe0f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.SiteMsg; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs index 3a61f59d..d53f43b5 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsg; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs index 5a621c65..b3f80ee7 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; using NetAdmin.Domain.Dto.Sys.Role; using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs index 145a52c1..3cd27ff2 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs index 4270d326..4e722d00 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs index dd42ed09..0674df0a 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs index 6f08b6d4..5345e3bf 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs index 78966bdf..b3e786b0 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs index 8c38a796..41648337 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs index 62ea48da..04e74c36 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs index 0589ce68..9912642d 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs index e2f0a71a..e5b69d21 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs index 477154b2..1568d1be 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs index a16efd15..d90757c5 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs index 08591bac..5620466b 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs index b7b21799..2fe31e7f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs index e6129e0a..96dd1520 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs index 1e11dc1f..b541f285 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs index 6e571563..67a940ec 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.Domain.Dto.Sys.User; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs index c889464c..622c7dc5 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.Domain.Dto.Sys.User; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs index 2ec935f1..5e4f00c6 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; using NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs index e4980e9a..8e40bc57 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs index dec07aad..987dd5f0 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs index b2d8129e..165825a9 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; using NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs index ee250e12..5f755aef 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.Domain.Dto.Sys.User; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs index 8b71e7be..2792a5fe 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs index d5e3de49..28932ceb 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.User; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs index c2a0a200..86897fd7 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; using NetAdmin.Domain.Dto.Sys.Role; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs index 769586aa..b5c3480e 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.Domain.Dto.Sys.UserProfile; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs index 62606dd4..96e81a77 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs index db987b0a..40c0ce43 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs index 6850ec7f..cb9a2d96 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs index bb86f4f5..07ea21ad 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.Domain.Dto.Sys.UserProfile; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs index cccd2fa2..99308fa9 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/CreateUserRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/CreateUserRoleReq.cs index bff561f5..09e54c0e 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/CreateUserRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/CreateUserRoleReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserRole; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleReq.cs index 91fc2316..b4f35d99 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserRole; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleRsp.cs index 78567871..137fa764 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserRole/QueryUserRoleRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.UserRole; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs index edad0698..5ac27f24 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs index 2c83eeba..8abd3f58 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs index b8f306d6..1180146c 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs index 54f82473..5894b168 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Captcha; using NetAdmin.Domain.Enums.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs index b4e248d7..35d11ed9 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs index 7b53130d..0a374ebe 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs @@ -1,5 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; - namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs index 9a825e29..6de8758f 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.VerifyCode; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs index f22ca70e..dc14ce44 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs @@ -1,4 +1,3 @@ -using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.Domain.Dto.Sys.VerifyCode; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs index 584d9174..bbe63a28 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs @@ -9,7 +9,7 @@ public enum JobStatues /// /// 空闲 /// - [Indicator(nameof(Indicates.Success))] + [Indicator(nameof(Indicates.Success), false)] [ResourceDescription(nameof(Ln.空闲))] Idle = 1 @@ -18,7 +18,7 @@ public enum JobStatues /// /// 运行 /// - [Indicator(nameof(Indicates.Warning))] + [Indicator(nameof(Indicates.Warning), true)] [ResourceDescription(nameof(Ln.运行))] Running = 2 } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/ISelectExtensions.cs b/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs similarity index 80% rename from src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/ISelectExtensions.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs index 0917b2fb..d7f3cdc4 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Extensions/ISelectExtensions.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs @@ -1,10 +1,20 @@ -namespace NetAdmin.Infrastructure.Extensions; +namespace NetAdmin.Domain.Extensions; /// /// ISelect 扩展方法 /// public static class ISelectExtensions { + /// + /// 执行SQL返回列表 + /// + public static Task> ToListAsync(this ISelect me, QueryReq req) + where TQuery : DataAbstraction, new() + { + var exp = req.GetToListExp(); + return exp == null ? me.ToListAsync() : me.ToListAsync(exp); + } + /// /// 无锁无等待 /// @@ -12,7 +22,7 @@ public static class ISelectExtensions where T1 : class { return me - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif ; @@ -26,7 +36,7 @@ public static class ISelectExtensions where T2 : class { return me - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif ; @@ -41,7 +51,7 @@ public static class ISelectExtensions where T3 : class { return me - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif ; @@ -57,7 +67,7 @@ public static class ISelectExtensions where T4 : class { return me - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif ; @@ -74,7 +84,7 @@ public static class ISelectExtensions where T5 : class { return me - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif ; @@ -92,7 +102,7 @@ public static class ISelectExtensions where T6 : class { return me - #if DBTYPE_SQLSERVER + #if DBTYPE_SQLSERVER .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait) #endif ; diff --git a/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs b/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs index 2cd9479f..1f87d3ad 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs @@ -2,6 +2,7 @@ global using NetAdmin.Domain.Attributes; global using NetAdmin.Domain.Attributes.DataValidation; global using NetAdmin.Domain.DbMaps.Dependency; global using NetAdmin.Domain.DbMaps.Dependency.Fields; +global using NetAdmin.Domain.DbMaps.Sys; global using NetAdmin.Domain.Dto.Dependency; global using CsvIgnore = CsvHelper.Configuration.Attributes.IgnoreAttribute; global using CsvIndex = CsvHelper.Configuration.Attributes.IndexAttribute; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs index 82d72a88..948d4251 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -92,10 +93,7 @@ public sealed class ApiService( public async Task> PlainQueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await Rpo.Select.WhereDynamicFilter(req.DynamicFilter) - .WhereDynamic(req.Filter) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await Rpo.Select.WhereDynamicFilter(req.DynamicFilter).WhereDynamic(req.Filter).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs index fefbd016..e71b64f2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Config; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -99,7 +100,7 @@ public sealed class ConfigService(BasicRepository rpo) // .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -109,11 +110,7 @@ public sealed class ConfigService(BasicRepository rpo) // public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs index 75d09a95..e2d3c0bc 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs @@ -35,8 +35,8 @@ public sealed class ConstantService : ServiceBase, IConstantSe return [..ret, z.GetCallingCode().ToInvString()]; } - var indicate = y.Attr()?.Indicate.ToLowerInvariant(); - return indicate.NullOrEmpty() ? ret : [..ret, indicate]; + var indicate = y.Attr(); + return indicate == null ? ret : [..ret, indicate.Indicate.ToLowerInvariant(), indicate.Pulse.ToString().ToLowerInvariant()]; } static string[] GetHttpStatusCodeDicValue(string name) diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs index 624363d0..ae779d05 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -153,8 +154,8 @@ public sealed class DeptService(BasicRepository rpo) // ret = ret.OrderByDescending(a => a.Sort); } - if (!req.Prop?.Equals(nameof(req.Filter.CreatedTime), StringComparison.OrdinalIgnoreCase) ?? true) { - ret = ret.OrderByDescending(a => a.CreatedTime); + if (!req.Prop?.Equals(nameof(req.Filter.Id), StringComparison.OrdinalIgnoreCase) ?? true) { + ret = ret.OrderByDescending(a => a.Id); } return ret; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs index db4c81db..1d59611e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -104,7 +105,7 @@ public sealed class DicCatalogService(BasicRepository rpo) .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs index 679abf0c..9153ca59 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -102,7 +103,7 @@ public sealed class DicContentService(BasicRepository rpo) .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -112,11 +113,7 @@ public sealed class DicContentService(BasicRepository rpo) public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } @@ -128,7 +125,7 @@ public sealed class DicContentService(BasicRepository rpo) .Include(a => a.Catalog) .Where(a => a.Catalog.Code == catalogCode) .Where(a => a.Enabled) - .ToListAsync(a => a) + .ToListAsync() .ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocCatalogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocCatalogService.cs index 62a3353b..652b5204 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocCatalogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocCatalogService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Doc.Catalog; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -105,7 +106,7 @@ public sealed class DocCatalogService(BasicRepository rpo) .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocContentService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocContentService.cs index 4572c767..053751b8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocContentService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocContentService.cs @@ -1,6 +1,7 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Doc.Content; using NetAdmin.Domain.Enums.Sys; +using NetAdmin.Domain.Extensions; #if !DBTYPE_SQLSERVER using NetAdmin.Domain.DbMaps.Dependency.Fields; #endif @@ -108,7 +109,7 @@ public sealed class DocContentService(BasicRepository rpo) .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -118,11 +119,7 @@ public sealed class DocContentService(BasicRepository rpo) public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs index 38141124..6997e80b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs @@ -1,6 +1,7 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys; using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -134,7 +135,7 @@ public sealed class JobRecordService(BasicRepository rpo) / .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -144,11 +145,7 @@ public sealed class JobRecordService(BasicRepository rpo) / public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs index 4ae20643..5cfb74bb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs @@ -5,6 +5,7 @@ using NetAdmin.Domain.Dto.Sys; using NetAdmin.Domain.Dto.Sys.Job; using NetAdmin.Domain.Dto.Sys.JobRecord; using NetAdmin.Domain.Enums.Sys; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -264,7 +265,7 @@ public sealed class JobService(BasicRepository rpo, IJobRecordSer .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -281,11 +282,7 @@ public sealed class JobService(BasicRepository rpo, IJobRecordSer public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs index b6d7fdc7..9b40df67 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -111,11 +112,7 @@ public sealed class LoginLogService(BasicRepository rpo) // public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs index f5a77614..29084947 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs index 3464a666..1f9ba5a8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -91,7 +92,7 @@ public sealed class RequestLogDetailService(BasicRepository() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -101,11 +102,7 @@ public sealed class RequestLogDetailService(BasicRepository> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs index d6d5e578..9545276c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs @@ -2,6 +2,7 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys; using NetAdmin.Domain.Dto.Sys.LoginLog; using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -184,11 +185,7 @@ public sealed class RequestLogService(BasicRepository rpo, public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs index 6a0dba3b..9fd45092 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs @@ -1,6 +1,7 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Role; using NetAdmin.Domain.Dto.Sys.UserRole; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -105,7 +106,7 @@ public sealed class RoleService(BasicRepository rpo, IUserRoleSe .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -115,7 +116,7 @@ public sealed class RoleService(BasicRepository rpo, IUserRoleSe public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req).WithNoLockNoWait().ToListAsync(req.GetToListExp() ?? (a => a)).ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } @@ -178,8 +179,8 @@ public sealed class RoleService(BasicRepository rpo, IUserRoleSe ret = ret.OrderByDescending(a => a.Sort); } - if (!req.Prop?.Equals(nameof(req.Filter.CreatedTime), StringComparison.OrdinalIgnoreCase) ?? true) { - ret = ret.OrderByDescending(a => a.CreatedTime); + if (!req.Prop?.Equals(nameof(req.Filter.Id), StringComparison.OrdinalIgnoreCase) ?? true) { + ret = ret.OrderByDescending(a => a.Id); } return ret; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs index a64bd867..4a2c1873 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -88,7 +89,7 @@ public sealed class SiteMsgDeptService(BasicRepository rp .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -98,11 +99,7 @@ public sealed class SiteMsgDeptService(BasicRepository rp public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs index 3aebeb8f..0afc7f65 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -88,7 +89,7 @@ public sealed class SiteMsgFlagService(BasicRepository rp .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -98,11 +99,7 @@ public sealed class SiteMsgFlagService(BasicRepository rp public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs index c2f4b553..9b603e7c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -88,7 +89,7 @@ public sealed class SiteMsgRoleService(BasicRepository rp .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -98,11 +99,7 @@ public sealed class SiteMsgRoleService(BasicRepository rp public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs index a329ad0e..3e91fcaf 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs @@ -4,6 +4,7 @@ using NetAdmin.Domain.Dto.Sys.SiteMsg; using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; using NetAdmin.Domain.Dto.Sys.User; using NetAdmin.Domain.Enums.Sys; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -170,11 +171,7 @@ public sealed class SiteMsgService(BasicRepository rpo, Conte public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs index 7a3dffde..e308ec43 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -88,7 +89,7 @@ public sealed class SiteMsgUserService(BasicRepository rp .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -98,11 +99,7 @@ public sealed class SiteMsgUserService(BasicRepository rp public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs index dde4a459..44a2f2a1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs @@ -2,6 +2,7 @@ using NetAdmin.Domain.Contexts; using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.Dic.Content; using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserRoleService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserRoleService.cs index 5aaf7bc4..2afd32c4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserRoleService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserRoleService.cs @@ -1,5 +1,6 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.UserRole; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -88,7 +89,7 @@ public sealed class UserRoleService(BasicRepository rpo) // .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -98,11 +99,7 @@ public sealed class UserRoleService(BasicRepository rpo) // public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index 84c87123..e06f991d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -5,6 +5,7 @@ using NetAdmin.Domain.Dto.Sys.User; using NetAdmin.Domain.Dto.Sys.UserProfile; using NetAdmin.Domain.Dto.Sys.VerifyCode; using NetAdmin.Domain.Events.Sys; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -514,8 +515,8 @@ public sealed class UserService( ret = ret.OrderByPropertyNameIf(req.Prop?.Length > 0, req.Prop, req.Order == Orders.Ascending); - if (!req.Prop?.Equals(nameof(req.Filter.CreatedTime), StringComparison.OrdinalIgnoreCase) ?? true) { - ret = ret.OrderByDescending(a => a.CreatedTime); + if (!req.Prop?.Equals(nameof(req.Filter.Id), StringComparison.OrdinalIgnoreCase) ?? true) { + ret = ret.OrderByDescending(a => a.Id); } return ret; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs index e05500f3..c0ba3338 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs @@ -2,6 +2,7 @@ using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.Dto.Sys.VerifyCode; using NetAdmin.Domain.Enums.Sys; using NetAdmin.Domain.Events.Sys; +using NetAdmin.Domain.Extensions; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -98,7 +99,7 @@ public sealed class VerifyCodeService(BasicRepository rpo, .Page(req.Page, req.PageSize) .WithNoLockNoWait() .Count(out var total) - .ToListAsync(req.GetToListExp() ?? (a => a)) + .ToListAsync(req) .ConfigureAwait(false); return new PagedQueryRsp(req.Page, req.PageSize, total, list.Adapt>()); @@ -108,11 +109,7 @@ public sealed class VerifyCodeService(BasicRepository rpo, public async Task> QueryAsync(QueryReq req) { req.ThrowIfInvalid(); - var ret = await QueryInternal(req) - .WithNoLockNoWait() - .Take(req.Count) - .ToListAsync(req.GetToListExp() ?? (a => a)) - .ConfigureAwait(false); + var ret = await QueryInternal(req).WithNoLockNoWait().Take(req.Count).ToListAsync(req).ConfigureAwait(false); return ret.Adapt>(); } diff --git a/src/frontend/admin/src/App.vue b/src/frontend/admin/src/App.vue index e6525660..3d2251f3 100644 --- a/src/frontend/admin/src/App.vue +++ b/src/frontend/admin/src/App.vue @@ -8,6 +8,7 @@