Merge branch 'PL/develop-BI' into develop

TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -34,7 +34,6 @@ using Microsoft.Identity.Client;
 using TEAMModelOS.SDK.Models.Dtos;
 using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml.Wordprocessing;
-using static TEAMModelBI.Controllers.BISchool.BatchSchoolController;
 using DocumentFormat.OpenXml.Bibliography;
 using HTEXLib;
 
@@ -470,8 +469,8 @@ namespace TEAMModelBI.Controllers.BISchool
                     await _dingDing.SendBotMsg($"BI，{_option.Location} \n 单个建校信息：{noticeDD}", GroupNames.成都开发測試群組);
 
                 //v2通知
-                Teacher targetTeacher = await cosmosClient.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>($"1", new PartitionKey($"Base"));
-                _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = targetTeacher.id, name = targetTeacher.name, code = targetTeacher.lang } }, "transfer-admin_school", Constant.NotifyType_IES5_Management, new Dictionary<string, object> { { "tmdname", "账号名称" }, { "schooName", "学校名称" }, { "schoolId", $"学校id" }, { "tmdid", "账号id" } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                Teacher targetTeacher = await cosmosClient.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>($"{_tmdId}", new PartitionKey($"Base"));
+                _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = targetTeacher.id, name = targetTeacher.name, code = targetTeacher.lang } }, "transfer-admin_school", Constant.NotifyType_IES5_Management, new Dictionary<string, object> { { "tmdname", $"{_tmdName}" }, { "schooName", "学校名称" }, { "schoolId", $"学校id" }, { "tmdid", "账号id" } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
 
                 //保存操作记录
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
@@ -1462,12 +1461,42 @@ namespace TEAMModelBI.Controllers.BISchool
             }
 
             List<Period> periods = new();
-            period.ForEach(x =>
+            if (period.Count > 0)
+            {
+                period.ForEach(x =>
+                {
+                    periods.Add(new Period
+                    {
+                        id = Guid.NewGuid().ToString(),
+                        name = x,
+                        campusId = campusId,
+                        semesters = new List<Semester>() { new Semester { name = schoolConfig.semester[0].term, start = schoolConfig.semester[0].start, month = schoolConfig.semester[0].month, day = schoolConfig.semester[0].day, id = Guid.NewGuid().ToString() },
+                        new Semester { name = schoolConfig.semester[1].term, start = schoolConfig.semester[1].start, month = schoolConfig.semester[1].month, day = schoolConfig.semester[1].day, id = Guid.NewGuid().ToString() } },
+                        subjects = new List<Subject>() {
+                        new Subject { id=Guid.NewGuid().ToString(),name=schoolConfig.PresetSubject[0].name,type=schoolConfig.PresetSubject[0].type },
+                        new Subject { id=Guid.NewGuid().ToString(),name=schoolConfig.PresetSubject[1].name,type=schoolConfig.PresetSubject[1].type },
+                        new Subject { id=Guid.NewGuid().ToString(),name=schoolConfig.PresetSubject[2].name,type=schoolConfig.PresetSubject[2].type }
+                        },
+                        grades = schoolConfig.grades,
+                        analysis = new Analysis()
+                        {
+                            type = new List<ExamSimple>() { new ExamSimple { id = Guid.NewGuid().ToString(), name = schoolConfig.PresetExam[0].type[0].name },
+                        new ExamSimple { id = Guid.NewGuid().ToString(), name =  schoolConfig.PresetExam[0].type[1].name },
+                        new ExamSimple { id = Guid.NewGuid().ToString(), name =  schoolConfig.PresetExam[0].type[2].name },
+                        new ExamSimple { id = Guid.NewGuid().ToString(), name =  schoolConfig.PresetExam[0].type[3].name } },
+                            income = schoolConfig.PresetExam[0].income,
+                            eugenics = schoolConfig.PresetExam[0].eugenics,
+                            touch = schoolConfig.PresetExam[0].touch
+                        }
+                    });
+                });
+            }
+            else 
             {
                 periods.Add(new Period
                 {
                     id = Guid.NewGuid().ToString(),
-                    name = x,
+                    name = "默认学段",
                     campusId = campusId,
                     semesters = new List<Semester>() { new Semester { name = schoolConfig.semester[0].term, start = schoolConfig.semester[0].start, month = schoolConfig.semester[0].month, day = schoolConfig.semester[0].day, id = Guid.NewGuid().ToString() },
                         new Semester { name = schoolConfig.semester[1].term, start = schoolConfig.semester[1].start, month = schoolConfig.semester[1].month, day = schoolConfig.semester[1].day, id = Guid.NewGuid().ToString() } },
@@ -1475,7 +1504,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         new Subject { id=Guid.NewGuid().ToString(),name=schoolConfig.PresetSubject[0].name,type=schoolConfig.PresetSubject[0].type },
                         new Subject { id=Guid.NewGuid().ToString(),name=schoolConfig.PresetSubject[1].name,type=schoolConfig.PresetSubject[1].type },
                         new Subject { id=Guid.NewGuid().ToString(),name=schoolConfig.PresetSubject[2].name,type=schoolConfig.PresetSubject[2].type }
-                    },
+                        },
                     grades = schoolConfig.grades,
                     analysis = new Analysis()
                     {
@@ -1488,7 +1517,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         touch = schoolConfig.PresetExam[0].touch
                     }
                 });
-            });
+            }
 
             return periods;
         }

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -677,9 +677,11 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("scAreaId", out JsonElement scAreaId);
                 jsonElement.TryGetProperty("scPic", out JsonElement scpicture);
                 //jsonElement.TryGetProperty("site", out JsonElement site);//分开部署，就不需要，一站多用时，取消注释
+
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
+
                 ////分开部署，就不需要，一站多用时，取消注释
                 //if ($"{site}".Equals(BIConst.Global))
                 //{
@@ -1599,7 +1601,6 @@ namespace TEAMModelBI.Controllers.BISchool
             var (years, yeare) = TimeHelper.GetStartOrEnd(dateTime, "year");
             var (lastYears, lastYeare) = TimeHelper.GetStartOrEnd(dateTime, "lastYear");
 
-
             int lessAll = 0;  //所以课例
             int lessLastdayCnt = 0;  //昨天的课例
             int lessDayCnt = 0;    //今天的课例
@@ -1636,11 +1637,9 @@ namespace TEAMModelBI.Controllers.BISchool
 
             if (schoolIds.Count > 0)
             {
-
                 string scSql = BICommonWay.ManyScSql("c.school", schoolIds);
 
                 string strSql = "SELECT value(count(c.id)) FROM c where c.pk='LessonRecord'";
-
                 //课例
                 lessAll = await CommonFind.GetSqlValueCount(cosmosClient, "School", $"{strSql} and {scSql}");
 

TEAMModelBI/Controllers/LoginController.cs

@@ -224,7 +224,7 @@ namespace TEAMModelBI.Controllers
                         if(roles.Contains("leader")) isExploit= true;
 
                         //自己写的
-                        id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, item.tmdId?.ToString(), item.tmdName?.ToString(), item.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: isExploit, item.userId?.ToString(), item.name?.ToString(), item.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
+                        id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, item.tmdId?.ToString(), item.tmdName?.ToString(), item.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: isExploit, item.userId?.ToString(), item.name?.ToString(), item.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray());
                     }
                     if (saveInfo.Count > 0)
                     {
@@ -303,7 +303,7 @@ namespace TEAMModelBI.Controllers
                     if (roles.Contains("leader")) isExploit = true;
 
                     //自己写的
-                    id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, ddUserInfo.tmdId?.ToString(), ddUserInfo.tmdName?.ToString(), ddUserInfo.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: isExploit, ddUserInfo.userId?.ToString(), ddUserInfo.name?.ToString(), ddUserInfo.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
+                    id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, ddUserInfo.tmdId?.ToString(), ddUserInfo.tmdName?.ToString(), ddUserInfo.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: isExploit, ddUserInfo.userId?.ToString(), ddUserInfo.name?.ToString(), ddUserInfo.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray());
                 }
 
                 if (Website.Equals(BIConst.Global))
@@ -407,7 +407,7 @@ namespace TEAMModelBI.Controllers
                         //保存操作记录
                         await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{itemUser.tmdName}【{itemUser.tmdId}】醍摩豆账号和{itemUser.name}【{itemUser.userId}】钉钉账户绑定成功", _dingDing, tid: itemUser.tmdId, tname: itemUser.name, twebsite: Website, httpContext: HttpContext);
 
-                        id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, itemUser.tmdId?.ToString(), itemUser.tmdName?.ToString(), itemUser.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: false, itemUser.userId?.ToString(), itemUser.name?.ToString(), itemUser.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
+                        id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, itemUser.tmdId?.ToString(), itemUser.tmdName?.ToString(), itemUser.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: false, itemUser.userId?.ToString(), itemUser.name?.ToString(), itemUser.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray());
                     }
                 }
 
@@ -502,7 +502,7 @@ namespace TEAMModelBI.Controllers
                         else return Ok(new { state = 400, message = "该手机没有注册醍摩豆账号信息" });
                     }
                     //自己写的
-                    id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, itemUser.tmdId?.ToString(), itemUser.tmdName?.ToString(), itemUser.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: false, itemUser.userId?.ToString(), itemUser.name?.ToString(), itemUser.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
+                    id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, itemUser.tmdId?.ToString(), itemUser.tmdName?.ToString(), itemUser.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: false, itemUser.userId?.ToString(), itemUser.name?.ToString(), itemUser.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray());
                 }
                 
                 await table.SaveOrUpdateAll<DingDingUserInfo>(ddUserInfos);

TEAMModelBI/JsonFile/Preset/LangSchoolConfig.json

@@ -3,13 +3,13 @@
     "semester": [
       {
         "term": "Next Semester",
-        "start": 0,
+        "start": 1,
         "month": 3,
         "day": 1
       },
       {
         "term": "Last Semester",
-        "start": 1,
+        "start": 0,
         "month": 9,
         "day": 1
       }
@@ -60,13 +60,13 @@
     "semester": [
       {
         "term": "下学期",
-        "start": 0,
+        "start": 1,
         "month": 3,
         "day": 1
       },
       {
         "term": "上学期",
-        "start": 1,
+        "start": 0,
         "month": 9,
         "day": 1
       }
@@ -117,13 +117,13 @@
     "semester": [
       {
         "term": "下學期",
-        "start": 0,
+        "start": 1,
         "month": 3,
         "day": 1
       },
       {
         "term": "上學期",
-        "start": 1,
+        "start": 0,
         "month": 9,
         "day": 1
       }

TEAMModelOS.FunctionV4/TimeTrigger/IESTimerTrigger.cs

@@ -143,7 +143,7 @@ namespace TEAMModelOS.FunctionV4.TimeTrigger
                                 }
                             }
                             catch (Exception ex) { }
-                            await _dingDing.SendBotMarkdown("防火墙日志记录", $"#### 防火墙日志记录(小时)\n> 记录时间：{pastTime.AddHours(8).ToString("yyyy-MM-dd")}\n> ![screenshot]({dayImage})\n> ###### 发布时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}" +
+                            await _dingDing.SendBotMarkdown("防火墙日志记录", $"#### 防火墙日志记录(天)\n> 记录时间：{pastTime.AddHours(8).ToString("yyyy-MM-dd")}\n> ![screenshot]({dayImage})\n> ###### 发布时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}" +
                             $" [发布地址]({dayPublishUrl}) \n", GroupNames.醍摩豆服務運維群組);
                         }
                     }