Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelOS.Service/Models/Core/ClassRoomStudent.cs

@@ -7,7 +7,7 @@ using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 
 namespace TEAMModelOS.Service.Models.Core
 {
-    [CosmosDB(RU = 400, Name = "CoreClassroomStudent")]
+    [CosmosDB(RU = 400, Name = "CoreClassroomStudent",Cache = true)]
     public class ClassroomStudent:ID
     {
         [Required(ErrorMessage = "{0} 必须填写")]

TEAMModelOS.Service/Models/Courses/Course.cs

@@ -15,14 +15,16 @@ namespace TEAMModelOS.Service.Models.Courses
     [CosmosDB(RU = 400, Name = "Course")]
     public class Course : ID
     {
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string id { get; set; }
+
         /// <summary>
         /// 学校编码 如果是教师私人知识点 则为 personal(写死) 否则为学校编码 
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
         [PartitionKey]
         public string scopeCode { get; set; }
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string id { get; set; }
+  
 
         //[Required(ErrorMessage = "{0} 必须填写")]
         //public string TEAMModelId { get; set; }

TEAMModelOS.Service/Models/Syllabus/Knowledge.cs

@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 
 namespace TEAMModelOS.Service.Models.Syllabus
 {
-    [CosmosDB(RU = 400, Name = "Knowledge")]
+    [CosmosDB(RU = 400, Name = "Knowledge", Cache = true)]
     public class Knowledge: ID
     {
         public string id { get; set; }

TEAMModelOS.Service/Models/Syllabus/SyllabusResource.cs

@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 
 namespace TEAMModelOS.Service.Models.Syllabus
 {
-    [CosmosDB(RU = 400, Name = "SyllabusResource")]
+    [CosmosDB(RU = 400, Name = "SyllabusResource",Cache = true)]
     public class SyllabusResource : ID
     {
 

TEAMModelOS/Controllers/Core/ClassroomStudentController.cs

@@ -112,6 +112,18 @@ namespace TEAMModelOS.Controllers.Core
             return builder.build();
         }
 
+        [HttpPost("FindClassroomById")]
+        public async Task<BaseJosnRPCResponse> FindClassroomById(JosnRPCRequest<List<string>> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            if (ValidateHelper.IsValid(request.@params))
+            {
+                List<ClassroomStudent> sc = await _cosmos.FindByIds<ClassroomStudent>(request.@params);
+                builder.Data(sc).Extend(new Dictionary<string, object> { { "count", sc.Count } });
+                //select value(c) from c join A0  in c.studentId where 1=1  and A0 =  @studentId0 
+            }
+            return builder.build();
+        }
 
         [HttpPost("FindStudents")]
         public async Task<BaseJosnRPCResponse> FindStudents(JosnRPCRequest<string> studentId)

TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -234,6 +234,31 @@ namespace TEAMModelOS.Controllers.Syllabus
             return builder.Data(data.OrderBy(m => m.order)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
 
+
+        /// <summary>
+        /// 获取知识根据id 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("FindKnowledgeById")]
+        public async Task<BaseJosnRPCResponse> FindKnowledgeById(JosnRPCRequest<List<string>> request)
+        {
+            // request.@params.TryAdd("PartitionKey", request.lang);
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            List<Knowledge> data = new List<Knowledge>();
+            if (request.@params.IsNotEmpty())
+            {
+                data = await _cosmos.FindByIds<Knowledge>(request.@params);
+            }
+            else
+            {
+                builder.Error(false, ResponseCode.PARAMS_ERROR, "参数异常");
+            }
+            return builder.Data(data.OrderBy(m => m.order)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+        }
+
+
+
         /// <summary>
         /// 保存或更新知识
         /// </summary>

TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -86,6 +86,32 @@ namespace TEAMModelOS.Controllers.Syllabus
         }
 
 
+        /// <summary>
+        /// 获取SyllabusResource
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("FindSyllabusResourceById")]
+        public async Task<BaseJosnRPCResponse> FindSyllabusResourceById(JosnRPCRequest<List<string>> request)
+        {
+            // request.@params.TryAdd("PartitionKey", request.lang);
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            if (request.@params != null)
+            {
+                List<SyllabusResource> data = new List<SyllabusResource>();
+                data = await _cosmos.FindByIds<SyllabusResource>(request.@params);
+                if (data.IsNotEmpty())
+                {
+                    return builder.Data(data.OrderBy(m => m.createTime)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+
+                }
+                else return builder.Error(false, ResponseCode.NOT_FOUND, "资源未找到").build();
+
+            }
+            else return builder.Error(false, ResponseCode.PARAMS_ERROR, "参数为空").build();
+        }
+
+
         /// <summary>
         /// 删除 SyllabusResource
         /// </summary>

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -169,13 +169,13 @@ namespace TEAMModelOS.Controllers.Syllabus
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             List<SyllabusVolume> volumes ;
-            if (request.@params.TryGetValue("schoolCode", out _))
+            if (request.@params.TryGetValue("scopeCode", out _))
             {
                 volumes = await azureCosmosDBRepository.FindByDict<SyllabusVolume>(request.@params);
             }
             else
             {
-                throw new BizException("schoolCode is  null!");
+                throw new BizException("scopeCode is  null!");
             }
             return builder.Data(volumes).build();
         }