Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net6.0

Browse Source
This commit is contained in:
不做码农
2022-03-24 12:42:13 +08:00
parent d914389da7 7dcf132379
commit 156f21226e
25 changed files with 2284 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs
View File

@@ -1,9 +1,10 @@
using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Enums;
using Infrastructure.Model;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Linq.Expressions;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Common;
using ZR.Model;
@@ -51,6 +52,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[HttpDelete("clean")]
public IActionResult CleanLoginInfo()
{
if (!HttpContextExtension.IsAdmin(HttpContext))
{
return ToResponse(ApiResult.Error("操作失败"));
}
sysLoginService.TruncateLogininfo();
return SUCCESS(1);
}
@@ -65,6 +70,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[ActionPermissionFilter(Permission = "monitor:logininfor:remove")]
public IActionResult Remove(string infoIds)
{
if (!HttpContextExtension.IsAdmin(HttpContext))
{
return ToResponse(ApiResult.Error("操作失败"));
}
long[] infoIdss = Tools.SpitLongArrary(infoIds);
return SUCCESS(sysLoginService.DeleteLogininforByIds(infoIdss));
}

11
ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
View File

@@ -1,7 +1,9 @@
using Infrastructure.Attribute;
using Infrastructure.Enums;
using Infrastructure.Model;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Common;
using ZR.Model;
@@ -33,6 +35,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
{
PagerInfo pagerInfo = new(sysOperLog.pageNum, sysOperLog.PageSize);
sysOperLog.operName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.operName;
var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo);
return SUCCESS(list, "MM/dd HH:mm");
@@ -48,6 +51,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[HttpDelete("{operIds}")]
public IActionResult Remove(string operIds)
{
if (!HttpContextExtension.IsAdmin(HttpContext))
{
return ToResponse(ApiResult.Error("操作失败"));
}
long[] operIdss = Tools.SpitLongArrary(operIds);
return SUCCESS(sysOperLogService.DeleteOperLogByIds(operIdss));
}
@@ -61,6 +68,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[HttpDelete("clean")]
public ApiResult ClearOperLog()
{
if (!HttpContextExtension.IsAdmin(HttpContext))
{
return ApiResult.Error("操作失败");
}
sysOperLogService.CleanOperLog();
return ToJson(1);