CrazyIter_Bin 1 年之前
父节点
当前提交
9f4bdda9c4

+ 30 - 1
TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -1337,7 +1337,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                             //更新 基础统计信息
                             //更新 基础统计信息
                             case "up-base":
                             case "up-base":
 
 
-                                //如果有更新 则去读取/{_lessonId}/IES/base.json
+                                //读取TimeLine.json
                                 try
                                 try
                                 {
                                 {
                                     BlobDownloadResult timelineblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/records/{_lessonId}/IES/TimeLine.json").DownloadContentAsync();
                                     BlobDownloadResult timelineblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/records/{_lessonId}/IES/TimeLine.json").DownloadContentAsync();
@@ -1352,7 +1352,36 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                         await _dingDing.SendBotMsg($"TimeLine.json转换异常,{ex.Message}{ex.StackTrace},{lessonRecord.id}", GroupNames.成都开发測試群組);
                                         await _dingDing.SendBotMsg($"TimeLine.json转换异常,{ex.Message}{ex.StackTrace},{lessonRecord.id}", GroupNames.成都开发測試群組);
                                     }
                                     }
                                 }
                                 }
+                                //读取Task.json
+                                try
+                                {
+                                    BlobDownloadResult timelineblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/records/{_lessonId}/IES/Task.json").DownloadContentAsync();
+                                    TimeLineData timeLineData = timelineblobDownload.Content.ToObjectFromJson<TimeLineData>();
+                                   
+                                }
+                                catch (Exception ex)
+                                {
+                                    if (!ex.Message.Contains("The specified blob does not exist"))
+                                    {
+                                        await _dingDing.SendBotMsg($"Task.json转换异常,{ex.Message}{ex.StackTrace},{lessonRecord.id}", GroupNames.成都开发測試群組);
+                                    }
+                                }
+                                //读取IRS.json
+                                try
+                                {
+                                    BlobDownloadResult timelineblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/records/{_lessonId}/IES/Task.json").DownloadContentAsync();
+                                    TimeLineData timeLineData = timelineblobDownload.Content.ToObjectFromJson<TimeLineData>();
 
 
+                                }
+                                catch (Exception ex)
+                                {
+                                    if (!ex.Message.Contains("The specified blob does not exist"))
+                                    {
+                                        await _dingDing.SendBotMsg($"Task.json转换异常,{ex.Message}{ex.StackTrace},{lessonRecord.id}", GroupNames.成都开发測試群組);
+                                    }
+                                }
+
+                                //如果有更新 则去读取/{_lessonId}/IES/base.json
                                 try
                                 try
                                 {
                                 {
                                     // await _dingDing.SendBotMsg($"{_option.Location},课堂id:{_lessonId} 收到更新", GroupNames.醍摩豆服務運維群組);
                                     // await _dingDing.SendBotMsg($"{_option.Location},课堂id:{_lessonId} 收到更新", GroupNames.醍摩豆服務運維群組);

+ 17 - 0
TEAMModelOS.SDK/Models/Cosmos/Common/LessonRecord.cs

@@ -229,6 +229,23 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         /// </summary>
         public int source { get; set; } = 0;
         public int source { get; set; } = 0;
     }
     }
+
+    public class TaskData { 
+        public string jobName { get; set; }
+        public string pageID { get; set; }
+        public int reciveCount { get; set; }
+        public string duration { get; set; }
+        public string collateType { get; set; }
+        public List<ClientWork> clientWorks { get; set; } = new List<ClientWork>();
+    }
+    public class ClientWork { 
+        public List<string> blobFiles { get; set; }= new List<string>();
+        public int seatID  { get; set; }
+        public string groupID { get; set; }
+        public bool isGroupItem { get; set; }
+        public string reciveTime { get; set; }
+        public int displayIndex {  get; set; }
+    }
     public class TimeLineData {
     public class TimeLineData {
       public   List<TimeLineEvent> events { get; set; } = new List<TimeLineEvent>();
       public   List<TimeLineEvent> events { get; set; } = new List<TimeLineEvent>();
     }
     }

+ 83 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/StudentScoreRecord.cs

@@ -1,4 +1,5 @@
-using System;
+using NUnit.Framework.Internal.Execution;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
@@ -6,6 +7,70 @@ using System.Threading.Tasks;
 
 
 namespace TEAMModelOS.SDK.Models.Cosmos.Common
 namespace TEAMModelOS.SDK.Models.Cosmos.Common
 {
 {
+    public class TeacherSemesterRecord : CosmosEntity { 
+    
+    }
+
+    /// <summary>
+    /// 
+    /// 互动:
+//    答题:按反馈器。
+//isBuzz 抢权
+//互动 => TimeLine.json => PickupOption=>   挑人
+//差异化:推送给学生。???
+//绿灯数: 拉取所有的分数,然后 计算中位数,
+//教师喜欢的功能 :Event 事件,同页过滤。
+    /// 学生计分记录
+    /// </summary>
+    public class StudentSemesterRecord : CosmosEntity
+    {
+        // id 校内学生: 学年-学期id-学生id, 醍摩豆id: year-tmdid
+        //code  StudentSemesterRecord[-学校编码],  StudentSemesterRecord
+        //其他基础信息
+        public StudentSemesterRecord()
+        {
+            pk = "StudentSemesterRecord";
+        }
+        public string stuid { get; set; }
+        public string tmdid { get; set; }
+        public string userType { get; set; }
+        public string school { get; set; }
+        public int studyYear { get; set; }
+        public string semesterId { get; set; }
+
+        public List<StudentLessonRecord> lessonRecords { get; set; } = new List<StudentLessonRecord>();
+        //单独记录 组计分,个人积分,互动分,
+        /// <summary>
+        /// //组计分
+        /// </summary>
+        public double gscore { get; set; }
+        /// <summary>
+        ///  //个人计分
+        /// </summary>
+        public double pscore { get; set; }
+        /// <summary>
+        /// //互动计分
+        /// </summary>
+        public double tscore { get; set; } 
+        /// <summary>
+        /// 互动参与率
+        /// </summary>
+        public double interactRate { get; set; }
+        /// <summary>
+        /// 任务参与率
+        /// </summary>
+        public double taskRate { get; set; }
+        /// <summary>
+        /// 出席率
+        /// </summary>
+        public double attendRate { get; set; }
+        /// <summary>
+        /// 组任务参与率
+        /// </summary>
+        public double groupTaskRate { get; set; }
+    }
+
+
     /// <summary>
     /// <summary>
     /// 学生计分记录
     /// 学生计分记录
     /// </summary>
     /// </summary>
@@ -75,6 +140,23 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         /// 课例时间
         /// 课例时间
         /// </summary>
         /// </summary>
         public long time { get; set; }
         public long time { get; set; }
+        /// <summary>
+        /// 互动参与率
+        /// </summary>
+        public double interactRate { get; set; }
+        /// <summary>
+        /// 任务参与率
+        /// </summary>
+        public double taskRate { get; set; }
+        /// <summary>
+        /// 出席状态
+        /// </summary>
+        public int attend { get; set; }
+        /// <summary>
+        /// 组任务参与率
+        /// </summary>
+        public double groupTaskRate { get; set; }
+
         /// <summary>
         /// <summary>
         /// 名单信息
         /// 名单信息
         /// </summary>
         /// </summary>

+ 12 - 0
TEAMModelOS.SDK/Models/Service/StudentLessonService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TEAMModelOS.SDK.Models.Service
+{
+    public class StudentLessonService
+    {
+    }
+}