Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

.gitignore

@@ -254,4 +254,8 @@ _Pvt_Extensions
 /.idea
 /TEAMModelOS/wwwroot/dist
 /TEAMModelOS/wwwroot
+/TEAMModelBI/wwwroot/dist
+/TEAMModelBI/wwwroot
+/TEAMModelBI/wwwroot/static
 *.log.*
+

TEAMModeBI/ClientApp/vue.config.js

@@ -1,6 +1,6 @@
     module.exports = {
         publicPath: './', // 默认'/'，部署应用包时的基本 URL
-        outputDir: 'dist', // 'dist', 生产环境构建文件的目录
+        outputDir: '../wwwroot', // 'dist', 生产环境构建文件的目录
         assetsDir: 'static',
         // lintOnSave: true,
         // runtimeCompiler: true,

TEAMModeBI/Controllers/BISchool/BatchSchoolController.cs

@@ -15,7 +15,6 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using static TEAMModelOS.SDK.Models.Teacher;
 using Microsoft.AspNetCore.Hosting;  //引用读取文件
 using TEAMModelOS.SDK.Models.Service;
 using System.IO;
@@ -327,7 +326,7 @@ namespace TEAMModeBI.Controllers.BISchool
                                     //创建账号并第一次登录IES5则默认赠送1G
                                     size = 1,
                                     defaultSchool = createSchoolInfo.id,
-                                    schools = new List<Teacher.TeacherSchool>() { new TeacherSchool { schoolId = createSchoolInfo.id, name = bischool.name, status = "join", time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() } }
+                                    schools = new List<Teacher.TeacherSchool>() { new Teacher.TeacherSchool { schoolId = createSchoolInfo.id, name = bischool.name, status = "join", time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() } }
                                 };
 
                                 stringBuilder.Append($"没有该教师信息创建的教师信息：{addteacher.name}【{addteacher.id}】");
@@ -544,59 +543,6 @@ namespace TEAMModeBI.Controllers.BISchool
             }
         }
 
-        /// <summary>
-        /// 修改学校信息
-        /// </summary>
-        /// <param name="school"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [AuthToken(Roles = "assist")]
-        [HttpPost("upd-school")]
-        public async Task<IActionResult> UpdSchool(ReplaceSchool replaceSchool)
-        {
-            try
-            {
-                School schoolInfo = new School();
-                var cosmosClient = _azureCosmos.GetCosmosClient();
-
-                School tempShool = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(replaceSchool.school.id, new PartitionKey("Base"));
-                if (tempShool != null)
-                {
-                    List<Teacher> teachers = new List<Teacher>();
-                    string sqltxt = $"select distinct value(c) from c join a1 in c.schools where a1.schoolId='{replaceSchool.school.id}'";
-                    await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<Teacher>(queryText: sqltxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
-                    {
-                        teachers.Add(item);
-                    }
-
-                    foreach (var item in teachers)
-                    {
-                        TeacherSchool teacherSchool = item.schools.Find(x => x.schoolId.Equals(replaceSchool.school.id));
-                        if (teacherSchool != null)
-                        {
-                            teacherSchool.name = replaceSchool.school.name;
-                            teacherSchool.picture = replaceSchool.school.picture;
-                            teacherSchool.areaId = replaceSchool.school.areaId;
-                        }
-                        await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(item, item.id, new PartitionKey("Base"));
-                    }
-
-                    schoolInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<School>(replaceSchool.school, replaceSchool.school.id, new PartitionKey("Base"));
-
-                    //保存操作记录
-                    await _azureStorage.SaveLog("school-update", $"{replaceSchool.tmdName}【{replaceSchool.tmdId}】修改学校信息，学校和ID:{replaceSchool.school.name}【{replaceSchool.school.id}】", _dingDing, httpContext: HttpContext);
-
-                    return Ok(new { state = 200, schoolInfo });
-                }
-                else return Ok(new { state = 400, message = "请求错误！" });
-            }
-            catch (Exception ex)
-            {
-                await _dingDing.SendBotMsg($"BI,{_option.Location}  /batchschool/upd-school \n {ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
-                return BadRequest();
-            }
-        }
-
         /// <summary>
         /// 修改学校信息和顾问信息
         /// </summary>
@@ -685,7 +631,7 @@ namespace TEAMModeBI.Controllers.BISchool
                                 }
                                 else
                                 {
-                                    TeacherSchool teacherSchool = new TeacherSchool
+                                    Teacher.TeacherSchool teacherSchool = new Teacher.TeacherSchool
                                     {
                                         schoolId = tempShool.id,
                                         name = tempShool.name,
@@ -1170,23 +1116,6 @@ namespace TEAMModeBI.Controllers.BISchool
             public string tmdName { get; set; }
         }
 
-        public record ReplaceSchool()
-        {
-            /// <summary>
-            /// 醍摩豆账户ID
-            /// </summary>
-            public string tmdId { get; set; }
-
-            /// <summary>
-            /// 醍摩豆账户名称
-            /// </summary>
-            public string tmdName { get; set; }
-
-            /// <summary>
-            /// 学校
-            /// </summary>
-            public School school { get; set; }
-        }
 
         /// <summary>
         /// 创建多个学校实体

TEAMModeBI/Controllers/BISchool/SchoolController.cs

@@ -24,7 +24,6 @@ namespace TEAMModeBI.Controllers.BISchool
         private readonly DingDing _dingDing;
         private readonly Option _option;
         private readonly AzureStorageFactory _azureStorage;
-        public readonly string mobel = "学校";
 
         public SchoolController(AzureCosmosFactory azureCosmos, DingDing dingDing, AzureStorageFactory azureStorage, IOptionsSnapshot<Option> option) 
         {
@@ -165,6 +164,106 @@ namespace TEAMModeBI.Controllers.BISchool
             return Ok(new { state = 200, schools });
         }
 
+        /// <summary>
+        /// 依据学校编号查询学校信息
+        /// </summary>
+        /// <param name="jsonElement"></param>
+        /// <returns></returns>
+        [HttpPost("get-schoolid")]
+        public async Task<IActionResult> GetSchoolId(JsonElement jsonElement) 
+        {
+            try
+            {
+                if (!jsonElement.TryGetProperty("schoolId", out JsonElement schoolId)) return BadRequest();
+
+                var cosmosClient = _azureCosmos.GetCosmosClient();
+
+                School school = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemAsync<School>($"{schoolId}", new PartitionKey("Base"));
+
+                return Ok(new { state = 200, school });
+
+            }
+            catch (Exception ex)
+            {
+                await _dingDing.SendBotMsg($"BI，{_option.Location}   /schoolcheck/get-schoolid   {ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
+                return BadRequest();
+            }
+        }
+
+        /// <summary>
+        /// 修改学校信息
+        /// </summary>
+        /// <param name="school"></param>
+        /// <returns></returns>
+        [ProducesDefaultResponseType]
+        [AuthToken(Roles = "assist")]
+        [HttpPost("upd-school")]
+        public async Task<IActionResult> UpdSchool(ReplaceSchool replaceSchool)
+        {
+            try
+            {
+                School schoolInfo = new School();
+                var cosmosClient = _azureCosmos.GetCosmosClient();
+
+                School tempShool = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(replaceSchool.school.id, new PartitionKey("Base"));
+                if (tempShool != null)
+                {
+                    List<Teacher> teachers = new List<Teacher>();
+                    string sqltxt = $"select distinct value(c) from c join a1 in c.schools where a1.schoolId='{replaceSchool.school.id}'";
+                    await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<Teacher>(queryText: sqltxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
+                    {
+                        teachers.Add(item);
+                    }
+
+                    foreach (var item in teachers)
+                    {
+                        Teacher.TeacherSchool teacherSchool = item.schools.Find(x => x.schoolId.Equals(replaceSchool.school.id));
+                        if (teacherSchool != null)
+                        {
+                            teacherSchool.name = replaceSchool.school.name;
+                            teacherSchool.picture = replaceSchool.school.picture;
+                            teacherSchool.areaId = replaceSchool.school.areaId;
+                        }
+                        await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(item, item.id, new PartitionKey("Base"));
+                    }
+
+                    schoolInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<School>(replaceSchool.school, replaceSchool.school.id, new PartitionKey("Base"));
+
+                    //保存操作记录
+                    await _azureStorage.SaveLog("school-update", $"{replaceSchool.tmdName}【{replaceSchool.tmdId}】修改学校信息，学校和ID:{replaceSchool.school.name}【{replaceSchool.school.id}】", _dingDing, httpContext: HttpContext);
+
+                    return Ok(new { state = 200, schoolInfo });
+                }
+                else return Ok(new { state = 400, message = "请求错误！" });
+            }
+            catch (Exception ex)
+            {
+                await _dingDing.SendBotMsg($"BI,{_option.Location}  /batchschool/upd-school \n {ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
+                return BadRequest();
+            }
+        }
+
+        /// <summary>
+        /// 修改学校的结构
+        /// </summary>
+        public record ReplaceSchool()
+        {
+            /// <summary>
+            /// 醍摩豆账户ID
+            /// </summary>
+            public string tmdId { get; set; }
+
+            /// <summary>
+            /// 醍摩豆账户名称
+            /// </summary>
+            public string tmdName { get; set; }
+
+            /// <summary>
+            /// 学校
+            /// </summary>
+            public School school { get; set; }
+        }
+
         /// <summary>
         /// 未加入区域的学校
         /// </summary>