CrazyIter_Bin 2 tahun lalu
induk
melakukan
a27bc22b27

+ 6 - 12
TEAMModelOS.SDK/Models/Cosmos/OpenEntity/OVolume.cs

@@ -7,8 +7,10 @@ using System.Threading.Tasks;
 
 namespace TEAMModelOS.SDK.Models
 {
-    public class OVolume: CosmosEntity
+    public class OVolume
     {
+        public string id { get; set; }
+        public string code { get; set; }
         /// <summary>
         /// 学段
         /// </summary>
@@ -30,11 +32,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public string semesterId { get; set; }
 
-        /// <summary>
-        /// 状态
-        /// </summary>
-
-        public int status { get; set; } = 1;
+       
 
         /// <summary>
         /// 册别name
@@ -47,13 +45,9 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         // [Required(ErrorMessage = "school 必须设置")]
         public string school { get; set; }
-        /// <summary>
-        /// school|private
-        /// </summary>
-        [Required(ErrorMessage = "scope 必须设置")]
-        public string scope { get; set; }
+       
         public List<string> syllabusIds { get; set; } = new List<string>();
         public int order { get; set; }
-        public long createTime { get; set; }
+        
     }
 }

+ 14 - 8
TEAMModelOS/Controllers/OpenApi/OpenApiService.cs

@@ -957,15 +957,15 @@ namespace TEAMModelOS.Controllers
         /// <param name="_dingDing"></param>
         /// <param name="json"></param>
         /// <returns></returns>
-        public static async Task<ResponseData<List<Knowledge>>> GetKnowledges(AzureCosmosFactory _azureCosmos, DingDing _dingDing, string bizId, string school, JsonElement json) 
+        public static async Task<ResponseData<dynamic>> GetKnowledges(AzureCosmosFactory _azureCosmos, DingDing _dingDing, string bizId, string school, JsonElement json) 
         {
             try
             {
-                ResponseData<List<Knowledge>> responseData = new();
+                ResponseData<dynamic> responseData = new();
                 var client = _azureCosmos.GetCosmosClient();
 
                 json.TryGetProperty("periodId", out JsonElement periodId);
-                if (!json.TryGetProperty("subjectId", out JsonElement subjectId)) return new ResponseData<List<Knowledge>>() { code = RespondCode.ParamsError, msg = "参数错误" };
+                if (!json.TryGetProperty("subjectId", out JsonElement subjectId)) return new ResponseData<dynamic>() { code = RespondCode.ParamsError, msg = "参数错误" };
                 //if (!json.TryGetProperty("school_code", out JsonElement school_code)) return new ResponseData<List<Knowledge>>() { code = RespondCode.ParamsError, msg = "参数错误" };
                 string code = $"Knowledge-{school}-{subjectId}";
                 StringBuilder sql = new($"select value(c) from c");
@@ -973,23 +973,29 @@ namespace TEAMModelOS.Controllers
                 {
                     sql.Append($" where c.periodId = '{periodId}'");
                 }
-                List<Knowledge> knowledges = new();
+                List<dynamic> knowledges = new();
 
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<Knowledge>(queryText: sql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
                 {
-                    knowledges.Add(item);
+                    knowledges.Add(new {  item.periodId,  item.subjectId,  item.points,  item.blocks, item.id });
                 }
-                if (knowledges.Count > 0)
+
+               
+                if (knowledges.Any())
+                {
+                    var  data  = knowledges.Select(x => new {  });
                     responseData = new() { code = RespondCode.Ok, msg = "成功", data = knowledges };
+                }
                 else
+                {
                     responseData = new() { code = RespondCode.NotFound, msg = "未找到相关" };
-
+                }
                 return responseData;
             }
             catch (Exception ex)
             {
                 await _dingDing.SendBotMsg($"OpenApi,{Environment.GetEnvironmentVariable("Option:Location")} OpenApiService/GetKnowledges()  参数:bizId:{bizId},school:{school},参数json:{json.ToJsonString()} \n  {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
-                return new ResponseData<List<Knowledge>>() { code = RespondCode.Error, msg = "服务器错误!" };
+                return new ResponseData<dynamic>() { code = RespondCode.Error, msg = "服务器错误!" };
             }
         }