HiITEdenX 2 anni fa
parent
commit
3f1c042d2a

+ 3 - 2
TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -31,6 +31,7 @@ using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
 using static TEAMModelOS.SDK.StatisticsService;
 using TEAMModelOS.SDK.DI.CoreAPI;
 using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Wordprocessing;
 
 namespace TEAMModelOS.FunctionV4.ServiceBus
 {
@@ -1692,7 +1693,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                                     await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
                                                    
                                                     _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = teacher.id, name = teacher.name, code = teacher.lang } }, "expire-private_lessonRecord", Constant.NotifyType_IES5_Course,
-                                                                 new Dictionary<string, object> { { "tmdname", teacher.name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
+                                                                 new Dictionary<string, object> { { "tmdname", teacher.name }, { "tmdid", teacher.name }, { "lessonId", lessonRecordExpire.id }, { "lessonName", lessonRecordExpire. name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
                                                     var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
                                                     List<ChangeRecord> records = await table.FindListByDict<ChangeRecord>(new Dictionary<string, object>() { { "RowKey", lessonRecordExpire.id } });
                                                     if (records.Count <= 0)
@@ -1857,7 +1858,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
 
                 Teacher targetTeacher = await client.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 } }, "expire-private_lessonRecord", Constant.NotifyType_IES5_Course,
-                             new Dictionary<string, object> { { "tmdname", tmdname }  }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
+                             new Dictionary<string, object> { { "tmdname", tmdname }, { "tmdid",tmdid}, { "lessonId", id }, { "lessonName",name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
             }
             catch (Exception ex)
             {

+ 4 - 4
TEAMModelOS.SDK/Context/Constant/Constant.cs

@@ -23,10 +23,10 @@ namespace TEAMModelOS.SDK.DI
         public static readonly int private_lesson_expire = 7;
         public static readonly int school_lesson_expire = 7;
 
-        public static readonly string NotifyType_IES5_Management = "IES5_Management";
-        public static readonly string NotifyType_IES5_Course = "IES5_Course";
-        public static readonly string NotifyType_IES5_Task = "IES5_Task";
-        public static readonly string NotifyType_IES5_Contect = "IES5_Contect";
+        public static readonly string NotifyType_IES5_Management = "IES_Management";
+        public static readonly string NotifyType_IES5_Course = "IES_Course";
+        public static readonly string NotifyType_IES5_Task = "IES_Task";
+        public static readonly string NotifyType_IES5_Contect = "IES_Contect";
 
         public static readonly Dictionary<string, string> DefaultPeriod = new Dictionary<string, string> { 
             {"pre" ,"学前"},

+ 15 - 2
TEAMModelOS.SDK/DI/CoreAPI/CoreAPIHttpService.cs

@@ -134,6 +134,7 @@ namespace TEAMModelOS.SDK
                 var clientID = _configuration.GetValue<string>("HaBookAuth:CoreService:clientID");
                 var clientSecret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
                 var url = _configuration.GetValue<string>("HaBookAuth:CoreAPI");
+                string site = location;
                 if (location.Contains("China"))
                 {
                     location = "China";
@@ -152,13 +153,20 @@ namespace TEAMModelOS.SDK
                     if (JsonDocument.TryParseValue(ref reader, out JsonDocument jsonDoc) && jsonDoc.RootElement.TryGetProperty(notifyCode, out JsonElement json))
                     {
                         List<string> msgs = json.ToObject<List<string>>();
+                        replaceData.Add("notifyCode", notifyCode);
+                        replaceData.Add("location", site);
+                        if (replaceData.ContainsKey("schoolId"))
+                        {
+                            replaceData.Add("scope", "school");
+                        }
+                        else { replaceData.Add("scope", "private"); }
                         if (msgs.IsNotEmpty())
                         {
                             var tags = group.list.Select(x => $"{x.id}_{notifyType}");
                             NotifyData notifyData = new NotifyData
                             {
                                 hubName = "hita5",
-                                sender = "ies5",
+                                sender = "IES",
                                 tags = tags.ToList(),
                                 title = msgs[0],
                                 eventId = $"{notifyCode}-{_snowflakeId.NextId()}",
@@ -176,7 +184,12 @@ namespace TEAMModelOS.SDK
                                 });
                                 notifyData.body = msgs[1];
                             }
-                            _ = _httpClient.PostAsJsonAsync(url, notifyData);
+                           
+                            HttpResponseMessage responseMessage = _httpClient.PostAsJsonAsync($"{url}/service/PushNotify", notifyData).Result;
+                            if (responseMessage.StatusCode == HttpStatusCode.OK)
+                            {
+                                string content =   responseMessage.Content.ReadAsStringAsync().Result;
+                            }
                         }
                     }
                 }

+ 2 - 1
TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -639,7 +639,8 @@ namespace TEAMModelOS.SDK.Models.Service
 
                     Teacher targetTeacher = await client.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 } }, "expire-school_lessonRecord", Constant.NotifyType_IES5_Course,
-                                 new Dictionary<string, object> { { "tmdname", teacher.name }, { "schoolName", schoolBase.name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
+                                 new Dictionary<string, object> { { "tmdid", teacher.id }, { "tmdname", teacher.name }, { "schoolName", schoolBase.name }, 
+                                     { "schoolId", $"{school}" },{ "lessonId",lessonRecord.id },{ "lessonName",lessonRecord.name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
                     var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
                     List<ChangeRecord> records = await table.FindListByDict<ChangeRecord>(new Dictionary<string, object>() { { "RowKey", lessonRecord.id } });
                     if (records.Count <= 0)

+ 2 - 3
TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -26,7 +26,6 @@ using Microsoft.Extensions.Hosting;
 using OpenXmlPowerTools;
 using TEAMModelOS.SDK.Models.Dtos;
 using Microsoft.AspNetCore.Hosting;
-using DocumentFormat.OpenXml.Wordprocessing;
 
 namespace TEAMModelOS.Controllers
 {
@@ -187,7 +186,7 @@ namespace TEAMModelOS.Controllers
                         idNameCodes.Add(item);
                     }
                     _coreAPIHttpService.PushNotify(idNameCodes, $"{code}_school", Constant.NotifyType_IES5_Course,
-                              new Dictionary<string, object> { { "tmdname", name }, { "groupListName", data.stuList.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                              new Dictionary<string, object> { { "tmdid", id }, { "tmdname", name }, { "groupListName", data.stuList.name }, { "groupListId", data.stuList.id } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 }
                 return Ok(new { data.stuList, data.status });
             }
@@ -279,7 +278,7 @@ namespace TEAMModelOS.Controllers
                         idNameCodes.Add(item);
                     }
                     _coreAPIHttpService.PushNotify(idNameCodes, $"{code}_school", Constant.NotifyType_IES5_Course,
-                              new Dictionary<string, object> { { "tmdname", _name }, { "groupListName", data.stuList.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                              new Dictionary<string, object> { { "tmdid",userid },{ "tmdname", _name }, { "groupListName", data.stuList.name } , { "groupListId", data.stuList.id } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 }
                 return Ok(new { data.stuList, data.status });
             }

+ 2 - 2
TEAMModelOS/Controllers/Both/ShareController.cs

@@ -183,7 +183,7 @@ namespace TEAMModelOS.Controllers
                                     var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
                                     Teacher targetTeacher = await client.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} }, $"{x.type}_syllabus", Constant.NotifyType_IES5_Task,
-                                                 new Dictionary<string, object> { { "tmdname", x.issuerName }, { "volumeName", x.volumeName }, { "syllabusName", x.syllabusName } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                                 new Dictionary<string, object> { { "tmdname", x.issuerName }, { "tmdid", x.issuer }, { "volumeId", x.volumeId }, { "syllabusId", x.id }, { "volumeName", x.volumeName }, { "syllabusName", x.syllabusName } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                               
                                 }
                                 await client.GetContainer(Constant.TEAMModelOS, "School").UpsertItemAsync<Syllabus>(syllabus, new PartitionKey($"Syllabus-{request.school}"));
@@ -278,7 +278,7 @@ namespace TEAMModelOS.Controllers
                                     var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
                                     Teacher targetTeacher = await client.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 } }, $"{x.type}_syllabus", Constant.NotifyType_IES5_Task,
-                                                 new Dictionary<string, object> { { "tmdname", x.issuerName }, { "volumeName", x.volumeName }, { "syllabusName", x.syllabusName } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                                 new Dictionary<string, object> { { "tmdname", x.issuerName } , { "tmdid", x.issuer },  { "volumeId", x.volumeId }, { "syllabusId", x.id }, { "volumeName", x.volumeName }, { "syllabusName", x.syllabusName } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
 
                                 }
                                 await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<Syllabus>(syllabusD, new PartitionKey($"Syllabus-{request.issuer}"));

+ 2 - 1
TEAMModelOS/Controllers/Client/HiTAControlller.cs

@@ -1,5 +1,6 @@
 using Azure.Cosmos;
 using Azure.Storage.Blobs.Models;
+using DocumentFormat.OpenXml.Spreadsheet;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -229,7 +230,7 @@ namespace TEAMModelOS.Controllers.Client
                 idNameCodes.Add(item);
             }
             _coreAPIHttpService.PushNotify(idNameCodes, $"{bizcode}_school", Constant.NotifyType_IES5_Management,
-                      new Dictionary<string, object> { { "tmdname", name }, { "schooName", schoolInfo.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                      new Dictionary<string, object> { { "tmdname", teacher.name }, { "schooName", schoolInfo.name }, { "schoolId", $"{school}" }, { "tmdid", teacher.id } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
             return Ok(new { schoolTeacher.roles, schoolTeacher.status, school = $"{school}", schoolInfo.name, schoolInfo.picture });
         }
 

+ 3 - 2
TEAMModelOS/Controllers/Common/ExamController.cs

@@ -32,6 +32,7 @@ using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Models.Dtos;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
+using static TEAMModelOS.SDK.SchoolService;
 
 namespace TEAMModelOS.Controllers
 {
@@ -2908,7 +2909,7 @@ namespace TEAMModelOS.Controllers
                                             idNameCodes.Add(idNameCode);
                                         }
                                         _coreAPIHttpService.PushNotify(idNameCodes, $"{bizcode}_school", Constant.NotifyType_IES5_Task,
-                                                  new Dictionary<string, object> { { "tmdname", name }, { "schooName", schname } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                                  new Dictionary<string, object> { { "tmdname", name }, { "schooName", schname }, { "schoolId", $"{school}" }, { "tmdid", userid } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                                         return Ok(new { msg = "需要仲裁", code = 2 });
                                     }
                                     if (item.scores.Count > 0)
@@ -3073,7 +3074,7 @@ namespace TEAMModelOS.Controllers
                     idNameCodes.Add(item);
                 }
                 _coreAPIHttpService.PushNotify(idNameCodes, $"{bizcode}_school", Constant.NotifyType_IES5_Task,
-                          new Dictionary<string, object> { { "tmdname", name }, { "schooName", schname } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                          new Dictionary<string, object> { { "tmdname", name }, { "schooName", schname }, { "schoolId", $"{school}" }, { "tmdid", userid } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 /* scoring.type = 2;
                  scoring.err = err.GetString();*/
             }

+ 3 - 1
TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -26,6 +26,7 @@ using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.SDK.DI.CoreAPI;
 using Microsoft.AspNetCore.Hosting;
+using Azure.Storage.Blobs.Models;
 
 namespace TEAMModelOS.Controllers.Learn
 {
@@ -807,9 +808,10 @@ namespace TEAMModelOS.Controllers.Learn
                                     var location = _option.Location;
                                     var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
                                   Teacher teacherData= await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>(homework.creatorId, new PartitionKey("Base"));
+                                    School schoolData = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>(school, new PartitionKey("Base"));
                                     _coreAPIHttpService.PushNotify(new List<IdNameCode> { 
                                         new IdNameCode { id = teacherData.id,name=teacherData.name,code=teacherData.lang} }, "submitanswer_homework", Constant.NotifyType_IES5_Course,
-                               new Dictionary<string, object> { { "tmdname", name }, { "homeworkName", homework.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                               new Dictionary<string, object> { { "tmdname", name }, { "schooName", schoolData.name }, { "schoolId", $"{school}" }, { "tmdid", userid }, { "homeworkId", homework.id },  { "homeworkName", homework.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                                 }
                                 //TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO 写入方便教师查看的作答记录
                                 try

+ 2 - 1
TEAMModelOS/Controllers/School/CorrectController.cs

@@ -30,6 +30,7 @@ using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Models.Dtos;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
+using DocumentFormat.OpenXml.Office2010.Excel;
 
 namespace TEAMModelOS.Controllers
 {
@@ -260,7 +261,7 @@ namespace TEAMModelOS.Controllers
                     idNameCodes.Add(item);
                 }
                 _coreAPIHttpService.PushNotify(idNameCodes, $"{bizcode}_school", Constant.NotifyType_IES5_Task,
-                                 new Dictionary<string, object> { { "tmdname", name }, { "schooName", schname } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                 new Dictionary<string, object> { { "tmdname", name }, { "schooName", schname }, { "schoolId", $"{school}" }, { "tmdid", userid } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 return Ok(new { vote = request });
             }
             catch (Exception e)

+ 3 - 1
TEAMModelOS/Controllers/School/SchoolController.cs

@@ -30,6 +30,8 @@ using TEAMModelOS.SDK.DI.CoreAPI;
 using Azure.Storage.Blobs.Models;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers
 {
@@ -1809,7 +1811,7 @@ namespace TEAMModelOS.Controllers
                         var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
 
                         _coreAPIHttpService.PushNotify(inviteids, $"remove_school", Constant.NotifyType_IES5_Management,
-                                     new Dictionary<string, object> { { "tmdname", adminName }, { "schooName", schoolBase.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                        new Dictionary<string, object> { { "tmdname", adminName }, { "schooName", schoolBase.name }, { "schoolId", $"{_schoolId}" }, { "tmdid", adminId } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                     }
                     break;
             }

+ 4 - 3
TEAMModelOS/Controllers/School/SchoolTeacherController.cs

@@ -26,6 +26,7 @@ using DocumentFormat.OpenXml.Wordprocessing;
 using static TEAMModelOS.Controllers.FixDataController;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
+using DocumentFormat.OpenXml.Office2010.Excel;
 
 namespace TEAMModelOS.Controllers
 {
@@ -747,7 +748,7 @@ namespace TEAMModelOS.Controllers
                 var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
 
                 _coreAPIHttpService.PushNotify(ids, $"{bizcode}_school", Constant.NotifyType_IES5_Management,
-                                 new Dictionary<string, object> { { "tmdname", tname }, { "schooName", schname } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                 new Dictionary<string, object> { { "tmdname", tname }, { "schooName", schname }, { "schoolId", $"{school_code}" } , { "tmdid",tid} }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 return Ok(new { exist = keys });
             }
             catch (Exception ex)
@@ -917,7 +918,7 @@ namespace TEAMModelOS.Controllers
                 var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); 
 
                 _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = teacher.id, name=teacher.name, code= teacher.lang} }, $"{bizcode}_school", Constant.NotifyType_IES5_Management,
-                                 new Dictionary<string, object> { { "tmdname", tname }, { "schooName", schname } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                 new Dictionary<string, object> { { "tmdname", tname }, { "schooName", schname }, { "schoolId", $"{school_code}" },   { "tmdid", tid } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 return Ok(new { });
             }
             catch (Exception ex)
@@ -1034,7 +1035,7 @@ namespace TEAMModelOS.Controllers
                     var code = await _notificationService.SendNotification(clientID, clientSecret, location, url, notification);
 
                     _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = teacher.id, name = teacher.name, code = teacher.lang } }, $"remove_school", Constant.NotifyType_IES5_Management,
-                                     new Dictionary<string, object> { { "tmdname", tname }, { "schooName", schname } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                     new Dictionary<string, object> { { "tmdname", tname }, { "schooName", schname }, { "schoolId", $"{school_code}" },    { "tmdid", tid } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                 }
                 return Ok(new { });
             }

+ 3 - 2
TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -32,6 +32,7 @@ using System.Text;
 using Microsoft.Azure.Cosmos.Table;
 using TEAMModelOS.SDK.DI.CoreAPI;
 using Microsoft.AspNetCore.Hosting;
+using DocumentFormat.OpenXml.Office2010.Excel;
 
 namespace TEAMModelOS.Controllers
 {
@@ -270,7 +271,7 @@ namespace TEAMModelOS.Controllers
                                 }
                                 Teacher targetTeacher = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>($"{_targetTecher}", 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", name },{ "schooName", schoolBase.name } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
+                                    new Dictionary<string, object> { { "tmdname", name },{ "schooName", schoolBase.name }, { "schoolId", $"{school}" } , { "tmdid", userid } }, _option.Location, _configuration, _dingDing, _environment.ContentRootPath);
                                 _ = _azureStorage.SaveLog("transfer-admin-role", new { request, userid, name, school, schoolName = schoolBase.name, targetTecher = _targetTecher, }.ToJsonString(), bizId: $"{userid}-{schoolBase.id}-{_targetTecher}", httpContext: HttpContext, dingDing: _dingDing, scope: "school");
                                 return Ok(new { status = 1 });
                             }
@@ -1182,7 +1183,7 @@ namespace TEAMModelOS.Controllers
                             idNameCodes.Add(item);
                         }
                         _coreAPIHttpService.PushNotify(idNameCodes, $"{code}_school", Constant.NotifyType_IES5_Management,
-                                  new Dictionary<string, object> { { "tmdname", name }, { "schooName", schoolBase.name } }, _option.Location,_configuration,_dingDing, _environment.ContentRootPath) ;
+                                  new Dictionary<string, object> {{ "tmdname", name }, { "schooName", schoolBase.name }, { "schoolId",$"{school_code}" },{ "tmdid",id} }, _option.Location,_configuration,_dingDing, _environment.ContentRootPath) ;
                     }
                     return Ok(new { stauts = 1 });
                 }