1、知识点Knowledge ，分区键partitionKey变为scopeCode 如果是教师私人知识点为醍摩豆id 否则为学校编码 。不再传scope TEAMModelId 字段

2、资源文件 SyllabusResource 分区键 type 变为scopeCode 不再传 schoolCode
3、SyllabusVolume 册别 分区键partitionKey变为scopeCode

TEAMModelOS.Service/Models/Syllabus/Knowledge.cs

@@ -36,11 +36,11 @@ namespace TEAMModelOS.Service.Models.Syllabus
         public string subjectCode { get; set; }
 
         /// <summary>
-        /// 学校编码 如果是教师私人知识点 则为 personal(写死) 否则为学校编码 
+        /// 学校编码 如果是教师私人知识点为醍摩豆id 否则为学校编码 
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
         [PartitionKey]
-        public string partitionKey { get; set; }
+        public string scopeCode { get; set; }
 
 
 
@@ -78,18 +78,16 @@ namespace TEAMModelOS.Service.Models.Syllabus
         ///[Required(ErrorMessage = "{0} 必须填写")]
         public string period { get; set; }
 
-        /// <summary>
-        ///  school personal 学校或者个人
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string scope { get; set; }
+        ///// <summary>
+        /////  school personal 学校或者个人
+        ///// </summary>
+        //[Required(ErrorMessage = "{0} 必须填写")]
+        //public string scope { get; set; }
 
         /// <summary>
         ///  醍摩豆id
         /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        [JsonPropertyName("TEAMModelId")]
-        [JsonProperty("TEAMModelId")]
-        public string TEAMModelId { get; set; }
+        //[Required(ErrorMessage = "{0} 必须填写")]
+        //public string TEAMModelId { get; set; }
     }
 }

TEAMModelOS.Service/Models/Syllabus/SyllabusResource.cs

@@ -16,12 +16,11 @@ namespace TEAMModelOS.Service.Models.Syllabus
         public string id { get; set; }
 
         /// <summary>
-        /// 上传者醍摩豆id
+        /// 学校编码 如果是教师私人知识点为醍摩豆id 否则为学校编码 
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
-        [JsonPropertyName("TEAMModelId")]
-        [JsonProperty("TEAMModelId")]
-        public string TEAMModelId { get; set; }
+        [PartitionKey]
+        public string scopeCode { get; set; }
 
         /// <summary>
         /// 文件名字
@@ -45,7 +44,6 @@ namespace TEAMModelOS.Service.Models.Syllabus
         /// 文件类型
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
-        [PartitionKey]
         public string type { get; set; }
 
         /// <summary>
@@ -88,10 +86,6 @@ namespace TEAMModelOS.Service.Models.Syllabus
         [Required(ErrorMessage = "{0} 必须填写")]
         public string sha1Code { get; set; }
 
-        /// <summary>
-        /// 学校编码
-        /// </summary>
-        public string schoolCode { get; set; }
 
         /// <summary>
         /// 关联知识点的id数组

TEAMModelOS.Service/Models/Syllabus/SyllabusVolume.cs

@@ -1,4 +1,4 @@
-using System;
+ using System;
 using System.Collections.Generic;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
@@ -25,7 +25,7 @@ namespace TEAMModelOS.Service.Models.Syllabus
         /// </summary>
         [PartitionKey]
         [Required(ErrorMessage = "{0} 必须填写")]
-        public string schoolCode { get; set; }
+        public string scopeCode { get; set; }
         public string periodCode { get; set; }
         public string subjectCode { get; set; }
         public string gradeCode { get; set; }

TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -250,15 +250,14 @@ namespace TEAMModelOS.Controllers.Syllabus
                 {
                     if (item.id == null)
                     {
-                        if (item.scope == "personal")
-                        {
-                            item.id = item.partitionKey + "-" + item.TEAMModelId + "-" + item.knowledgeId.Replace("-", "");
-                        }
-                        else {
-                            item.id = item.partitionKey + "-" + item.subjectCode + "-" + item.knowledgeId.Replace("-", "");
-                        }
-
-                        item.id = ShaHashHelper.GetSHA1(item.id);
+                        //if (item.scope == "personal")
+                        //{
+                        //    item.id = item.partitionKey + "-" + item.TEAMModelId + "-" + item.knowledgeId.Replace("-", "");
+                        //}
+                        //else {
+                        //    item.id = item.partitionKey + "-" + item.subjectCode + "-" + item.knowledgeId.Replace("-", "");
+                        //}
+                        item.id = Guid.NewGuid().ToString();
                     }
                     if (item.type == 1 && item.points.Count > 0) {
                         List<string> vs = item.points;

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -47,7 +47,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                 if (request.@params.type == 0)
                 {
                     List<SyllabusVolume> volumesFind = await azureCosmosDBRepository.FindByDict<SyllabusVolume>(new Dictionary<string, object>() {
-                        { "schoolCode",request.@params.schoolCode},{ "periodCode", request.@params.periodCode},
+                        { "scopeCode",request.@params.scopeCode},{ "periodCode", request.@params.periodCode},
                         { "subjectCode", request.@params.subjectCode},{ "gradeCode", request.@params.gradeCode},
                         { "semesterCode",request.@params.semesterCode},{ "volumeName",request.@params.volumeName}  ,
                         { "status",1} ,{ "type",0} });
@@ -56,14 +56,14 @@ namespace TEAMModelOS.Controllers.Syllabus
                         throw new BizException("已存在！", ResponseCode.DATA_EXIST);
                     }
                     ///校本课纲
-                    string key = request.@params.schoolCode + IdWorker.getInstance().NextId();
+                    string key = request.@params.scopeCode + IdWorker.getInstance().NextId();
                     request.@params.id = key;
                     request.@params.volumeCode = key;
                 }
                 else if (request.@params.type == 1)
                 {
                     List<SyllabusVolume> volumesFind = await azureCosmosDBRepository.FindByDict<SyllabusVolume>(new Dictionary<string, object>() {
-                        { "schoolCode",request.@params.schoolCode},{ "periodCode", request.@params.periodCode},
+                        { "schoolCode",request.@params.scopeCode},{ "periodCode", request.@params.periodCode},
                         { "subjectCode", request.@params.subjectCode},{ "gradeCode", request.@params.gradeCode},
                         { "semesterCode",request.@params.semesterCode},{ "volumeName",request.@params.volumeName},
                         { "TEAMModelId",request.@params.TEAMModelId}, { "status",1} ,{ "type",1} });
@@ -80,7 +80,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                 {
                     ///系统课纲
                     string key = "system" + IdWorker.getInstance().NextId();
-                    request.@params.schoolCode = "system";
+                    request.@params.scopeCode = "system";
                     request.@params.id = key;
                     request.@params.volumeCode = key;
                 }
@@ -89,7 +89,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                 if (request.@params.type == 0)
                 {
                     List<SyllabusVolume> volumesFind = await azureCosmosDBRepository.FindByDict<SyllabusVolume>(new Dictionary<string, object>() {
-                    { "schoolCode",request.@params.schoolCode},{ "periodCode", request.@params.periodCode},
+                    { "schoolCode",request.@params.scopeCode},{ "periodCode", request.@params.periodCode},
                         { "subjectCode", request.@params.subjectCode},{ "gradeCode", request.@params.gradeCode},
                         { "semesterCode",request.@params.semesterCode},{ "volumeName",request.@params.volumeName}  ,
                         { "status",1} ,{ "type",0} });
@@ -103,7 +103,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                 else if (request.@params.type == 1)
                 {
                     List<SyllabusVolume> volumesFind = await azureCosmosDBRepository.FindByDict<SyllabusVolume>(new Dictionary<string, object>() {
-                        { "schoolCode",request.@params.schoolCode},{ "periodCode", request.@params.periodCode},
+                        { "schoolCode",request.@params.scopeCode},{ "periodCode", request.@params.periodCode},
                         { "subjectCode", request.@params.subjectCode},{ "gradeCode", request.@params.gradeCode},
                         { "semesterCode",request.@params.semesterCode},{ "volumeName",request.@params.volumeName},
                         { "TEAMModelId",request.@params.TEAMModelId}, { "status",1} ,{ "type",1} });

TEAMModelOS/TEAMModelOS.csproj

@@ -34,6 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Controllers\Learn\" />
     <Folder Include="JsonFile\Subject\" />
     <Folder Include="wwwroot\" />
     <Folder Include="JwtRsaFile\" />