Procházet zdrojové kódy

提交修改的接口

CrazyIter před 5 roky
rodič
revize
e7137b4b23

+ 5 - 5
TEAMModelOS.API/Controllers/Core/SchoolSystemController.cs

@@ -12,11 +12,11 @@ namespace TEAMModelOS.API.Controllers.Core
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class SchoolSystemController : Controller
+    public class SchoolController : Controller
     {
 
         public IAzureCosmosDBRepository _cosmosrepository;
-        public SchoolSystemController(IAzureCosmosDBRepository cosmosDBRepository)
+        public SchoolController(IAzureCosmosDBRepository cosmosDBRepository)
         {
             _cosmosrepository = cosmosDBRepository;
         }
@@ -28,7 +28,7 @@ namespace TEAMModelOS.API.Controllers.Core
             School data = new School();
             if (request.@params.id != null)
             {
-               string result = await _cosmosrepository.ReplaceObject(request.@params, request.@params.id, request.@params.code);
+               string result = await _cosmosrepository.ReplaceObject(request.@params, request.@params.id, request.@params.schoolCode);
             }
             else
             {
@@ -37,8 +37,8 @@ namespace TEAMModelOS.API.Controllers.Core
             }
             return builder.Data(data).build();
         }
-        [HttpPost("FindSchoolSystem")]
-        public async Task<BaseJosnRPCResponse> GetSchoolInfo(JosnRPCRequest<Dictionary<string, object>> request)
+        [HttpPost("FindSchool")]
+        public async Task<BaseJosnRPCResponse> FindSchool(JosnRPCRequest<Dictionary<string, object>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             List<School> sc = await _cosmosrepository.FindByParams<School>(request.@params); 

+ 2 - 1
TEAMModelOS.API/Controllers/Syllabus/SyllabusController.cs

@@ -41,12 +41,13 @@ namespace TEAMModelOS.API.Controllers.Syllabus
                     foreach (Period period in periods)
                     {
                         List<dynamic> slist = 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.name, semester.code };
+                                dynamic sem = new { semester.semesterName, semester.semesterCode };
                                 mlist.Add(sem);
                             }
                             dynamic sub = new { semester = mlist, subject.subjectName, subject.subjectCode };

+ 32 - 0
TEAMModelOS/JsonFile/Core/lang.json

@@ -0,0 +1,32 @@
+[
+  {
+    "code": "zh-CN",
+    "name": "中国大陆",
+    "lang": "简体中文"
+  },
+  {
+    "code": "zh-HK",
+    "name": "中國香港",
+    "lang": "繁體中文"
+  },
+  {
+    "code": "zh-MO",
+    "name": "中國澳門",
+    "lang": "繁體中文"
+  },
+  {
+    "code": "zh-TW",
+    "name": "中國台灣",
+    "lang": "繁體中文"
+  },
+  {
+    "code": "en-US",
+    "name": "United States",
+    "lang": "English"
+  },
+  {
+    "code": "en-UK",
+    "name": "United Kingdom",
+    "lang": "English"
+  }
+]

+ 84 - 0
TEAMModelOS/JsonFile/Period/SubjectDefault.json

@@ -0,0 +1,84 @@
+[
+  {
+    "code": "zh-CN",
+    "name": "中国大陆",
+    "lang": "简体中文",
+    "subjects": [
+      {
+        "code": "Subject_Chinese",
+        "name": "语文"
+      },
+      {
+        "code": "Subject_Math",
+        "name": "数学"
+      },
+      {
+        "code": "Subject_English",
+        "name": "英语"
+      },
+      {
+        "code": "Subject_Physics",
+        "name": "物理"
+      },
+      {
+        "code": "Subject_Chemistry",
+        "name": "化学"
+      },
+      {
+        "code": "Subject_Biology",
+        "name": "生物"
+      },
+      {
+        "code": "Subject_Politics",
+        "name": "政治"
+      },
+      {
+        "code": "Subject_History",
+        "name": "历史"
+      },
+      {
+        "code": "Subject_Geography",
+        "name": "地理"
+      },
+      {
+        "code": "Subject_Information",
+        "name": "信息"
+      },
+      {
+        "code": "Subject_Science",
+        "name": "科学"
+      }
+    ]
+  },
+  {
+    "code": "zh-HK",
+    "name": "中國香港",
+    "lang": "繁體中文",
+    "subjects": []
+  },
+  {
+    "code": "zh-MO",
+    "name": "中國澳門",
+    "lang": "繁體中文",
+    "subjects": []
+  },
+  {
+    "code": "zh-TW",
+    "name": "中國台灣",
+    "lang": "繁體中文",
+    "subjects": []
+  },
+  {
+    "code": "en-US",
+    "name": "United States",
+    "lang": "English",
+    "subjects": []
+  },
+  {
+    "code": "en-UK",
+    "name": "United Kingdom",
+    "lang": "English",
+    "subjects": []
+  }
+]
+ 

+ 3 - 0
TEAMModelOS/TEAMModelOS.csproj

@@ -29,6 +29,7 @@
 
   <ItemGroup>
     <Folder Include="wwwroot\" />
+    <Folder Include="新文件夹\" />
   </ItemGroup>
   
   <ItemGroup>
@@ -69,4 +70,6 @@
     </ItemGroup>
   </Target>
 
+  <ProjectExtensions><VisualStudio><UserProperties jsonfile_4period_4period_3zh-cn_1json__JsonSchema="http://json.schemastore.org/2.0.0-csd.2.beta.2018-10-10.json" jsonfile_4core_4json_1json__JsonSchema="http://json.schemastore.org/2.0.0-csd.2.beta.2018-10-10.json" jsonfile_4core_4lang_1json__JsonSchema="http://json.schemastore.org/2.0.0-csd.2.beta.2018-10-10.json" /></VisualStudio></ProjectExtensions>
+
 </Project>