zhouj1203@hotmail.com 1 年之前
父節點
當前提交
16be86d038

+ 2 - 2
TEAMModelBI/Controllers/BIStudent/StudentController.cs

@@ -106,7 +106,7 @@ namespace TEAMModelBI.Controllers.BIStudent
 
                 if (correctStus.Count > 0)
                 {
-                    foreach (var correct in correctStus)
+                    /*foreach (var correct in correctStus)
                     {
                         StuActivity stuActivity = await cosmosClient.GetContainer("TEAMModelOS", "Student").ReadItemAsync<StuActivity>(correct.id, new PartitionKey(correct.code));
                         if (stuActivity != null)
@@ -115,7 +115,7 @@ namespace TEAMModelBI.Controllers.BIStudent
 
                             await cosmosClient.GetContainer("TEAMModelOS", "Student").ReplaceItemAsync<StuActivity>(stuActivity, stuActivity.id, new PartitionKey(stuActivity.code));
                         }
-                    }
+                    }*/
 
                     return Ok(new { state = 200, msg = "去重成功" });
                 }

+ 8 - 8
TEAMModelOS/Controllers/Common/ExamController.cs

@@ -1169,7 +1169,7 @@ namespace TEAMModelOS.Controllers
                     }
                     result.sum[newIndex] = result.studentScores[newIndex].Sum();
                     classResult = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(result, result.id, new PartitionKey($"{result.code}"));
-                    if (isAns)
+                    /*if (isAns)
                     {
                         if ($"{scope}".Equals(Constant.ScopeStudent))
                         {
@@ -1215,7 +1215,7 @@ namespace TEAMModelOS.Controllers
                             activity.taskStatus = 1;
                             await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<StuActivity>(activity, id.ToString(), new PartitionKey($"Activity-{userId}"));
                         }
-                    }
+                    }*/
                 }
                 //当作答班级数量与实际班级数量一致时才触发结算
                 var ansCount = info.subjects.Where(c => c.id.Equals(subjectId)).FirstOrDefault()?.classCount;
@@ -1366,7 +1366,7 @@ namespace TEAMModelOS.Controllers
                 }
 
                 ExamClassResult classResult = new ExamClassResult();
-                List<Task<ItemResponse<StuActivity>>> tasks = new List<Task<ItemResponse<StuActivity>>>();
+                //List<Task<ItemResponse<StuActivity>>> tasks = new List<Task<ItemResponse<StuActivity>>>();
                 //ExamInfo classResult = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(id.ToString(), new PartitionKey($"{code}"));
                 //ExamClassResult classResult = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamClassResult>(id.ToString(), new PartitionKey($"{code}"));
                 /*foreach (double index in ans) {
@@ -1383,7 +1383,7 @@ namespace TEAMModelOS.Controllers
                             result.studentScores[index][i] = ans[index_sc][i];
                         }
                         result.sum[index] = result.studentScores[index].Sum();
-                        bool flag = result.studentScores[index].Exists(r => r == -1);
+                        /*bool flag = result.studentScores[index].Exists(r => r == -1);
                         if (!flag)
                         {
                             if (s.type == 1)
@@ -1435,9 +1435,9 @@ namespace TEAMModelOS.Controllers
                                             tasks.Add(client.GetContainer(Constant.TEAMModelOS, "Student").ReplaceItemAsync(activity, activity.id, new PartitionKey($"{activity.code}")));
                                         }
                                     }
-                                    /*StuActivity activity = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(id.ToString(), new PartitionKey($"Activity-{result.scIds[index]}-{s.id}"));
+                                    StuActivity activity = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(id.ToString(), new PartitionKey($"Activity-{result.scIds[index]}-{s.id}"));
                                     activity.sStatus = 1;
-                                    await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(id.ToString(), new PartitionKey($"Activity-{result.scIds[index]}-{s.id}"));*/
+                                    await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(id.ToString(), new PartitionKey($"Activity-{result.scIds[index]}-{s.id}"));
 
                                 }
                                 catch (Exception ex)
@@ -1445,7 +1445,7 @@ namespace TEAMModelOS.Controllers
                                     await _dingDing.SendBotMsg($"{_option.Location}\n{ex.Message}\n{ex.StackTrace}\n\n,id:{id},code:{s.id},school:{result?.school}", GroupNames.醍摩豆服務運維群組);
                                 }
                             }
-                        }
+                        }*/
 
                         index_sc++;
                     }
@@ -1484,7 +1484,7 @@ namespace TEAMModelOS.Controllers
                         await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(exam, id.ToString(), new PartitionKey($"Exam-{code}"));
                     }
                     classResult = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(result, result.id, new PartitionKey($"{result.code}"));
-                    await Task.WhenAll(tasks);
+                    //await Task.WhenAll(tasks);
                 }
                 //检查所有成员是否完成打分
                 List<List<double>> ers = new List<List<double>>();

+ 4 - 4
TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -707,7 +707,7 @@ namespace TEAMModelOS.Controllers.Learn
                                             }
                                         }
                                         //TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO 写入方便教师查看的作答记录
-                                        try
+                                        /*try
                                         {
                                             StuActivity activity = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<StuActivity>($"{_id}", new PartitionKey($"Activity-{one.id}"));
                                             activity.taskStatus = taskStatus;
@@ -716,7 +716,7 @@ namespace TEAMModelOS.Controllers.Learn
                                         catch (CosmosException ex)
                                         {
                                            
-                                        }
+                                        }*/
                                         
                                         await StatisticsService.SendServiceBus( ($"{standard}", new List<string> { $"{one.id}" }, $"{school}", new List<string>() { StatisticsService.OfflineRecord },0)  , _configuration, _serviceBus, client);
                                         //string sql = $"select value(c) from c where c.workId='{_id}'";
@@ -802,7 +802,7 @@ namespace TEAMModelOS.Controllers.Learn
                                    
                                 }
                                 //TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO 写入方便教师查看的作答记录
-                                try
+                                /*try
                                 {
                                     if ($"{_scope}".Equals(Constant.ScopeStudent))
                                     {
@@ -826,7 +826,7 @@ namespace TEAMModelOS.Controllers.Learn
                                 catch (CosmosException ex)
                                 {
                                     taskStatus = -1;
-                                }
+                                }*/
                                 if (content.Exists(x => x.prime == true))
                                 {
                                     await StatisticsService.SendServiceBus(   ($"{standard}", new List<string> { $"{userid}" }, $"{school}", new List<string>() { StatisticsService.OfflineRecord }, 0 ), _configuration, _serviceBus, client);

+ 4 - 4
TEAMModelOS/Controllers/Teacher/TeacherCommonController.cs

@@ -390,18 +390,18 @@ namespace TEAMModelOS.Controllers
             var (id, name, pic, school) = HttpContext.GetAuthTokenInfo();
             List<StuActivity> datas = new List<StuActivity>();
             var queryc = $"SELECT value(c) from c where c.school = '{school}' and c.type='{_type}' ";
-            await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<StuActivity>(queryText: queryc, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Activity-{id}") }))
+           /* await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<StuActivity>(queryText: queryc, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Activity-{id}") }))
             {
                 datas.Add(item);
-                /*using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                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())
                     {
                         courses.Add(obj.ToObject<object>());
                     }
-                }*/
-            }
+                }
+            }*/
             //(List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis);
             return Ok(new { datas });
         }