优化操作日志类型

TEAMModelBI/Controllers/BIAbility/AbilityMgmtController.cs

@@ -133,7 +133,7 @@ namespace TEAMModelBI.Controllers.BIAbility
                 if (response.Status == 200)
                 {
                     //保存操作记录
-                    await _azureStorage.SaveBILog("ability-del", $"{_tmdName}【{_tmdId}】删除册别，删除ID:{id}", _dingDing, httpContext: HttpContext);
+                    await _azureStorage.SaveBILog("abilityTask-del", $"{_tmdName}【{_tmdId}】删除册别，删除ID:{id}", _dingDing, httpContext: HttpContext);
 
                     return Ok(new { state = 200 });
                 }
@@ -199,12 +199,12 @@ namespace TEAMModelBI.Controllers.BIAbility
                     {
                         return Ok(new { state = 2, mesages = "参数异常" });
                     }
-                    tempType = "ability-add";
                     ability.id = Guid.NewGuid().ToString();
                     ability.creatorId = string.IsNullOrEmpty($"{ability.creatorId}") ? $"{_tmdId}" : ability.creatorId;
                     ability.creatorName = string.IsNullOrEmpty($"{ability.creatorName}") ? $"{_tmdName}" : ability.creatorName;
                     tempAbility = await azureClient.GetContainer("TEAMModelOS", "Normal").CreateItemAsync(ability, new PartitionKey(ability.code));
                     stringBuilder.Append($"新增册别信息，册别编号：{tempAbility.id}，册别名称：{tempAbility.name}");
+                    tempType = "ability-add";
                 }
                 //更新册别
                 else

TEAMModelBI/Controllers/BIAbility/AbilityTaskMgmtController.cs

@@ -163,7 +163,7 @@ namespace TEAMModelBI.Controllers.BIAbility
                             abilityTask.standard = $"{recordAbilityTask.standard}";
                             await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AbilityTask>(abilityTask, new Azure.Cosmos.PartitionKey($"AbilityTask-{recordAbilityTask.standard}"));
                             msgBuilder.Append($"新增章节功能，章节ID：{abilityTask.id} 分区键：{abilityTask.code}");
-                            type = "abilityTask-Add";
+                            type = "abilityTask-add";
                         }
                         else
                         {

TEAMModelBI/Controllers/BINormal/AppCompanyController.cs

@@ -114,6 +114,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
                 StringBuilder stringBuilder = new($"{loginName}【{loginId}】");
+                string type = "";
                 //新建
                 if (string.IsNullOrEmpty($"{appCompany.id}"))
                 {
@@ -124,6 +125,7 @@ namespace TEAMModelBI.Controllers.BINormal
                     appCompany.audit = -1;
                     appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AppCompany>(appCompany, new PartitionKey(appCompany.code));
                     stringBuilder.Append($"新增应用,应用ID:{appCompany.id},应用名称:{appCompany.name}");
+                    type = "appCompany-add";
                 }
                 //修改
                 else
@@ -135,12 +137,13 @@ namespace TEAMModelBI.Controllers.BINormal
                         appCompany.ttl = -1;
                         appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AppCompany>(appCompany, appCompany.id, new PartitionKey(appCompany.code));
                         stringBuilder.Append($"修改应用,应用ID:{appCompany.id},应用名称:{appCompany.name}");
+                        type = "appCompany-update";
                     }
                     else return Ok(new { state = 404, msg = "未找到该id相关的企业应用信息" });
                 }
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("appcompany-set-info", stringBuilder.ToString(), _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog(type, stringBuilder.ToString(), _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200, appCompany });
             }
             catch (Exception e)
@@ -256,7 +259,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 else return Ok(new { state = 404, msg = "appIds参数错误" });
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("appcompany-get-applyapi", strMsg.ToString(), _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
 
                 if (haveIds.Count > 0)
                     return Ok(new { state = 201, msg = "部分应用审核失败！", haveIds });
@@ -318,7 +321,6 @@ namespace TEAMModelBI.Controllers.BINormal
                                 sendWhom.Add(appCompany.id);
                                 bizcode = "applyapi";
                                 if (haveApi.Count > 0) strMsg.Append($"已有存在的api:{haveApi.ToJsonString()}。");
-
                                 break;
                             case "audit":
                                 if (!jsonElement.TryGetProperty("isAudit", out JsonElement isAudit)) return BadRequest();
@@ -383,7 +385,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("appcompany-set-info", strMsg.ToString(), _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
 
                 if (haveApi.Count > 0 || noAudit.Count > 0)
                     return Ok(new { state = 201, msg = "部分成功", haveApi, noAudit });
@@ -510,7 +512,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("appcompany-set-info", strMsg.ToString(), _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
                 if (haveSchool.Count > 0) return Ok(new { state = 201, msg = "已存在学校，无须申请！", haveSchool });
                 else return Ok(new { state = 200 });
             }

TEAMModelBI/Controllers/BINormal/BIOpenApiController.cs

@@ -8,8 +8,10 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Filter;
+using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 
 namespace TEAMModelBI.Controllers.BINormal
@@ -92,6 +94,9 @@ namespace TEAMModelBI.Controllers.BINormal
             try
             {
                 var cosmosClient = _azureCosmos.GetCosmosClient();
+                var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
+                StringBuilder strMsg = new($"{loginName}【{loginId}】");
+                string type = "";
                 if (string.IsNullOrEmpty(openApi.id))
                 {
                     openApi.id = Guid.NewGuid().ToString();
@@ -100,6 +105,8 @@ namespace TEAMModelBI.Controllers.BINormal
                     openApi.type = string.IsNullOrEmpty($"{openApi.type}") ? openApi.type : 1;
                     openApi.createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
                     openApi = await cosmosClient.GetContainer("TEAMModelOS", "Normal").CreateItemAsync<BIOpenApi>(openApi, new PartitionKey("Api"));
+                    strMsg.Append($"新增开放API接口：名称：{openApi.name}/ID：{openApi.id}/接口：{openApi.url}");
+                    type = "openApi-add";
                 }
                 else
                 {
@@ -110,9 +117,13 @@ namespace TEAMModelBI.Controllers.BINormal
                         openApi.pk = "Api";
                         openApi.code = "Api";
                         openApi = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<BIOpenApi>(openApi, openApi.id, new PartitionKey("Api"));
+                        strMsg.Append($"修改开放API接口：名称：{openApi.name}/ID：{openApi.id}/接口：{openApi.url}");
+                        type = "openApi-update";
                     }
                     else return Ok(new { state = 404, msg = "未找到该id相关的Api信息" });
                 }
+                //保存操作记录
+                await _azureStorage.SaveBILog(type, strMsg.ToString(), _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200, openApi });
             }

TEAMModelBI/Controllers/BINormal/CompanyController.cs

@@ -99,6 +99,7 @@ namespace TEAMModelBI.Controllers.BINormal
                 StringBuilder strMsg = new($"{loginName}【{loginId}】");
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 string salt = Utils.CreatSaltString(8);
+                string type = "";
                 //新增企业信息
                 if (string.IsNullOrEmpty(company.id))
                 {
@@ -130,8 +131,9 @@ namespace TEAMModelBI.Controllers.BINormal
                         company.salt = salt;
                         company.password = string.IsNullOrWhiteSpace(company.password) ? Utils.HashedPassword("123456", salt) : Utils.HashedPassword(company.password, salt);//Password，若梦没有则是默认密码：123456
                         company.createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-                        strMsg.Append($"新增企业基础信息：名称：{company.name}【{company.id}】");
                         await cosmosClient.GetContainer("TEAMModelOS", "Normal").CreateItemAsync<Company>(company, new PartitionKey(company.code));
+                        strMsg.Append($"新增企业基础信息：名称：{company.name}【{company.id}】");
+                        type = "company-add";
                     }
                 }
                 //修改企业信息
@@ -146,14 +148,15 @@ namespace TEAMModelBI.Controllers.BINormal
                         company.salt = salt;
                         company.password = string.IsNullOrWhiteSpace(company.password) ? Utils.HashedPassword("123456", salt) : Utils.HashedPassword(company.password, salt);//Password，若梦没有则是默认密码：123456
 
-                        strMsg.Append($"修改企业基础信息：名称：{company.name}【{company.id}】");
                         company = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<Company>(company, company.id, new PartitionKey(company.code));
+                        strMsg.Append($"修改企业基础信息：名称：{company.name}【{company.id}】");
+                        type = "company-update";
                     }
                     else return Ok(new { state = 404, msg = "未找到该id相关的企业信息" });
                 }
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("appcompany-set-info", strMsg.ToString(), _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog(type, strMsg.ToString(), _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200, company });
             }

TEAMModelBI/Controllers/BISchool/AreaRelevantController.cs

@@ -109,7 +109,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 School school = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<School>(tempSchool, tempSchool.id, new PartitionKey("Base"));
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("area-update", $"{_tmdName}【{_tmdId}】已操作学校({schoolId})移除该区域", _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("school-update", $"{_tmdName}【{_tmdId}】已操作学校({schoolId})移除该区域", _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200, school });
             }

TEAMModelBI/Controllers/BISchool/BatchAreaController.cs

@@ -665,7 +665,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //发送站内发送消息
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("standard-cut", $"{_tmdName}【{_tmdId}】已操作【{_oldStandard}】切换至{_newStandard}微能力点，复制标准：{_newStandard}", _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("area-cut", $"{_tmdName}【{_tmdId}】已操作【{_oldStandard}】切换至{_newStandard}微能力点，复制标准：{_newStandard}", _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200 });
             }

TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -793,7 +793,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("TeacherRoles-update", $"{_tmdName}【{_tmdId}】修改学校功能，修改的学校:{_schoolId},{_type},{picture},{size},{string.Join("|", assistId.ToArray())}", _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("school-update", $"{_tmdName}【{_tmdId}】修改学校功能，修改的学校:{_schoolId},{_type},{picture},{size},{string.Join("|", assistId.ToArray())}", _dingDing, httpContext: HttpContext);
 
 
                 return Ok(new { state = 200 });

TEAMModelBI/Controllers/BISchool/RoomController.cs

@@ -70,7 +70,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     if (!string.IsNullOrEmpty($"{serial}")) { stringBudeler.Append($"绑定。"); } else { stringBudeler.Append($"解绑。"); }
 
                     //保存操作记录
-                    await _azureStorage.SaveBILog("room-bindProduct", $"{_tmdName}【{_tmdId}】将{roomInfo.id}教师和{serial}产品绑定", _dingDing, httpContext: HttpContext);
+                    await _azureStorage.SaveBILog("room-update", $"{_tmdName}【{_tmdId}】将{roomInfo.id}教师和{serial}产品绑定", _dingDing, httpContext: HttpContext);
                 }
                 else
                 {

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -128,7 +128,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("school-join", $"{_tmdName}【{_tmdId}】操作学校加入区域功能，加入的区域：{standard},学校ID：{string.Join("|", schoolCodes.ToArray())}", _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("school-update", $"{_tmdName}【{_tmdId}】操作学校加入区域功能，加入的区域：{standard},学校ID：{string.Join("|", schoolCodes.ToArray())}", _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200 });
             }
@@ -462,7 +462,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 //保存操作记录
-                await _azureStorage.SaveBILog("area-add", $"{_tmdName}【{_tmdId}】移交顾问给{newSchoolTeacher.name}【{newSchoolTeacher.id}】", _dingDing, httpContext: HttpContext);
+                await _azureStorage.SaveBILog("schoolTeacher-add", $"{_tmdName}【{_tmdId}】移交顾问给{newSchoolTeacher.name}【{newSchoolTeacher.id}】", _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200 });
             }
             else { return Ok(new { status = 201, msg = $"{_tmdName}【{_tmdId}】账号不是顾问" }); }
@@ -541,7 +541,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         SchoolTeacher st = await cosmosClient.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<SchoolTeacher>(schoolTeacher, schoolTeacher.id, new PartitionKey(schoolTeacher.code));
 
                         //保存操作记录
-                        await _azureStorage.SaveBILog("area-add", $"{_tmdName}【{_tmdId}】顾问把{_adminTmdName}【{_adminTmdId}】设置学校id为{_schoolId}管理员。", _dingDing, httpContext: HttpContext);
+                        await _azureStorage.SaveBILog("schoolTeacher-update", $"{_tmdName}【{_tmdId}】账户把{_adminTmdName}【{_adminTmdId}】设置学校id为{_schoolId}管理员。", _dingDing, httpContext: HttpContext);
                         return Ok(new { state = 200, schoolTeacher = st });
                     }
                     else
@@ -565,7 +565,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
                     schoolTeacher = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").CreateItemAsync<SchoolTeacher>(schoolTeacher, new PartitionKey(schoolTeacher.code));
                     //保存操作记录
-                    await _azureStorage.SaveBILog("area-add", $"{_tmdName}【{_tmdId}】顾问把{_adminTmdName}【{_adminTmdId}】设置学校id为{_schoolId}管理员。", _dingDing, httpContext: HttpContext);
+                    await _azureStorage.SaveBILog("schoolTeacher-add", $"{_tmdName}【{_tmdId}】账户创建{_adminTmdName}【{_adminTmdId}】账户，并设学校管理员。学校ID:{_schoolId}。", _dingDing, httpContext: HttpContext);
                     return Ok(new { status = 200, schoolTeacher });
                 }
             }

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -157,7 +157,7 @@ namespace TEAMModelBI.Controllers.BITest
         {
             var (_tmdId, _tmdName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
             await _azureStorage.SaveLog(type: "table-save", msg: "测试保存方法01", dingDing: _dingDing, httpContext: HttpContext); //IES5 日志记录
-            await _azureStorage.SaveBILog("A-Test", $"{_tmdName}【{_tmdId}】删除册别，删除ID:", _dingDing, httpContext: HttpContext);//BI 日志记录
+            await _azureStorage.SaveBILog("Test-add", $"{_tmdName}【{_tmdId}】删除册别，删除ID:", _dingDing, httpContext: HttpContext);//BI 日志记录
 
             return Ok(new { state = 200 });
         }