Parcourir la source

优化通知,每日信息汇总

Li il y a 2 ans
Parent
commit
3d88264292

+ 2 - 2
TEAMModelBI/Controllers/BICommon/BINoticeController.cs

@@ -223,7 +223,7 @@ namespace TEAMModelBI.Controllers.BICommon
                     theme = $"{theme}",
                     content = $"{content}",
                     crowd = crowd,
-                    crowdIds = idNameCodes.Select(s => s.id).ToList(),
+                    crowdIds = idNameCodes.Select(s => $"{s.id}_{_crowdType}").ToList(),
                     createId = _tmdId,
                     sendTime = sendTime.GetInt64(),//发布时间待解决
                     createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
@@ -238,7 +238,7 @@ namespace TEAMModelBI.Controllers.BICommon
             }
             catch (Exception ex)
             {
-                _ = _dingDing.SendBotMsg($"BI,{_option.Location},notion/PushNotion() \n{ex.Message}\n{ex.StackTrace}\n", GroupNames.成都开发測試群組);
+                //_ = _dingDing.SendBotMsg($"BI,{_option.Location},notion/PushNotion() \n{ex.Message}\n{ex.StackTrace}\n", GroupNames.成都开发測試群組);
                 return BadRequest();
             }
         }

+ 4 - 1
TEAMModelBI/LogLang/en-us.json

@@ -1,3 +1,6 @@
 {
-  "update-log-date": "Apply to join school"
+  "update-log-date": "Apply to join school",
+  "BI-NoticeHave": [ "{title}", "{content}", "{agree}", "refuse" ],
+  "BI-NoticeNothing": [ "{title}", "{content}" ],
+  "BI-NoticeSee": [ "{title}", "{content}", "see" ]
 }

+ 4 - 1
TEAMModelBI/LogLang/zh-cn.json

@@ -1,3 +1,6 @@
 {
-  "update-log-date": "修改"
+  "update-log-date": "修改",
+  "BI-NoticeHave": [ "{title}", "{content}", "{agree}", "refuse" ],
+  "BI-NoticeNothing": [ "{title}", "{content}" ],
+  "BI-NoticeSee": [ "{title}", "{content}","see" ]
 }

+ 4 - 1
TEAMModelBI/LogLang/zh-tw.json

@@ -1,3 +1,6 @@
 {
-  "update-log-date": "申請加入學校通知"
+  "update-log-date": "申請加入學校通知",
+  "BI-NoticeHave": [ "{title}", "{content}", "{agree}", "refuse" ],
+  "BI-NoticeNothing": [ "{title}", "{content}" ],
+  "BI-NoticeSee": [ "{title}", "{content}", "see" ]
 }

+ 1 - 3
TEAMModelBI/TEAMModelBI.csproj

@@ -122,9 +122,7 @@
 	</Target>
 
 	<ProjectExtensions>
-		<VisualStudio>
-			<UserProperties appsettings_1json__JsonSchema="" clientapp_4package_1json__JsonSchema="" />
-		</VisualStudio>
+		<VisualStudio><UserProperties appsettings_1json__JsonSchema="" clientapp_4package_1json__JsonSchema="" loglang_4zh-cn_1json__JsonSchema="https://appliedengdesign.github.io/cnccodes-json-schema/draft/2022-07/schema" /></VisualStudio>
 	</ProjectExtensions>
 </Project>
 

+ 1 - 1
TEAMModelOS.SDK/DI/CoreAPI/CoreAPIHttpService.cs

@@ -380,7 +380,7 @@ namespace TEAMModelOS.SDK
                     client.DefaultRequestHeaders.Add("Authorization", $"Bearer {token.AccessToken}");
                 }
 
-                NotifyData notifyData = new NotifyData
+                NotifyData notifyData = new()
                 {
                     hubName = string.Join(",", bINotice.crowd.types),
                     sender = bINotice.source,

+ 14 - 9
TEAMModelOS.SDK/Models/Cosmos/BI/BICommon/StatsNotice.cs

@@ -27,29 +27,34 @@ namespace TEAMModelOS.SDK.Models.Cosmos.BI.BICommon
         /// </summary>
         public string rangeId { get; set; }
 
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public long createTime { get; set; }
+
+        /// <summary>
+        /// 发送时间
+        /// </summary>
+        public long sendTime { get; set; }
+
         /// <summary>
         /// 学生名单数量
         /// </summary>
-        public List<double> stuCnt{ get; set; }
+        public int stuDayCnt{ get; set; }
 
         /// <summary>
         /// 课堂记录
         /// </summary>
-        public List<double> classroomCnt { get; set; }
+        public int classroomDayCnt { get; set; }
 
         /// <summary>
         /// 评量活动
         /// </summary>
-        public List<double> weighCnt { get; set; }
+        public int weighDayCnt { get; set; }
 
         /// <summary>
         /// 作业活动
         /// </summary>
-        public List<double> homeworkCnt { get; set; }
-
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        public long upTime { get; set; }
+        public int homeworkDayCnt { get; set; }
     }
 }

+ 4 - 8
TEAMModelOS.SDK/Models/Service/BI/BIStatsNotice.cs

@@ -49,25 +49,21 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                     statsNotice.id = $"{dateOff.Year}-{id}";
                     statsNotice.type = idType;
                     statsNotice.rangeId = id;
-                    statsNotice.stuCnt = new double[366].ToList();
-                    statsNotice.classroomCnt = new double[366].ToList();
-                    statsNotice.weighCnt = new double[366].ToList();
-                    statsNotice.homeworkCnt = new double[366].ToList();
                 }
 
                 switch (type)
                 {
                     case "Student":
-                        statsNotice.stuCnt[dateOff.DayOfYear - 1] = count;
+                        statsNotice.stuDayCnt += count;
                         break;
                     case "Classroom":
-                        statsNotice.classroomCnt[dateOff.DayOfYear - 1] = count;
+                        statsNotice.classroomDayCnt += count;
                         break;
                     case "Weigh":
-                        statsNotice.weighCnt[dateOff.DayOfYear - 1] = count;
+                        statsNotice.weighDayCnt += count;
                         break;
                     case "Homework":
-                        statsNotice.homeworkCnt[dateOff.DayOfYear - 1] = count;
+                        statsNotice.homeworkDayCnt = count;
                         break;
                 }
                 if (resStsInfo.Status == 200)