CrazyIter_Bin 2 年之前
父節點
當前提交
5b26ad4b27

+ 5 - 1
TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -386,11 +386,15 @@ namespace TEAMModelOS.SDK.Models.Service
                     setting = JsonDocument.Parse(schoolSetting.Content).RootElement.Deserialize<SchoolSetting>();
                     if (setting.lessonSetting != null)
                     {
-                        if (setting.lessonSetting.openAutoClean != 0  && setting.lessonSetting.openAutoClean != 1)
+                        //两种状态都不属于,则默认未开启。
+                        if (setting.lessonSetting.openAutoClean != 0 && setting.lessonSetting.openAutoClean != 1)
                         {
                             setting.lessonSetting.openAutoClean = 0;
                             setting.lessonSetting.expireDays = Constant.school_lesson_expire;
                         }
+                        else { 
+                            //属于 要么开启1,要么关闭0
+                        }
                     }
                     else
                     {

+ 4 - 3
TEAMModelOS/Controllers/System/BlobController.cs

@@ -556,10 +556,11 @@ namespace TEAMModelOS.Controllers
                        
                     try
                     {
-                        var queryslt = $"SELECT  value(c) FROM c WHERE c.url='{url}'";
+                        QueryDefinition queryDefinition = new QueryDefinition("SELECT  value(c) FROM c WHERE c.url=@url");
+                        queryDefinition.WithParameter("@url", url);
                         if (scope.GetString().Equals("school"))
                         {
-                            await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<Bloblog>(queryText: queryslt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Bloblog-{name}") }))
+                            await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<Bloblog>(queryDefinition: queryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Bloblog-{name}") }))
                             {
                                 item.time = now;
                                 item.size = size != null && size.HasValue ? size.Value : 0;
@@ -573,7 +574,7 @@ namespace TEAMModelOS.Controllers
                         }
                         else if (scope.GetString().Equals("private"))
                         {
-                            await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<Bloblog>(queryText: queryslt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Bloblog-{name}") }))
+                            await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<Bloblog>(queryDefinition: queryDefinition, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Bloblog-{name}") }))
                             {
                                 item.time = now;
                                 item.size = size != null && size.HasValue ? size.Value : 0;

+ 13 - 3
TEAMModelOS/Controllers/XTest/TestController.cs

@@ -23,6 +23,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Json;
+using System.Security.Policy;
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
@@ -77,9 +78,9 @@ namespace TEAMModelOS.Controllers
         public async Task<IActionResult> CheckPjx(JsonElement json)
         {
 
-            BlobDownloadResult baseblobDownload = await _azureStorage.GetBlobContainerClient("0-public").GetBlobClient($"optlog/03827ee5-d498-4ce1-b36f-2aa7cf31fa61-Log-tabledd-update.json").DownloadContentAsync();
+            //BlobDownloadResult baseblobDownload = await _azureStorage.GetBlobContainerClient("0-public").GetBlobClient($"optlog/03827ee5-d498-4ce1-b36f-2aa7cf31fa61-Log-tabledd-update.json").DownloadContentAsync();
             //attendStatehttps://teammodeltest.blob.core.chinacloudapi.cn/0-public
-            string s = baseblobDownload.Content.ToString();
+            //string s = baseblobDownload.Content.ToString();
             //var areaId = json.GetProperty("areaId");
             //var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
             //List<ScTeacher> teachers = await table.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" }, { "areaId", $"{areaId}" } });
@@ -90,7 +91,16 @@ namespace TEAMModelOS.Controllers
             //    teacherTrains.Add(item);
             //}
             //var more=   teachers.Select(z => z.tmdid).Except(teacherTrains.Select(x => x.id));
-            return Ok();
+
+            QueryDefinition queryDefinition = new QueryDefinition($"SELECT  value(c) FROM c WHERE c.id=@id");
+            queryDefinition.WithParameter("@id", "1595321354");
+            List<Teacher> teachers = new List<Teacher>();
+            await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher)
+                .GetItemQueryIterator<Teacher>(queryDefinition: queryDefinition,requestOptions: new QueryRequestOptions { PartitionKey= new PartitionKey("Base") }))
+            {
+                teachers.Add(item);
+            }
+            return Ok(teachers);
         }