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

TEAMModelFunction/MonitorServicesBus.cs

@@ -49,7 +49,7 @@ namespace TEAMModelFunction
             _configuration = configuration;
         }
         [FunctionName("Exam")]
-         public async Task Exam([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "exam", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+         public async Task ExamFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "exam", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -74,7 +74,7 @@ namespace TEAMModelFunction
 
         }
         [FunctionName("Vote")]
-        public async Task Vote([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "vote", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task VoteFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "vote", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -98,7 +98,7 @@ namespace TEAMModelFunction
 
         }
         [FunctionName("Correct")]
-        public async Task Correct([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "correct", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task CorrectFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "correct", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -122,7 +122,7 @@ namespace TEAMModelFunction
 
         }
         [FunctionName("Survey")]
-        public async Task Survey([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "survey", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task SurveyFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "survey", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -146,7 +146,7 @@ namespace TEAMModelFunction
             }
         }
         [FunctionName("Homework")]
-        public async Task Homework([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "homework", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task HomeworkFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "homework", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -169,7 +169,7 @@ namespace TEAMModelFunction
 
         }
         [FunctionName("Study")]
-        public async Task Study([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "study", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task StudyFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "study", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -193,7 +193,7 @@ namespace TEAMModelFunction
 
         }
         [FunctionName("ExamLite")]
-        public async Task ExamLite([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "examlite", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task ExamLiteFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "examlite", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -223,7 +223,7 @@ namespace TEAMModelFunction
         /// <param name="msg"></param>
         /// <returns></returns>
         [FunctionName("BlobRoot")]
-        public async Task BlobRoot([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "blobroot", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task BlobRootFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "blobroot", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -345,7 +345,7 @@ namespace TEAMModelFunction
         /// <param name="msg"></param>
         /// <returns></returns>
         [FunctionName("TeacherTrainChange")]
-        public async Task TeacherTrainChange([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "teacher-train-change", Connection = "Azure:ServiceBus:ConnectionString")] string msg) {
+        public async Task TeacherTrainChangeFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "teacher-train-change", Connection = "Azure:ServiceBus:ConnectionString")] string msg) {
             try {
                // await _dingDing.SendBotMsg($"teacher-train-change\n{msg}",GroupNames.成都开发測試群組);
                 TeacherTrainChange change = msg.ToObject<TeacherTrainChange>();
@@ -384,7 +384,7 @@ namespace TEAMModelFunction
                                 code = $"TeacherTrain-{change.school}",
                                 tmdid = x,
                                 school = change.school,
-                                update = new HashSet<string> {  StatisticsService.TeacherAility,
+                                update = new HashSet<string> {  StatisticsService.TeacherAbility,
                         StatisticsService.TeacherClass, StatisticsService.OfflineRecord }
                             };
                             teacherTrain.update.UnionWith(change.update);
@@ -452,7 +452,7 @@ namespace TEAMModelFunction
                                 code = $"TeacherTrain-{change.school}",
                                 tmdid = x,
                                 school = change.school,
-                                update = new HashSet<string> {  StatisticsService.TeacherAility,
+                                update = new HashSet<string> {  StatisticsService.TeacherAbility,
                                 StatisticsService.TeacherClass, StatisticsService.OfflineRecord }
                             }, setting, area, client, null));
                         });
@@ -473,7 +473,7 @@ namespace TEAMModelFunction
         /// <param name="msg"></param>
         /// <returns></returns>
         [FunctionName("GroupChange")]
-        public async Task GroupChange([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "group-change", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task GroupChangeFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "group-change", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             var client = _azureCosmos.GetCosmosClient();
             try
@@ -512,7 +512,7 @@ namespace TEAMModelFunction
             }
         }
         [FunctionName("ItemCond")]
-        public async Task ItemCond([ServiceBusTrigger("%Azure:ServiceBus:ItemCondQueue%", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        public async Task ItemCondFunc([ServiceBusTrigger("%Azure:ServiceBus:ItemCondQueue%", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
         {
             try
             {
@@ -581,7 +581,7 @@ namespace TEAMModelFunction
 
         //更新產品一覽表
         [FunctionName("Product")]
-        public async Task Product([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "product", Connection = "Azure:ServiceBus:ConnectionString")] string msg, ILogger log)
+        public async Task ProductFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "product", Connection = "Azure:ServiceBus:ConnectionString")] string msg, ILogger log)
         {
             try
             {
@@ -728,7 +728,7 @@ namespace TEAMModelFunction
         /// <param name="msg"></param>
         /// <returns></returns>
         [FunctionName("CopyStandardFile")]
-        public async Task BatchCopyBlob([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "copy-standard-file", Connection = "Azure:ServiceBus:ConnectionString")] string msg) 
+        public async Task BatchCopyBlobFunc([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "copy-standard-file", Connection = "Azure:ServiceBus:ConnectionString")] string msg) 
         {
             try
             {

TEAMModelFunction/TEAMModelFunction.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
-    <Version>5.2107.29</Version>
+    <Version>5.2112.21</Version>
     <AssemblyVersion>5.2107.29.1</AssemblyVersion>
     <FileVersion>5.2107.29.1</FileVersion>
   </PropertyGroup>

TEAMModelOS.SDK/Models/Cosmos/Research/TeacherTrain.cs

@@ -159,7 +159,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 教师能力点情况
         /// </summary>
-        public List<TeacherAility> teacherAilities { get; set; } = new List<TeacherAility>();
+        public List<TeacherAbility> teacherAilities { get; set; } = new List<TeacherAbility>();
         /// <summary>
         /// 已学能力点，视频观看达标，并且上传了认证材料，并且能力点自测通过才能获得
         /// </summary>
@@ -182,7 +182,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int subCount { get; set; }
     }
-    public class TeacherAility {
+    public class TeacherAbility {
         /// <summary>
         /// 线上观看视频的学时
         /// </summary>

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -304,16 +304,17 @@ namespace TEAMModelOS.SDK
             }
             return list;
         }
-        public static async Task<List<GroupListDto> > GetGroupListListids(CosmosClient client, DingDing _dingDing, List<string> classes, string school,string SummarySql) {
+        public static async Task<List<GroupListDto> > GetGroupListListids(CosmosClient client, DingDing _dingDing, List<string> classes, string school,
+            string SummarySql= " c.id,c.code,c.name,c.no,c.periodId,c.scope,c.school,c.creatorId,c.type,c.year,c.tcount,c.scount,c.leader ") {
             List<GroupListDto> groupLists = null;
-            if (classes.Count == 1 && classes.First().Equals("default") && !string.IsNullOrEmpty(school))
+            if (classes.Count == 1 && classes.First().Equals("TeacherAll") && !string.IsNullOrEmpty(school))
             {
                 //默认的教研组
 
                 GroupListDto groupList = new GroupListDto
                 {
-                    id = "default",
-                    name = "default",
+                    id = "TeacherAll",
+                    name = "TeacherAll",
                     code = $"GroupList-{school}",
                     school = school,
                     scope = "school",

TEAMModelOS.SDK/Models/Service/StatisticsService.cs

@@ -19,7 +19,7 @@ namespace TEAMModelOS.SDK
         /// <summary>
         /// 教师能力点操作
         /// </summary>
-        public const string TeacherAility = "TeacherAility";
+        public const string TeacherAbility = "TeacherAbility";
         /// <summary>
         /// 课堂实录
         /// </summary>
@@ -78,7 +78,7 @@ namespace TEAMModelOS.SDK
                             code = $"TeacherTrain-{change.school}",
                             tmdid = x,
                             school = change.school,
-                            update = new HashSet<string> {  StatisticsService.TeacherAility,
+                            update = new HashSet<string> {  StatisticsService.TeacherAbility,
                         StatisticsService.TeacherClass, StatisticsService.OfflineRecord }
                         };
                         teacherTrain.update.UnionWith(change.update);
@@ -185,7 +185,7 @@ namespace TEAMModelOS.SDK
                         name = member.name,
                         picture=member.picture,
                         school = school,
-                        update = new HashSet<string> { TeacherAility,TeacherClass,OfflineRecord }
+                        update = new HashSet<string> { TeacherAbility,TeacherClass,OfflineRecord }
                     });
                 }
             }
@@ -296,9 +296,9 @@ namespace TEAMModelOS.SDK
             string _school = train.school;
             string _tmdid = train.tmdid;
             switch (property) {
-                case TeacherAility:
-                    train = await DoTeacherAility(train, setting, area, client, _school, _tmdid);
-                    train.update.Remove(TeacherAility);
+                case TeacherAbility:
+                    train = await DoTeacherAbility(train, setting, area, client, _school, _tmdid);
+                    train.update.Remove(TeacherAbility);
                     break;
                 //课堂实录更新
                 case TeacherClass:
@@ -678,7 +678,7 @@ namespace TEAMModelOS.SDK
             return train;
         }
         
-        public static async Task<TeacherTrain> DoTeacherAility(TeacherTrain train, AreaSetting setting,Area area ,  CosmosClient client,string _school,string _tmdid) {
+        public static async Task<TeacherTrain> DoTeacherAbility(TeacherTrain train, AreaSetting setting,Area area ,  CosmosClient client,string _school,string _tmdid) {
             //视频播放
             List<string> abilityIds = new List<string> ();
             TeacherFile file = null;
@@ -765,7 +765,7 @@ namespace TEAMModelOS.SDK
                     }
 
                     List<TeacherHprecord> hprecords = new List<TeacherHprecord>();
-                    TeacherAility teacherAility = new Models.TeacherAility
+                    TeacherAbility teacherAbility = new Models.TeacherAbility
                     {
                         id = ability.id,
                         currency = currencyInt,
@@ -792,9 +792,9 @@ namespace TEAMModelOS.SDK
                         //如果超过 8* 45分钟学时，则直接赋值360（limit）分钟。
                         view = view / 60;
                         view = view > limit ? limit : view;
-                        teacherAility.videoTime = view;
-                        teacherAility.limitTime = ability.hour;
-                        teacherAility.onlineTime = view / setting.lessonMinutes;
+                        teacherAbility.videoTime = view;
+                        teacherAbility.limitTime = ability.hour;
+                        teacherAbility.onlineTime = view / setting.lessonMinutes;
                         
                     }
                     if (item.otherScore.IsNotEmpty())
@@ -802,10 +802,10 @@ namespace TEAMModelOS.SDK
                         var schoolScore = item.otherScore.Where(x => x.roleType.Equals("school")).FirstOrDefault();
                         if (schoolScore != null && schoolScore.score >= 0)
                         {
-                            teacherAility.xzscore = schoolScore.score;
-                            teacherAility.xztime = schoolScore.time;
-                            teacherAility.xztmdid = schoolScore.tmdid;
-                            teacherAility.xztmdname = schoolScore.tmdname;
+                            teacherAbility.xzscore = schoolScore.score;
+                            teacherAbility.xztime = schoolScore.time;
+                            teacherAbility.xztmdid = schoolScore.tmdid;
+                            teacherAbility.xztmdname = schoolScore.tmdname;
 
                         }
                         var hprecord = item.otherScore.FindAll(x => x.roleType.Equals("member")).Select(y => new TeacherHprecord { tmdid = y.tmdid, tmdname = y.tmdname, score = y.score });
@@ -816,11 +816,11 @@ namespace TEAMModelOS.SDK
                             var yx = hprecord.Where(x => x.score == 2) != null ? hprecord.Where(x => x.score == 2).Count() : 0;
                             if (no == hg && hg == yx && no == 0)
                             {
-                                teacherAility.hpscore = -1;
+                                teacherAbility.hpscore = -1;
                             }
                             else if (no == hg && hg == yx && no != 0)
                             {
-                                teacherAility.hpscore = 2;
+                                teacherAbility.hpscore = 2;
                             }
                             else
                             {
@@ -829,32 +829,32 @@ namespace TEAMModelOS.SDK
                                 int max = arr.Max();
                                 if (max == yx && !ok)
                                 {
-                                    teacherAility.hpscore = 2;
+                                    teacherAbility.hpscore = 2;
                                     ok = true;
                                 }
                                 if (max == hg && !ok)
                                 {
-                                    teacherAility.hpscore = 1;
+                                    teacherAbility.hpscore = 1;
                                     ok = true;
                                 }
                                 if (max == no && !ok)
                                 {
-                                    teacherAility.hpscore = 0;
+                                    teacherAbility.hpscore = 0;
                                     ok = true;
                                 }
                             }
-                            teacherAility.hprecord.AddRange(hprecord);
+                            teacherAbility.hprecord.AddRange(hprecord);
                         }
                     }
                     if (currencyInt == 1)
                     {    
                         currency.subCount += 1;
                         currency.uploadTotal += ability.stds.FindAll(x => x.task.IsNotEmpty()).Select(y => y.task).Count();
-                        currency.teacherAilities.Add(teacherAility);
+                        currency.teacherAilities.Add(teacherAbility);
                     }
                     currencyAll.subCount += 1;
                     currencyAll.uploadTotal += ability.stds.FindAll(x => x.task.IsNotEmpty()).Select(y => y.task).Count();
-                    currencyAll.teacherAilities.Add(teacherAility);
+                    currencyAll.teacherAilities.Add(teacherAbility);
                 }
             });
             train.currency = currency;

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -24,6 +24,7 @@ using HTEXLib.COMM.Helpers;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.Services.Common;
+using TEAMModelOS.SDK;
 
 namespace TEAMModelOS.Controllers.Client
 {
@@ -58,6 +59,68 @@ namespace TEAMModelOS.Controllers.Client
             _option = option?.Value;
         }
 
+        /// <summary>
+        /// 创建课堂开课记录
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [ProducesDefaultResponseType]
+        [AuthToken(Roles = "teacher,admin")]
+        [HttpPost("create-lesson-record")]
+        public async Task<IActionResult> CreateLessonRecord(JsonElement request)
+        {
+            if (!request.TryGetProperty("lesson", out JsonElement _lesson)) return BadRequest();
+            var client = _azureCosmos.GetCosmosClient();
+            LessonRecord lessonRecord = _lesson.ToObject<LessonRecord>();
+            if (string.IsNullOrEmpty(lessonRecord.scope) && !string.IsNullOrEmpty(lessonRecord.tmdid)&& !string.IsNullOrEmpty(lessonRecord.id))
+            {
+                string tbname = null;
+                if (lessonRecord.scope.Equals("school") && !string.IsNullOrEmpty(lessonRecord.school))
+                {
+                   
+                    lessonRecord.code = $"LessonRecord-{lessonRecord.school}";
+                    tbname = "School";
+                }
+                if (lessonRecord.scope.Equals("private"))
+                {
+                    lessonRecord.code = $"LessonRecord-{lessonRecord.tmdid}";
+                    tbname = "Teacher";
+                }
+                if (tbname == null) {
+                    return Ok(new { error = 400, msg = "参数异常：scope应为school或private，scope=school  ,school字段不能为空" });
+                }
+                if (lessonRecord.startTime == 0) {
+                    lessonRecord.startTime=DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                }
+                //处理课堂选用的课程信息
+                if (string.IsNullOrEmpty(lessonRecord.courseId))
+                {
+                    Course course = null;
+                    try {
+                        course = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<Course>(lessonRecord.courseId, new PartitionKey($"Course-{lessonRecord.school}"));
+                    } catch (CosmosException ex ) {
+                        course = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<Course>(lessonRecord.courseId, new PartitionKey($"Course-{lessonRecord.tmdid}"));
+                    }
+                    if (course != null) {
+                        lessonRecord.periodId = course.period?.id;
+                        lessonRecord.subjectId = course.subject?.id;
+                    }
+                }
+
+                //处理课堂选用的名单
+                if (lessonRecord.groupIds.IsNotEmpty())
+                {
+                    List<GroupListDto> groups = await   GroupListService.GetGroupListListids(client, _dingDing, lessonRecord.groupIds, lessonRecord.school);
+                    groups.Find(x => !string.IsNullOrEmpty(x.periodId) && x.year > 0 && !string.IsNullOrEmpty(x.school));
+
+                }
+                return Ok(new { });
+            }
+            else {
+                return Ok(new { error=400,msg= "scope ,tmdid,id不能为空" });
+            }
+            
+        }
         [ProducesDefaultResponseType]
         [HttpPost("get-teacher-info")]
         public async Task<IActionResult> GetTeacherInfo()

TEAMModelOS/Controllers/Common/LessonRecordController.cs

@@ -48,17 +48,6 @@ namespace TEAMModelOS.Controllers
             _azureRedis = azureRedis;
             _configuration = configuration;
         }
-        /// <summary>
-        /// 创建课堂开课记录
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [AuthToken(Roles = "teacher,admin")]
-        [HttpPost("create-lesson-record")]
-        public async Task<IActionResult> CreateLessonRecord(JsonElement request) {
-
-            return Ok();
-        }
+        
     }
 }

TEAMModelOS/Controllers/Research/AbilityStatisticsController.cs

@@ -450,7 +450,7 @@ namespace TEAMModelOS.Controllers
                         school = school,
                         name= name,
                         picture= picture,
-                        update = new HashSet<string> {  StatisticsService.TeacherAility,
+                        update = new HashSet<string> {  StatisticsService.TeacherAbility,
                         StatisticsService.TeacherClass, StatisticsService.OfflineRecord }
                     }, setting, area, client,null);
                 }

TEAMModelOS/Controllers/Research/AbilitySubController.cs

@@ -111,7 +111,7 @@ namespace TEAMModelOS.Controllers
                     }
                 }
                 if (!HttpContext.Items.TryGetValue("Standard", out object standard)) return BadRequest();
-                await StatisticsService.SendServiceBus(  ($"{standard}", new List<string> { $"{_tmdid}" }, $"{school}",new List<string> { StatisticsService.TeacherAility }, 0), _configuration, _serviceBus);
+                await StatisticsService.SendServiceBus(  ($"{standard}", new List<string> { $"{_tmdid}" }, $"{school}",new List<string> { StatisticsService.TeacherAbility }, 0), _configuration, _serviceBus);
                 return Ok(new { abilityIds });
             }
             catch (Exception ex)
@@ -400,7 +400,7 @@ namespace TEAMModelOS.Controllers
                         }
                         abilitySubTasks.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(sub, sub.id, new PartitionKey(sub.code)));
                     });
-                    (string standard, List<string> tmdid, string school, List<string> update, int statistics) list = ($"{standard}", tmdids, school, new List<string> { StatisticsService.TeacherAility },0);
+                    (string standard, List<string> tmdid, string school, List<string> update, int statistics) list = ($"{standard}", tmdids, school, new List<string> { StatisticsService.TeacherAbility },0);
                     await  abilitySubTasks.TaskPage(10);
                     await StatisticsService.SendServiceBus(list, _configuration, _serviceBus);
                     return Ok(new { status = 200 });
@@ -494,7 +494,7 @@ namespace TEAMModelOS.Controllers
                             abilitySub.exerciseScore = int.Parse($"{_exercise}");
                             await client.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<AbilitySub>(abilitySub, $"{_abilityId}", new PartitionKey(code));
                             status = 1;
-                            await StatisticsService.SendServiceBus( ($"{standard}", new List<string> { $"{_tmdid}" }, $"{_school}",new List<string> { StatisticsService.TeacherAility }, 0) , _configuration, _serviceBus);
+                            await StatisticsService.SendServiceBus( ($"{standard}", new List<string> { $"{_tmdid}" }, $"{_school}",new List<string> { StatisticsService.TeacherAbility }, 0) , _configuration, _serviceBus);
                             return Ok(new { status });
                         }
                         else
@@ -542,7 +542,7 @@ namespace TEAMModelOS.Controllers
                             abilitySub.selfTime = now;
                             await client.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<AbilitySub>(abilitySub, $"{_abilityId}", new PartitionKey(code));
                             status = 1;
-                            await StatisticsService.SendServiceBus(  ($"{standard}", new List<string> { $"{_tmdid}" }, $"{_school}", new List<string> { StatisticsService.TeacherAility }, 0)  , _configuration, _serviceBus);
+                            await StatisticsService.SendServiceBus(  ($"{standard}", new List<string> { $"{_tmdid}" }, $"{_school}", new List<string> { StatisticsService.TeacherAbility }, 0)  , _configuration, _serviceBus);
                         }
                         else
                         {
@@ -724,7 +724,7 @@ namespace TEAMModelOS.Controllers
                                 }
                             }
                             await client.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<AbilitySub>(abilitySub, $"{_abilityId}", new PartitionKey(code));
-                            await StatisticsService.SendServiceBus(  ($"{standard}",new List<string> { $"{_tmdid}" }, $"{_school}", new List<string> { StatisticsService.TeacherAility }, 0) , _configuration, _serviceBus);
+                            await StatisticsService.SendServiceBus(  ($"{standard}",new List<string> { $"{_tmdid}" }, $"{_school}", new List<string> { StatisticsService.TeacherAbility }, 0) , _configuration, _serviceBus);
                             status = 1;
                         }
                         return Ok(new { status, abilitySub });
@@ -880,7 +880,7 @@ namespace TEAMModelOS.Controllers
                             await client.GetContainer("TEAMModelOS", "Teacher").CreateItemAsync<TeacherFile>(teacherFile, new PartitionKey($"TeacherFile-{_school}"));
                         }
                         if (fileRcds.Exists(x => x.type.Equals("video"))) {
-                            await StatisticsService.SendServiceBus( ($"{standard}",new List<string> { $"{_tmdid}" }, $"{_school}", new List<string> { StatisticsService.TeacherAility },0) , _configuration, _serviceBus);
+                            await StatisticsService.SendServiceBus( ($"{standard}",new List<string> { $"{_tmdid}" }, $"{_school}", new List<string> { StatisticsService.TeacherAbility },0) , _configuration, _serviceBus);
                         }
                         //获取视文件学习记录
                         List<dynamic> _files = new List<dynamic>();