hhb 3 months ago
parent
commit
e7dd33a10d

+ 3 - 2
TEAMModelOS.Function/CosmosDBTriggers/TriggerArt.cs

@@ -15,6 +15,7 @@ using TEAMModelOS.SDK.Models.Cosmos;
 
 using TEAMModelOS.Function;
 using static TEAMModelOS.SDK.Models.Cosmos.Student.StudentAnalysis;
+using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.CosmosDBTriggers
 {
@@ -862,7 +863,7 @@ namespace TEAMModelOS.CosmosDBTriggers
             {
                 var response = await client.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(school, new PartitionKey($"Base"));
                 string subjectId = string.Empty;
-                List<Knowledge> knowledges = new();
+                List<KnowledgeTreeDto> knowledges = new();
                 List<(string name, List<string> kno)> blocks = new();
                 if (response.StatusCode == System.Net.HttpStatusCode.OK)
                 {
@@ -889,7 +890,7 @@ namespace TEAMModelOS.CosmosDBTriggers
 
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<Knowledge>(queryText: sql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
                     {
-                        knowledges.Add(item);
+                        knowledges.Add(KnowledgeService.KnowledgeTranslate(item));
                     }
                 }
                 foreach (var know in knowledges)

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

@@ -727,8 +727,8 @@ namespace TEAMModelOS.Controllers
             }
         }
         [ProducesDefaultResponseType]
-        [Authorize(Roles = "IES")]
-        [AuthToken(Roles = "teacher,admin")]
+        //[Authorize(Roles = "IES")]
+        //[AuthToken(Roles = "teacher,admin")]
         [HttpPost("analysis-area-art")]
         public async Task<IActionResult> FindAreaArt(JsonElement request)
         {
@@ -1936,7 +1936,7 @@ namespace TEAMModelOS.Controllers
             {
                 var response = await client.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(school, new PartitionKey($"Base"));
                 string subjectId = string.Empty;
-                List<Knowledge> knowledges = new();
+                List<KnowledgeTreeDto> knowledges = new();
                 List<(string name, List<string> kno)> blocks = new();
                 if (response.StatusCode==System.Net.HttpStatusCode.OK)
                 {
@@ -1963,7 +1963,7 @@ namespace TEAMModelOS.Controllers
 
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIteratorSql<Knowledge>(queryText: sql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
                     {
-                        knowledges.Add(item);
+                        knowledges.Add(KnowledgeService.KnowledgeTranslate(item));
                     }
                 }
                 foreach (var know in knowledges)

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

@@ -1680,7 +1680,7 @@ namespace TEAMModelOS.Controllers
                     builder.Append(studentId.GetString()).Append('/');
                     builder.Append("ans.json");
                     tasks.Add(_azureStorage.GetBlobContainerClient(code.ToString()).UploadFileByContainer(ans.ToJsonString(), "exam", builder.ToString(), false));
-                    result.studentAnswers[newIndex].Add(builder.ToString());
+                    result.studentAnswers[newIndex][0] = builder.ToString();
                     result.status[newIndex] = 0;
                     for (int i = 0; i < ans.Count; i++)
                     {