wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 优化任务查询

Browse Source
This commit is contained in:
不做码农 2023-07-06 21:54:57 +08:00
parent 861cfded06
commit de1768d59d
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@ -8,7 +8,6 @@ using Quartz;
using SqlSugar;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
using ZR.Service.System.IService;
@ -40,19 +39,9 @@ namespace ZR.Admin.WebApi.Controllers
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "monitor:job:list")]
public IActionResult ListTask([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager)
public IActionResult ListTask([FromQuery] TasksQueryDto parm)
{
//开始拼装查询条件
var predicate = Expressionable.Create<SysTasks>();
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.QueryText),
m => m.Name.Contains(parm.QueryText) ||
m.JobGroup.Contains(parm.QueryText) ||
m.AssemblyName.Contains(parm.QueryText));
predicate.AndIF(parm.TaskType != null, m => m.TaskType == parm.TaskType);
var response = _tasksQzService.GetPages(predicate.ToExpression(), pager);
var response = _tasksQzService.SelectTaskList(parm);
return SUCCESS(response, TIME_FORMAT_FULL);
}

3
ZR.Model/System/Dto/TasksDto.cs
View File

@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
namespace ZR.Model.System.Dto
{
public class TasksQueryDto
public class TasksQueryDto : PagerInfo
{
/// <summary>
/// 查询字符串
@ -12,6 +12,7 @@ namespace ZR.Model.System.Dto
public string QueryText { get; set; }
public int? TaskType { get; set; }
public int? TriggerType { get; set; }
public int? IsStart { get; set; }
}
/// <summary>

4
ZR.Service/System/IService/ISysTasksQzService.cs
View File

@ -1,10 +1,12 @@
using ZR.Model.System;
using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
namespace ZR.Service.System.IService
{
public interface ISysTasksQzService : IBaseService<SysTasks>
{
PagedInfo<SysTasks> SelectTaskList(TasksQueryDto parm);
//SysTasksQz GetId(object id);
int AddTasks(SysTasks parm);
int UpdateTasks(SysTasks parm);

27
ZR.Service/System/SysTasksQzService.cs
View File

@ -1,7 +1,12 @@
using Infrastructure.Attribute;
using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar;
using System;
using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
using ZR.Repository;
using ZR.Service.System.IService;
namespace ZR.Service.System
@ -12,6 +17,26 @@ namespace ZR.Service.System
[AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)]
public class SysTasksQzService : BaseService<SysTasks>, ISysTasksQzService
{
/// <summary>
/// 查询任务
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<SysTasks> SelectTaskList(TasksQueryDto parm)
{
var predicate = Expressionable.Create<SysTasks>();
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.QueryText),
m => m.Name.Contains(parm.QueryText) ||
m.JobGroup.Contains(parm.QueryText) ||
m.AssemblyName.Contains(parm.QueryText));
predicate.AndIF(parm.TaskType != null, m => m.TaskType == parm.TaskType);
predicate.AndIF(parm.IsStart != null, m => m.IsStart == parm.IsStart);
return Queryable().Where(predicate.ToExpression())
.ToPage(parm);
}
/// <summary>
/// 添加任务
/// </summary>