|
@@ -15,7 +15,6 @@ using TEAMModelOS.SDK.DI;
|
|
using TEAMModelOS.SDK.Extension;
|
|
using TEAMModelOS.SDK.Extension;
|
|
using TEAMModelOS.SDK.Models;
|
|
using TEAMModelOS.SDK.Models;
|
|
using TEAMModelOS.SDK.Models.Cosmos.BI;
|
|
using TEAMModelOS.SDK.Models.Cosmos.BI;
|
|
-using static TEAMModelOS.SDK.Models.Teacher;
|
|
|
|
using Microsoft.AspNetCore.Hosting; //引用读取文件
|
|
using Microsoft.AspNetCore.Hosting; //引用读取文件
|
|
using TEAMModelOS.SDK.Models.Service;
|
|
using TEAMModelOS.SDK.Models.Service;
|
|
using System.IO;
|
|
using System.IO;
|
|
@@ -327,7 +326,7 @@ namespace TEAMModeBI.Controllers.BISchool
|
|
//创建账号并第一次登录IES5则默认赠送1G
|
|
//创建账号并第一次登录IES5则默认赠送1G
|
|
size = 1,
|
|
size = 1,
|
|
defaultSchool = createSchoolInfo.id,
|
|
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}】");
|
|
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>
|
|
/// 修改学校信息和顾问信息
|
|
/// 修改学校信息和顾问信息
|
|
/// </summary>
|
|
/// </summary>
|
|
@@ -685,7 +631,7 @@ namespace TEAMModeBI.Controllers.BISchool
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- TeacherSchool teacherSchool = new TeacherSchool
|
|
|
|
|
|
+ Teacher.TeacherSchool teacherSchool = new Teacher.TeacherSchool
|
|
{
|
|
{
|
|
schoolId = tempShool.id,
|
|
schoolId = tempShool.id,
|
|
name = tempShool.name,
|
|
name = tempShool.name,
|
|
@@ -1170,23 +1116,6 @@ namespace TEAMModeBI.Controllers.BISchool
|
|
public string tmdName { get; set; }
|
|
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>
|
|
/// <summary>
|
|
/// 创建多个学校实体
|
|
/// 创建多个学校实体
|