update

TEAMModelOS.Extension/HTEX.ScreenClient/Program.cs

@@ -15,6 +15,15 @@ namespace HTEX.ScreenClient
         {
            
             var builder = WebApplication.CreateBuilder(args);
+            //防止编译后的appsettings.json 文件内容，在重新部署的时候，因为不同的环境导致被覆盖的问题，
+            //所以在正式环境中指定appsettings-prod.json一个本地开发环境不存在的文件，以达到不会被覆盖的问题，
+            //即使在生产环境中未配置appsettings-prod.json 也不影响启动，因为会按照appsettings.json的配置启动
+#if !DEBUG
+            builder.Host.ConfigureAppConfiguration((context, config) => {
+                 config.SetBasePath(Directory.GetCurrentDirectory());
+                 config.AddJsonFile("appsettings-prod.json", optional: true, reloadOnChange: true);
+             });
+#endif
             builder.WebHost.UseKestrel(options =>
             {
                 // options.ListenAnyIP(CheckOrNewPort(1883), options => {/*options.UseHttps("Crt/iteden.pfx", "iteden");*/ });

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

@@ -1,4 +1,5 @@
-using System;
+using Google.Protobuf.Collections;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
@@ -288,7 +289,13 @@ namespace TEAMModelOS.SDK.Models
         /// 差異化學習
         /// </summary>
         public int diffential { get; set; } = 0;
+        /// <summary>
+        /// 只會有 1跟0,有進行1個以上的智慧評分活動就是1，反之是0
+        /// </summary>
         public int smartRating { get; set; } = 0;
+        /// <summary>
+        /// 只會有 1跟0,有進行1個以上的協作活動就是1，反之是0
+        /// </summary>
         public int cowork { get; set; }
      
 
@@ -445,17 +452,71 @@ namespace TEAMModelOS.SDK.Models
         /// 互动分类
         /// </summary>
         public LearningCategory learningCategory { get; set; }
+        /// <summary>
+        /// 差異化推送總數
+        /// </summary>
         public int diffPushCount { get; set; }
+        /// <summary>
+        /// 挑人總數
+        /// </summary>
         public int pickOutCount { get; set;}
+        /// <summary>
+        /// 搶權總數
+        /// </summary>
         public int buzzInCount { get; set; }
+        /// <summary>
+        /// 智慧評分活動數
+        /// </summary>
         public int smartRatingCount { get; set;}
+        /// <summary>
+        /// 智慧評分活動參與人數
+        /// </summary>
         public int clientSmartRatingCount { get; set;}
+        /// <summary>
+        /// 协作任务数
+        /// </summary>
         public int coworkTaskCount { get; set;}
+        /// <summary>
+        /// 协作成果数
+        /// </summary>
         public int coworkGroupCount { get; set;}
+        /// <summary>
+        /// 全班参与度
+        /// </summary>
         public int engagementIndexAverge { get; set;}
+        /// <summary>
+        /// 分組平均參與率
+        /// </summary>
         public List<double> grpEngagement { get; set; } = new List<double>();
 
-        ///暂未解析的字段  highRankPerPoint  highRankGrpPoint  highRankExam lowRankExam  highRankEngagement  lowRankEngagement  engagmentDistribution
+        /// <summary>
+        /// 個人計分排名
+        /// </summary>
+        public List<string> highRankPerPoint { get; set;}= new List<string>();
+        /// <summary>
+        /// 小組計分排名
+        /// </summary>
+        public List<string> highRankGrpPoint { get; set; } = new List<string>();
+        /// <summary>
+        /// 測驗表現較好者排名
+        /// </summary>
+        public List<string> highRankExam { get; set; } = new List<string>();
+        /// <summary>
+        /// 測驗表現較弱者排名
+        /// </summary>
+        public List<string> lowRankExam { get; set; } = new List<string>();
+        /// <summary>
+        /// 參與率較高者
+        /// </summary>
+        public List<string> highRankEngagement { get; set; } = new List<string>();
+        /// <summary>
+        /// 參與率較低者
+        /// </summary>
+        public List<string> lowRankEngagement { get; set; } = new List<string>();
+        /// <summary>
+        /// 參與率分布圖數據(HT畫圖表用)
+        /// </summary>
+        public List<string> engagmentDistribution { get; set; } = new List<string>();
     }
 
     public class QuizSummaryList
@@ -503,9 +564,17 @@ namespace TEAMModelOS.SDK.Models
 
         public string name { get; set; }//學生姓名
 
-
+        /// <summary>
+        /// 學生個人智慧評分參與度
+        /// </summary>
         public double smartRatingContribute { get; set; }
+        /// <summary>
+        /// 學生個人協作參與度
+        /// </summary>
         public double coworkContribute { get; set; }
+        /// <summary>
+        /// 學生個人總參與度
+        /// </summary>
         public double engagementIndex { get; set; }
     }
 

TEAMModelOS.SDK/Models/Service/GenPDFService.cs

@@ -519,7 +519,17 @@ namespace TEAMModelOS.SDK
             }
             return (null, null, null);
         }
-
+        /// <summary>
+        /// 生成PDF导出模板的数据文件。
+        /// </summary>
+        /// <param name="_azureRedis"></param>
+        /// <param name="_configuration"></param>
+        /// <param name="_artId"></param>
+        /// <param name="art"></param>
+        /// <param name="studentPdfs"></param>
+        /// <param name="_httpClient"></param>
+        /// <param name="dingDing"></param>
+        /// <returns></returns>
         public static async Task PushScreenTask(AzureRedisFactory _azureRedis, IConfiguration _configuration, string _artId, 
             ArtEvaluation art, List<ArtStudentPdf> studentPdfs,IHttpClientFactory _httpClient,DingDing dingDing)
         {

TEAMModelOS/Controllers/Student/OverallEducationController.cs

@@ -98,7 +98,8 @@ namespace TEAMModelOS.Controllers
 #endif
         public async Task<IActionResult> Overview(JsonElement json)
         {
-            try {
+            try
+            {
                 json.TryGetProperty("studentYear", out JsonElement _studentYear);
                 json.TryGetProperty("grades", out JsonElement _grades);
                 json.TryGetProperty("school", out JsonElement _school);
@@ -764,7 +765,7 @@ namespace TEAMModelOS.Controllers
             }
             catch (Exception ex)
             {
-              await  _dingDing.SendBotMsg($"{ex.Message}\n{ex.StackTrace}",GroupNames.成都开发測試群組);
+              await  _dingDing.SendBotMsg($"{_option.Location},{ex.Message}\n{ex.StackTrace},{json.ToJsonString()}",GroupNames.成都开发測試群組);
 
             }
             return Ok();