update

TEAMModelAPI/Controllers/School/GroupListController.cs

@@ -309,7 +309,7 @@ namespace TEAMModelAPI.Controllers
                         school=school,
                         type="teach",
                         year=list.year,
-                        from=3
+                        froms=3
                     };
                     groupList = await GroupListService.CheckListNo(groupList, _azureCosmos, _dingDing, _option);
                     

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -959,6 +959,17 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                 msgs.Add(update);
                                 break;
                             //更新 时间线
+                            case "up-base":
+                                try {
+                                    BlobDownloadResult baseblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/{_lessonId}/IES/base.json").DownloadContentAsync();
+                                    LessonBase lessonBase = baseblobDownload.Content.ToObjectFromJson<LessonBase>();
+                                    msgs.Add(update);
+                                } catch (Exception ex) { 
+                                
+                                }
+                                break;
+
+                            //更新 时间线
                             case "up-TimeLine":
                                 //BlobDownloadResult TimeLineblobDownload = await _azureStorage.GetBlobContainerClient(blobname).GetBlobClient($"/{_lessonId}/IES/TimeLine.json").DownloadContentAsync();
                                 //var timeline = TimeLineblobDownload.Content.ToObjectFromJson<List<LessonTimeLine>>();
@@ -970,16 +981,16 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                 //var activityInfos = ActivityInfoblobDownload.Content.ToObjectFromJson<List<LessonActivityInfo>>();
                                 msgs.Add(update);
                                 break;
-                            case "up-baseinfo":
-                                if (updates.Count > 1)
-                                {
-                                    isReplace = true;
-                                }
-                                else {
-                                    isReplace = false;
-                                }
-                                msgs.Add(update);
-                                break;
+                            //case "up-baseinfo":
+                            //    if (updates.Count > 1)
+                            //    {
+                            //        isReplace = true;
+                            //    }
+                            //    else {
+                            //        isReplace = false;
+                            //    }
+                            //    msgs.Add(update);
+                            //    break;
                             case "delete":
                                 try
                                 {
@@ -1048,7 +1059,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                     List<GroupListDto> groups = await GroupListService.GetGroupListListids(client, _dingDing, lessonRecord.groupIds, lessonRecord.school);
                                      
                                     List<GroupListDto> groupLists = groups?.FindAll(x => !string.IsNullOrEmpty(x.periodId) && x.year > 0 && !string.IsNullOrEmpty(x.school));
-                                    if (groupLists.IsNotEmpty() && !string.IsNullOrEmpty(lessonRecord.periodId))
+                                    if (groupLists.IsNotEmpty() && !string.IsNullOrWhiteSpace(lessonRecord.periodId))
                                     {
                                         School schoolObj = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(lessonRecord.school, new PartitionKey("Base"));
 

TEAMModelOS.SDK/DI/AzureCosmos/Inner/SQLHelper.cs

@@ -892,7 +892,5 @@ namespace TEAMModelOS.SDK.DI.AzureCosmos.Inner
 
             return parmeters;
         }
-
-
     }
 }

TEAMModelOS.SDK/Models/Cosmos/Common/GroupList.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 名单创建来源，0 默认，1 个人 ，2 学校，3 校内应用，4企业应用
         /// </summary>
-        public int from { get; set; } = 0;
+        public int froms { get; set; } = 0;
     }
     public class RGroupList
     {
@@ -75,7 +75,7 @@ namespace TEAMModelOS.SDK.Models
         public int scount { get; set; }
         public List<RMember> members { get; set; } = new List<RMember>();
         public string leader { get; set; }
-        public int from { get; set; } = 0;
+        public int froms { get; set; } = 0;
 
     }
 
@@ -199,7 +199,7 @@ namespace TEAMModelOS.SDK.Models
         public int scount { get; set; }
         public string leader { get; set; }
         public HashSet<string> groupName { get; set; }
-        public int from { get; set; } = 0;
+        public int froms { get; set; } = 0;
     }
    
     public class GroupListDto
@@ -234,7 +234,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int scount { get; set; }
         public string leader { get; set; }
-        public int from { get; set; } = 0;
+        public int froms { get; set; } = 0;
     }
     public class CourseGroupList
     {

TEAMModelOS.SDK/Models/Cosmos/Common/LessonRecord.cs

@@ -191,4 +191,302 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int disDCount { get; set; } = 0;
     }
+    /// <summary>
+    /// /{_lessonId}/IES/TimeLine.json 课堂记录基础信息
+    /// </summary>
+    public class LessonBase{
+        /// <summary>
+        /// 
+        /// </summary>
+        public Summary summary { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Report report { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<LessonTC> teacheract { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<StudentItem> student { get; set; }
+    }
+    public class Summary
+    {
+        /// <summary>
+        /// 测试新版名单222-罗老师 小课堂
+        /// </summary>
+        public string activityName { get; set; }
+        /// <summary>
+        /// 罗老师
+        /// </summary>
+        public string hostName { get; set; }
+        /// <summary>
+        /// 全客观题
+        /// </summary>
+        public string meterialName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string date { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string startTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string endTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int attendCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int clientCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double attendRate { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int groupCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double totalPodouble { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double totaldoubleeractPodouble { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int collateTaskCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int collateCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int pushCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int examCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int examQuizCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double examPodoubleRate { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int doubleeractionCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int clientdoubleeractionCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double clientdoubleeractionAverge { get; set; }
+    }
+
+    public class QuizSummaryList
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string quizID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string pageOrderStr { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string score { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string correctAnswer { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string correctRateStr { get; set; }
+    }
+
+    public class ClientSummaryList
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string groupName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double groupScore { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int groupTaskCompleteCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double attendState { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double score { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int taskCompleteCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<double> examScoreList { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double doubleeractScore { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<string> answerList { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int seatID { get; set; }
+        /// <summary>
+        /// 李镇希
+        /// </summary>
+        public string name { get; set; }
+    }
+
+    public class Report
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<QuizSummaryList> quizSummaryList { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<ClientSummaryList> clientSummaryList { get; set; }
+        /// <summary>
+        /// 测试新版名单222-罗老师 小课堂
+        /// </summary>
+        public string activityName { get; set; }
+        /// <summary>
+        /// 罗老师
+        /// </summary>
+        public string hostName { get; set; }
+        /// <summary>
+        /// 全客观题
+        /// </summary>
+        public string meterialName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string date { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string startTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string endTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int attendCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int clientCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double attendRate { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int groupCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double totalPodouble { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double totaldoubleeractPodouble { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int collateTaskCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int collateCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int pushCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int examCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int examQuizCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double examPodoubleRate { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int doubleeractionCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int clientdoubleeractionCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double clientdoubleeractionAverge { get; set; }
+    }
+
+    public class StudentItem
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int seatID { get; set; }
+        /// <summary>
+        /// 李镇希
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int type { get; set; }
+    }
+
+     
 }

TEAMModelOS/Controllers/Third/Sc/ScDataInitController.cs

@@ -358,14 +358,18 @@ namespace TEAMModelOS.Controllers.Third
         {
             if (!request.TryGetProperty("accessConfig", out JsonElement accessConfig)) return BadRequest();
             if (!request.TryGetProperty("areaId", out JsonElement areaId)) return BadRequest();
-            if (!request.TryGetProperty("ignoreSchools", out JsonElement ignoreSchools)) return BadRequest();
             if (!request.TryGetProperty("city", out JsonElement city)) return BadRequest();
             if (!request.TryGetProperty("dist", out JsonElement dist)) return BadRequest();
             List<ScSchool> schools = null;
             List<ScSchool> matchSchools = null;
             int status = -1; string json = null;
             Dictionary<string, object> dict = new Dictionary<string, object> { { "accessConfig", $"{accessConfig}" }, { "areaId", $"{areaId}" } };
-            List<IdNameCode> ignore = ignoreSchools.ToObject<List<IdNameCode>>();
+            List<School> ignore = new List<School>();
+            await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<School>(queryText: $"select value(c) from c where c.areaId='{areaId}'",
+                requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey("Base") }))
+            {
+                ignore.Add(item);
+            }
             (status, json) = await _httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetSchoolList");
             if (status == 200)
             {

TEAMModelOS/Controllers/XTest/TestController.cs

@@ -653,10 +653,11 @@ namespace TEAMModelOS.Controllers
         [HttpPost("get-ip")]
         public async Task<IActionResult> GetIp(JsonElement request)
         {
-           List<TmdInfo> tmds= request.ToObject<List<TmdInfo>>();
-            ///获取真实的名称 
-            var content = new StringContent(tmds.Select(x=>x.id).ToJsonString(), Encoding.UTF8, "application/json");
-            string json = await _coreAPIHttpService.GetUserInfos(content);
+            LessonBase lessonBases = request.ToObject< LessonBase>();
+
+            //List<TmdInfo> tmds= request.ToObject<List<TmdInfo>>();
+            //var content = new StringContent(tmds.Select(x=>x.id).ToJsonString(), Encoding.UTF8, "application/json");
+            //string json = await _coreAPIHttpService.GetUserInfos(content);
 
            
             //string _researchKey = Regex.Replace($"{request.GetProperty("key")}", "[ \\[ \\] \\^ \\-|（）【】/' {}_*×――(^)$%~!@#$…&%￥—+=<>《》!！??？:：•`·、。，；,.;\"‘’“”-]", " ");
@@ -664,7 +665,7 @@ namespace TEAMModelOS.Controllers
             //var token = await CoreTokenExtensions.CreateAccessToken("c7317f88-7cea-4e48-ac57-a16071f7b884", "kguxh:V.PLmxBdaI@jnrTrDSth]A3346", "China");
             //string ip = await _searcher.SearchIpAsync($"{request.GetProperty("ip")}");
            // return Ok(new { activity, ip, token.AccessToken,token.TokenType,token.IdToken, mm });
-            return Ok(json);
+            return Ok(lessonBases);
         }
 
         /// 删除