update

TEAMModelOS.SDK/Models/Cosmos/Common/ArtEvaluation.cs

@@ -90,20 +90,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         public string quotaname { get; set; }
         public long start { get; set; }
         public long end { get; set; }
-        public string progress { get => progress; set {
-                long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-                if (start > now)
-                {
-                    progress = "pending";
-                }
-                else if (now > start && now < end)
-                {
-                    progress = "going";
-                }
-                else {
-                    progress = "finish";
-                }    
-            }}
+        public string progress { get; set; }              
         public List<string> path { get; set; } = new List<string>();
         public List<Acs> task { get; set; } = new List<Acs>();
     }

TEAMModelOS/Controllers/Client/AClassONEController.cs

@@ -310,9 +310,6 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("find-children-activity")]
-#if !DEBUG
-        [Authorize(Roles = "AClassONE")]
-#endif
         public async Task<IActionResult> getActivity(JsonElement request) {
             try {
                 //if (!request.TryGetProperty("studentId", out JsonElement stuId)) return BadRequest();
@@ -346,25 +343,30 @@ namespace TEAMModelOS.Controllers
                 }
 
                 List<ArtEvaluation> arts = new();
-                await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: stringBuilder.ToString(), continuationToken: token, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"Art-{code}") }))
-                {
-
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-                    {
-                        foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
-                        {
-                            arts.Add(obj.ToObject<ArtEvaluation>());
-                        }
-                    }
-                    if (iscontinuation)
-                    {
-                        continuationToken = item.GetContinuationToken();
-                        break;
-                    }
+                var result=  await client.GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<ArtEvaluation>(stringBuilder.ToString(), $"Art-{code}", token, 5);
+                if (result.list.IsNotEmpty()) {
+                    arts = result.list;
+                    token = result.continuationToken;
                 }
-                arts = arts.Where((x, i) => arts.FindIndex(z => z.id == x.id) == i).ToList();
-                return Ok(new { arts });
+                //await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: stringBuilder.ToString(), continuationToken: token, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"Art-{code}") }))
+                //{
+
+                //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                //    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
+                //    {
+                //        foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+                //        {
+                //            arts.Add(obj.ToObject<ArtEvaluation>());
+                //        }
+                //    }
+                //    if (iscontinuation)
+                //    {
+                //        continuationToken = item.GetContinuationToken();
+                //        break;
+                //    }
+                //}
+               // arts = arts.Where((x, i) => arts.FindIndex(z => z.id == x.id) == i).ToList();
+                return Ok(new { arts ,token});
             } catch (Exception e) {
                 await _dingDing.SendBotMsg($"OS，{_option.Location}，art/find-children-activity()\n{e.Message}\n{e.StackTrace}\n", GroupNames.醍摩豆服務運維群組);
                 return BadRequest("500错误");