新增接口查询、新增、同步支持排序功能

src/platform/ZhonTai.Admin/Services/Api/ApiService.cs

@@ -47,6 +47,8 @@ public class ApiService : BaseService, IApiService, IDynamicApi
     {
         var data = await _apiRepository
             .WhereIf(key.NotNull(), a => a.Path.Contains(key) || a.Label.Contains(key))
+            .OrderBy(a => a.ParentId)
+            .OrderBy(a => a.Sort)
             .ToListAsync<ApiListOutput>();
 
         return data;
@@ -66,7 +68,8 @@ public class ApiService : BaseService, IApiService, IDynamicApi
         .WhereDynamicFilter(input.DynamicFilter)
         .WhereIf(key.NotNull(), a => a.Path.Contains(key) || a.Label.Contains(key))
         .Count(out var total)
-        .OrderByDescending(true, c => c.Id)
+        .OrderBy(a => a.ParentId)
+        .OrderBy(a => a.Sort)
         .Page(input.CurrentPage, input.PageSize)
         .ToListAsync();
 
@@ -102,6 +105,12 @@ public class ApiService : BaseService, IApiService, IDynamicApi
         }
         entity = Mapper.Map<ApiEntity>(input);
 
+        if (entity.Sort == 0)
+        {
+            var sort = await _apiRepository.Select.DisableGlobalFilter(FilterNames.Delete).Where(a => a.ParentId == input.ParentId).MaxAsync(a => a.Sort);
+            entity.Sort = sort + 1;
+        }
+
         await _apiRepository.InsertAsync(entity);
 
         return entity.Id;
@@ -223,13 +232,14 @@ public class ApiService : BaseService, IApiService, IDynamicApi
         #region 修改和禁用
 
         {
-            //api修改
+            //父级api修改
             ApiEntity a;
             List<string> labels;
             string label;
             string desc;
-            foreach (var api in parentApis)
+            for (int i = 0, len = parentApis.Count; i < len; i++)
             {
+                ApiSyncDto api = parentApis[i];
                 a = apis.Find(a => a.Path == api.Path);
                 if (a?.Id > 0)
                 {
@@ -239,6 +249,7 @@ public class ApiService : BaseService, IApiService, IDynamicApi
                     a.ParentId = 0;
                     a.Label = label;
                     a.Description = desc;
+                    a.Sort = i + 1;
                     a.Enabled = true;
                     a.IsDeleted = false;
                 }
@@ -246,14 +257,15 @@ public class ApiService : BaseService, IApiService, IDynamicApi
         }
 
         {
-            //api修改
+            //子级api修改
             ApiEntity a;
             ApiEntity pa;
             List<string> labels;
             string label;
             string desc;
-            foreach (var api in childApis)
+            for (int i = 0, len = childApis.Count; i < len; i++)
             {
+                ApiSyncDto api = childApis[i];
                 a = apis.Find(a => a.Path == api.Path);
                 pa = apis.Find(a => a.Path == api.ParentPath);
                 if (a?.Id > 0)
@@ -266,6 +278,7 @@ public class ApiService : BaseService, IApiService, IDynamicApi
                     a.Label = label;
                     a.Description = desc;
                     a.HttpMethods = api.HttpMethods;
+                    a.Sort = i + 1;
                     a.Enabled = true;
                     a.IsDeleted = false;
                 }
@@ -273,7 +286,7 @@ public class ApiService : BaseService, IApiService, IDynamicApi
         }
 
         {
-            //api禁用
+            //模块和api禁用
             var inputPaths = input.Apis.Select(a => a.Path).ToList();
             var disabledApis = (from a in apis where !inputPaths.Contains(a.Path) select a).ToList();
             if (disabledApis.Count > 0)
@@ -289,7 +302,7 @@ public class ApiService : BaseService, IApiService, IDynamicApi
 
         //批量更新
         await _apiRepository.UpdateDiy.DisableGlobalFilter(FilterNames.Delete).SetSource(apis)
-        .UpdateColumns(a => new { a.ParentId, a.Label, a.HttpMethods, a.Description, a.Enabled, a.IsDeleted, a.ModifiedTime })
+        .UpdateColumns(a => new { a.ParentId, a.Label, a.HttpMethods, a.Description, a.Sort, a.Enabled, a.IsDeleted, a.ModifiedTime })
         .ExecuteAffrowsAsync();
     }
 }

src/platform/ZhonTai.Admin/Services/Api/Dto/ApiAddInput.cs

@@ -30,6 +30,11 @@ public class ApiAddInput
     /// </summary>
     public string Description { get; set; }
 
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
     /// <summary>
     /// 启用
     /// </summary>

src/platform/ZhonTai.Admin/Services/Api/Dto/ApiListOutput.cs

@@ -37,6 +37,11 @@ public class ApiListOutput
     /// </summary>
     public string Description { get; set; }
 
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
     /// <summary>
     /// 启用
     /// </summary>

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -3477,6 +3477,11 @@
             说明
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Api.Dto.ApiAddInput.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Api.Dto.ApiAddInput.Enabled">
             <summary>
             启用
@@ -3517,6 +3522,11 @@
             说明
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Api.Dto.ApiListOutput.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Api.Dto.ApiListOutput.Enabled">
             <summary>
             启用