Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS.SDK/DI/DingDing/DingDing.cs

@@ -100,7 +100,7 @@ namespace TEAMModelOS.SDK.DI
         成都开发測試群組,
         [Description("1a316ce4edc2db88231d40d80072b00f2751d7d9e2e5871c5dc061885b01c48d,SECff60201ac9b219943b9f8fc397fda1a617d0cbc140850f5ea9cb4f131479d39a")]
         醍摩豆服務運維群組,
-        [Description("a83ea4ead63bf1b4e087723b3a7ccdf7f4c96708a22493f489bb928999f50d87,SECff60201ac9b219943b9f8fc397fda1a617d0cbc140850f5ea9cb4f131479d39a")]
+        [Description("a83ea4ead63bf1b4e087723b3a7ccdf7f4c96708a22493f489bb928999f50d87")]
         AI智慧學校申請通知群
 
     }

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

@@ -13,9 +13,9 @@ namespace TEAMModelOS.SDK.Models
         public string url { get; set; }
         public long  time { get; set; }
         public long  size { get; set; }
-        public string periodId { get; set; }
-        public string subjectId { get; set; }
-        public string gradeId { get; set; }
+        public string periodId { get; set; } = "";
+        public List<string> subjectId { get; set; } = new List<string>() { "" };
+        public List<string> gradeId { get; set; } = new List<string>() { "" };
         /// <summary>
         /// audio 音频，video 视频 ，doc文档，image图片，other 其他，res教材，thum缩略图
         /// </summary>

TEAMModelOS/Controllers/Core/BlobController.cs

@@ -530,9 +530,9 @@ namespace TEAMModelOS.Controllers.Core
                 request.TryGetProperty("name", out JsonElement name);
                 request.TryGetProperty("type", out JsonElement type);
                 request.TryGetProperty("scope", out JsonElement scope);
-                request.TryGetProperty("period", out JsonElement period);
+                request.TryGetProperty("periodId", out JsonElement periodId);
                 var client = _azureCosmos.GetCosmosClient();
-                var queryslt = $"SELECT  value(c) FROM c WHERE c.type='{type}' and  c.period='{period}'";
+                var queryslt = $"SELECT  value(c) FROM c WHERE c.type='{type}' and  c.periodId='{periodId}'";
                 if (scope.GetString().Equals("school"))
                 {
                     await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<Bloblog>(queryText: queryslt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Bloblog-{name}") }))
@@ -577,8 +577,8 @@ namespace TEAMModelOS.Controllers.Core
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [HttpPost("bloblog-upsert")]
-        public async Task<ActionResult> BloblogUpsert(JsonElement request) {
+        [HttpPost("bloblog-opt")]
+        public async Task<ActionResult> BloblogOpt(JsonElement request) {
 
             try
             {
@@ -636,9 +636,9 @@ namespace TEAMModelOS.Controllers.Core
                             url = url,
                             time = now,
                             size = size != null && size.HasValue ? size.Value : 0,
-                            periodId =  periodId.ValueKind.Equals(JsonValueKind.String)?$"{periodId}":null,
-                            subjectId= gradeId.ValueKind.Equals(JsonValueKind.String) ? $"{subjectId}" : null,
-                            gradeId = gradeId.ValueKind.Equals(JsonValueKind.String) ? $"{gradeId}" : null,
+                            periodId =  periodId.ValueKind.Equals(JsonValueKind.String)?$"{periodId}":"",
+                            subjectId= gradeId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { ""},
+                            gradeId = gradeId.ValueKind.Equals(JsonValueKind.Array) ? gradeId.ToObject<List<string>>() : new List<string> { "" },
                             type = u
                         };
                         if (scope.GetString().Equals("school"))