重构命名并添加排序功能

在 `AuthController.cs` 中修改了私有字段命名，确保一致性。新增 `SortOrder` 属性到 `Sys_SystemMenuPermission.cs` 和 `MenuLoadView.cs`，以支持排序功能。在 `SystemMenuPermissionRepository.cs` 中更新 SQL 查询和 LINQ 查询，以包含并按 `SortOrder` 排序。

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -38,11 +38,11 @@ namespace OASystem.API.Controllers
         private readonly IConfiguration _config;
         private readonly LoginRepository _loginRep;
         private readonly MessageRepository _message;
-        private readonly SystemMenuPermissionRepository _SystemMenuPermissionRepository;
+        private readonly SystemMenuPermissionRepository _sysMenuPermRep;
         private readonly MessageRepository _messageRep;
         private readonly IQiYeWeChatApiService _qiYeWeChatApiServic;
         private readonly IHubContext<ChatHub, IChatClient> _hubContext;
-        private readonly DeviceTokenRepository _deviceTokenRepository;
+        private readonly DeviceTokenRepository _deviceTokenRep;
 
         /// <summary>
         /// 
@@ -51,13 +51,13 @@ namespace OASystem.API.Controllers
         /// <param name="loginRep"></param>
         /// <param name="mapper"></param>
         /// <param name="message"></param>
-        /// <param name="systemMenuPermissionRepository"></param>
+        /// <param name="sysMenuPermRep"></param>
         /// <param name="qiYeWeChatApiService"></param>
         /// <param name="messageRep"></param>
         /// <param name="deviceRep"></param>
         /// <param name="hubContext"></param>
         public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper, MessageRepository message,
-            SystemMenuPermissionRepository systemMenuPermissionRepository, IQiYeWeChatApiService qiYeWeChatApiService, MessageRepository messageRep,
+            SystemMenuPermissionRepository sysMenuPermRep, IQiYeWeChatApiService qiYeWeChatApiService, MessageRepository messageRep,
             DeviceTokenRepository deviceRep,
             IHubContext<ChatHub, IChatClient> hubContext)
         {
@@ -65,10 +65,10 @@ namespace OASystem.API.Controllers
             _loginRep = loginRep;
             _mapper = mapper;
             _message = message;
-            _SystemMenuPermissionRepository = systemMenuPermissionRepository;
+            _sysMenuPermRep = sysMenuPermRep;
             _qiYeWeChatApiServic = qiYeWeChatApiService;
             _messageRep = messageRep;
-            _deviceTokenRepository = deviceRep;
+            _deviceTokenRep = deviceRep;
             _hubContext = hubContext;
         }
 
@@ -127,7 +127,7 @@ namespace OASystem.API.Controllers
                 uName = (userData.Data as UserLoginInfoView).CnName;
                 depName = (userData.Data as UserLoginInfoView).DepName;
                 role = (userData.Data as UserLoginInfoView).JobName;
-                authData = _SystemMenuPermissionRepository.QueryMenuLoad(uId, dto.PortType);
+                authData = _sysMenuPermRep.QueryMenuLoad(uId, dto.PortType);
                 unReadCount = await _messageRep.GetUnReadCount(uId);
                 announcementUnReadCount = await _messageRep.GetAnnouncementUnReadCount(uId);
             }
@@ -228,7 +228,7 @@ namespace OASystem.API.Controllers
                 uId = (userData.Data as UserLoginInfoView).UserId;
                 uName = (userData.Data as UserLoginInfoView).CnName;
                 role = (userData.Data as UserLoginInfoView).JobName;
-                authData = _SystemMenuPermissionRepository.MobileMenuLoad(uId, dto.PortType);
+                authData = _sysMenuPermRep.MobileMenuLoad(uId, dto.PortType);
                 unReadCount = await _messageRep.GetUnReadCount(uId);
                 announcementUnReadCount = await _messageRep.GetAnnouncementUnReadCount(uId);
             }
@@ -434,7 +434,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
         public async Task<IActionResult> SaveDeviceToken(SaveDeviceToken dto)
         {
-            var view = await _deviceTokenRepository.SaveToken(dto);
+            var view = await _deviceTokenRep.SaveToken(dto);
 
             if (view.Code == 0) return Ok(JsonView(true, "操作成功!"));
 
@@ -450,7 +450,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetDeviceToken(GetDeviceToken dto)
         {
-            var view = await _deviceTokenRepository.GetToken(dto.account);
+            var view = await _deviceTokenRep.GetToken(dto.account);
 
             if (view.Code == 0) return Ok(JsonView(true, "操作成功!", view.Data));
 

OASystem/OASystem.Domain/Entities/System/Sys_SystemMenuPermission.cs

@@ -55,5 +55,11 @@ namespace OASystem.Domain.Entities.System
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string Icon { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int SortOrder { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/System/MenuLoadView.cs

@@ -23,5 +23,6 @@ namespace OASystem.Domain.ViewModels.System
         public string AndroidUrl { get; set; }
         public string IosUrl { get; set; }
         public string icon { get; set; }
+        public int SortOrder { get; set; }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/SystemMenuPermissionRepository.cs

@@ -78,7 +78,7 @@ namespace OASystem.Infrastructure.Repositories.System
                 string sql = $@"
                      select a.UId,a.SmId,b.Id as Funid,b.FunctionName,b.FunctionCode,c.Id as modulid,
                       c.Name as modulName,c.STid,d.Id as pageid ,d.Name as PageName,d.SystemMenuCode,d.webUrl,d.AndroidUrl,d.icon,
-                      d.IosUrl
+                      d.IosUrl,d.SortOrder
                       from Sys_UserAuthority a inner join Sys_PageFunctionPermission b on a.FId = b.Id 
                       inner join Sys_SystemMenuPermission d on a.SmId = d.Id inner join Sys_SetData c on c.Id = d.Mid
                       where uid = {uid} and a.IsDel= 0  and b.IsDel = 0 
@@ -96,7 +96,7 @@ namespace OASystem.Infrastructure.Repositories.System
                     sql += $@" and d.IsEnable = 1 group by 
                       a.UId,a.SmId,b.Id,b.FunctionName,b.FunctionCode,c.Id,
                       c.Name,c.STid,d.Id,d.Name,d.SystemMenuCode,d.webUrl,d.AndroidUrl,d.icon,
-                      d.IosUrl";
+                      d.IosUrl,d.SortOrder";
                     DBData = _sqlSugar.SqlQueryable<MenuLoadView>(sql).ToList();
                 }
                 else if (PortType == 2)
@@ -104,7 +104,7 @@ namespace OASystem.Infrastructure.Repositories.System
                     sql += $@" and d.phoneIsEnable = 1 group by 
                       a.UId,a.SmId,b.Id,b.FunctionName,b.FunctionCode,c.Id,
                       c.Name,c.STid,d.Id,d.Name,d.SystemMenuCode,d.webUrl,d.AndroidUrl,d.icon,
-                      d.IosUrl ";
+                      d.IosUrl,d.SortOrder ";
                     DBData = _sqlSugar.SqlQueryable<MenuLoadView>(sql).ToList();
                 }
 
@@ -127,23 +127,15 @@ namespace OASystem.Infrastructure.Repositories.System
                             {
                                 it.Uid,
                                 it.SmId,
-                                //it.Funid,
-                                //it.FunctionName,
-                                //it.FunctionCode,
-                                //it.modulid,
-                                //it.modulName,
-                                //it.STid,
                                 it.pageid,
                                 it.PageName,
                                 PageAuth = item.Where(x => x.pageid == it.pageid).Select(x => new { x.Funid, x.FunctionCode, x.FunctionName }),
                                 it.SystemMenuCode,
                                 it.webUrl,
-                                //it.AndroidUrl,
-                                //it.IosUrl,
-                                //it.icon,
+                                it.SortOrder
                             });
 
-                            pageData = pageData.GroupBy(x => x.SmId).Select(y => y.First());
+                            pageData = pageData.GroupBy(x => x.SmId).Select(y => y.First()).OrderBy(x => x.SortOrder).ToList();
 
                             string Remark = setDataArr.Find(x => x.Id == item.FirstOrDefault()?.modulid)?.Remark ?? "";
                             
@@ -154,9 +146,7 @@ namespace OASystem.Infrastructure.Repositories.System
                                 pageList = pageData,
                                 Remark
                             });
-                           
                         }
-
                     }
                     else if (PortType == 2)
                     {