Browse Source

完善课例的统计数据。

CrazyIter_Bin 3 years ago
parent
commit
13aedd791c

+ 17 - 2
TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -963,9 +963,24 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                 try {
                                     BlobDownloadResult baseblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/{_lessonId}/IES/base.json").DownloadContentAsync();
                                     LessonBase lessonBase = baseblobDownload.Content.ToObjectFromJson<LessonBase>();
+                                    if (lessonBase != null) {
+                                        lessonRecord.attendCount = lessonRecord.attendCount;
+                                        lessonRecord.clientCount = lessonRecord.clientCount;
+                                        lessonRecord.attendRate = lessonRecord.attendRate;
+                                        lessonRecord.groupCount = lessonRecord.groupCount;
+                                        lessonRecord.collateTaskCount = lessonRecord.collateTaskCount;
+                                        lessonRecord.collateCount = lessonRecord.collateCount;
+                                        lessonRecord.pushCount = lessonRecord.pushCount;
+                                        lessonRecord.totalPoint = lessonRecord.totalPoint;
+                                        lessonRecord.examQuizCount = lessonRecord.examQuizCount;
+                                        lessonRecord.interactionCount = lessonRecord.interactionCount;
+                                        lessonRecord.examPointRate = lessonRecord.examPointRate;
+                                        lessonRecord.clientInteractionCount = lessonRecord.clientInteractionCount;
+                                        lessonRecord.clientInteractionAverge = lessonRecord.clientInteractionAverge;
+                                    }
                                     msgs.Add(update);
-                                } catch (Exception ex) { 
-                                
+                                } catch (Exception ex) {
+                                    await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}课程读取base.json,{_lessonId}\n{ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
                                 }
                                 break;
 

+ 65 - 13
TEAMModelOS.SDK/Models/Cosmos/Common/LessonRecord.cs

@@ -117,6 +117,58 @@ namespace TEAMModelOS.SDK.Models
         /// 专家好课,默认0, 1 是好课
         /// </summary>
         public int excellent { get; set; } = 0;
+        /// <summary>
+        /// 出席人数
+        /// </summary>
+        public int attendCount { get; set; } = 0;
+        /// <summary>
+        /// 总人数
+        /// </summary>
+        public int clientCount { get; set; } = 0;
+        /// <summary>
+        ///出席率
+        /// </summary>
+        public double attendRate { get; set; } = 0;
+        /// <summary>
+        /// 小组数
+        /// </summary>
+        public int groupCount { get; set; } = 0;
+        /// <summary>
+        /// 任务总数,作品收集任务数
+        /// </summary>
+        public int collateTaskCount { get; set; } = 0;
+        /// <summary>
+        /// 作品总数
+        /// </summary>
+        public int collateCount { get; set; } = 0;
+        /// <summary>
+        /// 推送总数(页面,资源,讯息,差异化)
+        /// </summary>
+        public int pushCount { get; set; } = 0;
+        /// <summary>
+        /// 总计分
+        /// </summary>
+        public double totalPoint { get; set; } = 0;
+        /// <summary>
+        /// 测验总题数
+        /// </summary>
+        public int examQuizCount { get; set; } = 0;
+        /// <summary>
+        /// 互动题数
+        /// </summary>
+        public int interactionCount { get; set; } = 0;
+        /// <summary>
+        /// 测验得分率
+        /// </summary>
+        public double examPointRate { get; set; } = 0;
+        /// <summary>
+        /// 学生互动总数
+        /// </summary>
+        public int clientInteractionCount { get; set; } = 0;
+        /// <summary>
+        /// 学生互动率
+        /// </summary>
+        public int clientInteractionAverge { get; set; } = 0;
     }
 
     public class LessonActivityInfo
@@ -257,11 +309,11 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 
         /// </summary>
-        public double totalPodouble { get; set; }
+        public double totalPoint { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public double totaldoubleeractPodouble { get; set; }
+        public double totalInteractPoint { get; set; }
         /// <summary>
         /// 
         /// </summary>
@@ -285,19 +337,19 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 
         /// </summary>
-        public double examPodoubleRate { get; set; }
+        public double examPointRate { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int doubleeractionCount { get; set; }
+        public int interactionCount { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int clientdoubleeractionCount { get; set; }
+        public int clientInteractionCount { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public double clientdoubleeractionAverge { get; set; }
+        public double clientInteractionAverge { get; set; }
     }
 
     public class QuizSummaryList
@@ -357,7 +409,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 
         /// </summary>
-        public double doubleeractScore { get; set; }
+        public double interactScore { get; set; }
         /// <summary>
         /// 
         /// </summary>
@@ -425,11 +477,11 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 
         /// </summary>
-        public double totalPodouble { get; set; }
+        public double totalPoint { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public double totaldoubleeractPodouble { get; set; }
+        public double totalInteractPoint { get; set; }
         /// <summary>
         /// 
         /// </summary>
@@ -453,19 +505,19 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 
         /// </summary>
-        public double examPodoubleRate { get; set; }
+        public double examPointRate { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int doubleeractionCount { get; set; }
+        public int interactionCount { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int clientdoubleeractionCount { get; set; }
+        public int clientInteractionCount { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public double clientdoubleeractionAverge { get; set; }
+        public double clientInteractionAverge { get; set; }
     }
 
     public class StudentItem