提交默认年级数据

TEAMModelOS.API/Controllers/Core/CommonController.cs

@@ -28,16 +28,16 @@ namespace TEAMModelOS.API.Controllers.Core
 
         }
         /// <summary>
-        /// bool =true 獲取全部 false 則從request.lang 篩選指定語言的，默認zh-CN
+        ///获取默认学科及默认年级等数据 bool =true 獲取全部 false 則從request.lang 篩選指定語言的，默認zh-CN
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [HttpPost("SubjectDefault")]
-        public async Task<BaseJosnRPCResponse> SubjectDefault(JosnRPCRequest<bool> request)
+        [HttpPost("DataDefault")]
+        public async Task<BaseJosnRPCResponse> DataDefault(JosnRPCRequest<bool> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             string contentRootPath = webHostEnvironment.ContentRootPath;
-            JsonDocument document = await GetJson(contentRootPath, "/JsonFile/Subject/SubjectDefault.json");
+            JsonDocument document = await GetJson(contentRootPath, "/JsonFile/Core/BaseDataDefault.json");
             if (!request.@params)
             {
                 List<JsonElement> jsonElements = new List<JsonElement>();
@@ -57,7 +57,7 @@ namespace TEAMModelOS.API.Controllers.Core
             {
                 return builder.Data(document.RootElement).build();
             }
-        }
+        } 
 
         public static async Task<JsonDocument> GetJson(string contentRootPath, string name)
         {

TEAMModelOS.API/Controllers/Syllabus/SyllabusController.cs

@@ -34,27 +34,20 @@ namespace TEAMModelOS.API.Controllers.Syllabus
             if (request.@params != null && request.@params.TryGetValue("Code", out _))
             {
                 List<School> schoolSystems = await azureCosmosDBRepository.FindByParams<School>(request.@params);
-                List<dynamic> plist = new List<dynamic>();
+                List<dynamic> period_list = new List<dynamic>();
                 if (schoolSystems.IsNotEmpty())
                 {
                     List<Period> periods = schoolSystems[0].period;
                     foreach (Period period in periods)
                     {
-                        List<dynamic> slist = new List<dynamic>();
+                        List<dynamic> subject_list = new List<dynamic>();
                         ///学科包含学期的数据
                         foreach (Subject subject in period.subjects)
                         {
-                            List<dynamic> mlist = new List<dynamic>();
-                            foreach (Semester semester in period.semesters)
-                            {
-                                dynamic sem = new { semester.semesterName, semester.semesterCode };
-                                mlist.Add(sem);
-                            }
-                            dynamic sub = new { semester = mlist, subject.subjectName, subject.subjectCode };
-                            slist.Add(sub);
+                           
                         }
                         dynamic per = new { subject = slist, period.periodName, period.periodCode };
-                        plist.Add(per);
+                        period_list.Add(per);
                     }
                 }
                 return builder.Data(plist).build();

TEAMModelOS/JsonFile/Subject/SubjectDefault.json

@@ -3,6 +3,68 @@
     "lang": "zh-CN",
     "name": "中国大陆",
     "alias": "简体中文",
+    "grades": [
+      {
+        "code": 1,
+        "name": "一年级",
+        "alias": "小学一年级"
+      },
+      {
+        "code": 2,
+        "name": "二年级",
+        "alias": "小学二年级"
+      },
+      {
+        "code": 3,
+        "name": "三年级",
+        "alias": "小学三年级"
+      },
+      {
+        "code": 4,
+        "name": "四年级",
+        "alias": "小学四年级"
+      },
+      {
+        "code": 5,
+        "name": "五年级",
+        "alias": "小学五年级"
+      },
+      {
+        "code": 6,
+        "name": "六年级",
+        "alias": "五四制初中一年级，六三制小学六年级"
+      },
+      {
+        "code": 7,
+        "name": "七年级",
+        "alias": "五四制初中二年级，六三制初中一年级"
+      },
+      {
+        "code": 8,
+        "name": "八年级",
+        "alias": "五四制初中三年级，六三制小学二年级"
+      },
+      {
+        "code": 9,
+        "name": "九年级",
+        "alias": "五四制初中四年级，六三制小学三年级"
+      },
+      {
+        "code": 10,
+        "name": "十年级",
+        "alias": "高中一年级"
+      },
+      {
+        "code": 11,
+        "name": "十一年级",
+        "alias": "高中二年级"
+      },
+      {
+        "code": 12,
+        "name": "十二年级",
+        "alias": "高中三年级"
+      }
+    ],
     "subjects": [
       {
         "code": "Subject_Chinese",

TEAMModelOS/TEAMModelOS.csproj

@@ -23,6 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="JsonFile\Subject\" />
     <Folder Include="wwwroot\" />
   </ItemGroup>