修改SQLHelperParametric，新增 order by 功能

TEAMModelOS.SDK/Module/AzureCosmosDBV3/SQLHelperParametric.cs

@@ -42,9 +42,15 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
                 bool pageBool = false;
                 GetPageNum(dict, ref offsetNum, ref limitNum, ref pageBool);
 
-                if (dict.TryGetValue("OrderBy", out object GroupBy))
+
+                // 处理OrderBy
+                if (dict.TryGetValue("OrderBy", out object OrderBy))
                 {
                     dict.Remove("OrderBy");
+                }
+                if (dict.TryGetValue("OrderByDESC", out object OrderByDESC))
+                {
+                    dict.Remove("OrderByDESC");
                 };
 
                 //处理顺序
@@ -176,10 +182,14 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
 
                 sql.Append(" where 1=1 ").Append(WhereString);
 
-                if (GroupBy != null)
+                if (OrderBy != null)
                 {
-                    sql.Append(" Order By c." + GroupBy.ToString());
+                    sql.Append(" Order By c." + OrderBy.ToString());
                 }
+                else if (OrderByDESC != null) {
+                    sql.Append(" Order By c." + OrderByDESC.ToString() + " DESC " );
+                }
+
                 if (pageBool)
                 {
                     sql.Append(" OFFSET " + offsetNum + " LIMIT " + limitNum);

TEAMModelOS/Controllers/Core/CommonController.cs

@@ -39,55 +39,57 @@ namespace TEAMModelOS.Controllers.Syllabus
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("DataDefault")]
-        public BaseJosnRPCResponse DataDefault(JosnRPCRequest<bool> request)
+        public async Task<BaseJosnRPCResponse> DataDefaultAsync(JosnRPCRequest<bool> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            //JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             string contentRootPath = webHostEnvironment.ContentRootPath;
-            string data = getJson(contentRootPath, "/JsonFile/Core/BaseDataDefault.json");
-            JArray parsedJson = JArray.Parse(data);
-            if (!request.@params)
-            {
-                List<JObject> jsonElements = new List<JObject>();
-                foreach (JObject element in parsedJson)
-                {
-                    if (element.TryGetValue("lang", out JToken json))
-                    {
-                        if (json.ToString().Equals(request.lang))
-                        {
-                            jsonElements.Add(element);
-                        }
-                    }
-                }
-               
-                return builder.Data(jsonElements).build();
-            }
-            else
-            {
-                return builder.Data(parsedJson).build();
-            }
-
-
-
-            //JsonDocument document = await GetJson(contentRootPath, "/JsonFile/Core/BaseDataDefault.json");
+            //string data = getJson(contentRootPath, "/JsonFile/Core/BaseDataDefault.json");
+            //JArray parsedJson = JArray.Parse(data);
             //if (!request.@params)
             //{
-            //    List<JsonElement> jsonElements = new List<JsonElement>();
-            //    foreach (JsonElement element in document.RootElement.EnumerateArray())
+            //    List<JObject> jsonElements = new List<JObject>();
+            //    foreach (JObject element in parsedJson)
             //    {
-            //        if (element.TryGetProperty("lang", out JsonElement json))
+            //        if (element.TryGetValue("lang", out JToken json))
             //        {
-            //            if (json.GetString().Equals(request.lang))
+            //            if (json.ToString().Equals(request.lang))
             //            {
             //                jsonElements.Add(element);
             //            }
             //        }
             //    }
+
             //    return builder.Data(jsonElements).build();
             //}
             //else
             //{
-            //    return builder.Data(document.RootElement).build();
+            //    return builder.Data(parsedJson).build();
             //}
+
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+
+            JsonDocument document = await GetJson(contentRootPath, "/JsonFile/Core/BaseDataDefault.json");
+            if (!request.@params)
+            {
+                List<JsonElement> jsonElements = new List<JsonElement>();
+                foreach (JsonElement element in document.RootElement.EnumerateArray())
+                {
+                    if (element.TryGetProperty("lang", out JsonElement json))
+                    {
+                        if (json.GetString().Equals(request.lang))
+                        {
+                            jsonElements.Add(element);
+                        }
+                    }
+                }
+                //return JsonDocument.Parse(jsonElements.ToApiJson()).RootElement;
+                return builder.Data(JsonDocument.Parse(jsonElements.ToApiJson()).RootElement).build();
+            }
+            else
+            {
+                //return document.RootElement;
+                return builder.Data(document.RootElement).build();
+            }
         }